添加车队台账接口

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -939,12 +939,12 @@
             AND dic.dict_type = 'data_cntrId'
             LEFT JOIN t_corps driver ON driver.f_id = c.driver_user_id
         <where>
-            <if test="stlStatus == null and stlStatus == 'T'">and c.stl_amt_dr != 0 or c.stl_amt_cr != 0</if>
-            <if test="stlStatus == null and stlStatus == 'F'">and c.stl_amt_dr = 0 or c.stl_amt_cr = 0</if>
-            <if test="accchkStatus == null and accchkStatus == 'T'">and c.accchk_amt_cr != 0 or c.accchk_amt_cr != 0</if>
-            <if test="accchkStatus == null and accchkStatus == 'F'">and c.accchk_amt_dr = 0 or c.accchk_amt_dr = 0</if>
-            <if test="invStatus == null and invStatus == 'T'">and c.inv_amt_cr != 0 or c.inv_amt_cr != 0</if>
-            <if test="invStatus == null and invStatus == 'F'">and c.inv_amt_dr = 0 or c.inv_amt_dr = 0</if>
+            <if test='stlStatus != null and stlStatus == "T"'>and c.stl_amt_dr != 0 or c.stl_amt_cr != 0</if>
+            <if test='stlStatus != null and stlStatus == "F"'>and c.stl_amt_dr = 0 and c.stl_amt_cr = 0</if>
+            <if test='accchkStatus != null and accchkStatus == "T"'>and c.accchk_amt_cr != 0 or c.accchk_amt_cr != 0</if>
+            <if test='accchkStatus != null and accchkStatus == "F"'>and c.accchk_amt_dr = 0 and c.accchk_amt_dr = 0</if>
+            <if test='invStatus != null and invStatus == "T"'>and c.inv_amt_cr != 0 or c.inv_amt_cr != 0</if>
+            <if test='invStatus != null and invStatus == "F"'>and c.inv_amt_dr = 0 and c.inv_amt_dr = 0</if>
         </where>
         ORDER BY c.id desc
     </select>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -190,6 +190,7 @@
             dictIn.dict_label AS fBusinessType,
             ware.f_name AS fWarehouseid,
             bill.f_qty AS fQty,
+            bill.f_cntval AS fCntval,
             bill.f_netweight AS fNetweight,
             bill.create_time AS createTime,
             ware1.f_name AS fInwarehouseid,
@@ -371,6 +372,7 @@
         bill.f_driver_id_car AS fDriverIdCar,
         ware.f_name AS fWarehouseid,
         bill.f_qty AS fQty,
+        bill.f_cntval AS fCntval,
         bill.f_netweight AS fNetweight,
         bill.create_time AS createTime,
         ware1.f_name AS fInwarehouseid,