完善系统

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -498,14 +498,14 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("更新车辆安排失败，若多次失败请联系管理员");
                 }
-                Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(s.getPId());
+                /*Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(s.getPId());
                 Long qty = ftmsorderbillsplans.getCarQty() + s.getCntrQty();
                 if (qty > ftmsorderbillsplans.getCntrQty()) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("车辆安排第" + line + "行，货量超出调度货量");
                 }
                 ftmsorderbillsplans.setCarQty(qty);
-                ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans);
+                ftmsorderbillsplansMapper.updateftmsorderbillsplans(ftmsorderbillsplans);*/
             }
         }
         if (StringUtils.isNotNull(fees) && !"[]".equals(fees)) {

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -185,21 +185,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="fTmsaccbillsListAccamount" resultType="java.util.Map">
         SELECT
             t.id AS fSrcpid,
-            c1.f_name AS  fName,
+            c1.f_name AS fName,
             w.f_id AS fSrcid,
             c.f_name AS fFeesName,
+            w.act_id AS fBilltype,
             w.f_mblno AS fMblno,
-            w.f_product_name AS fProductName,
-            w.create_time AS createTime,
-            w.act_id AS actId,
-            dict.dict_label  AS billType,
+            t.bill_type AS fBusinessType,
+            g.f_name AS fProductName,
+            w.create_time AS fBsdate,
+            dict.dict_label AS billType,
             ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmtdr,
             ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmt,
-            f.f_name  AS fFeeName,
+            f.f_name AS fFeeName,
             w.f_dc AS fSrcdc,
             w.f_qty AS fQty,
             w.f_unitprice AS fUnitprice,
-            w.f_amount AS  fAmount,
+            w.f_amount AS fAmount,
             w.f_feeUnitid AS fFeeUnitid,
             t.load_date AS loadDate,
             t.un_load_date AS unLoadDate
@@ -208,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
             LEFT JOIN t_corps AS c ON w.f_corpid = c.f_id
             LEFT JOIN F_TMSORDERBILLS AS t ON w.org_id = t.id
+            LEFT JOIN t_goods g ON g.f_id = t.goods_id
             LEFT JOIN t_corps AS c1 ON t.corp_id = c1.f_id
             LEFT JOIN sys_dict_data dict ON dict.dict_value = t.bill_type
         <where>
@@ -217,14 +219,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fToCorpid != null  and fToCorpid != ''">and w.f_corpid = #{ fToCorpid} </if>
             <if test="fMblno != null  and fMblno != ''">and w.f_mblno  like concat('%', #{ fMblno}, '%') </if>
             <if test="fStatementNo != null and fStatementNo != ''">and w.f_statement_no  like concat('%', #{ fStatementNo}, '%') </if>
-
             <if test='fReconciliation != null and fReconciliation != "" and fReconciliation == "1" '>
                 and w.f_accamount_date IS NOT NULL
             </if>
             <if test=' fReconciliation != null and  fReconciliation != "" and  fReconciliation == "0" '>
                 and w.f_accamount_date IS  NULL
             </if>
-
             <if test=' fDc != null and  fDc != "" and  fDc == "D" '>
                 and w.f_dc = #{ fDc}
             </if>