手机端反序列化不兼容字段修改

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -753,8 +753,8 @@
             leg.f_corpid AS fCorpIds,
             corp.f_name AS fCorpid,
             leg.f_shipper AS fShipper,
-            <if test="isCntrno != null and isCntrno != 2 ">ware.f_warehouse_information AS fWarehouseids,</if>
-            <if test="isCntrno != null and isCntrno == 2 ">ware.f_name AS fWarehouseids,</if>
+            <if test="isCntrno != 2 ">ware.f_warehouse_information AS fWarehouseids,</if>
+            <if test="isCntrno == 2 ">ware.f_name AS fWarehouseids,</if>
             area.f_name AS fWarehouseLocationids,
             leg.f_originalbillno AS fOriginalbillno,
             leg.f_warehouse_locationid AS fWarehouseLocationid,
@@ -793,8 +793,8 @@
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
             LEFT JOIN t_customer_contact tc ON tc.f_pid = corp.f_id
             LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
-            <if test="isCntrno != null and isCntrno != 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid</if>
-            <if test="isCntrno != null and isCntrno == 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouseid</if>
+            <if test="isCntrno != 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid</if>
+            <if test="isCntrno == 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouseid</if>
             LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
             LEFT JOIN t_warehouse_area area ON area.f_id = leg.f_warehouse_locationid
             LEFT JOIN sys_dict_data dict1 ON dict1.dict_value = leg.f_trademodeid
@@ -843,10 +843,10 @@
             <if test="isCntrno == null">
                 GROUP BY leg.f_corpid, leg.f_originalbillno, leg.f_originalbilldate, leg.f_warehouse_locationid, leg.f_goodsid, leg.f_trademodeid
             </if>
-            <if test="isCntrno != null and isCntrno == 1 ">
+            <if test="isCntrno == 1 ">
                 GROUP BY leg.f_corpid, leg.f_originalbillno, leg.f_originalbilldate, leg.f_warehouse_locationid, leg.f_goodsid, leg.f_trademodeid,leg.f_cntrno
             </if>
-            <if test="isCntrno != null and isCntrno == 2 ">GROUP BY leg.f_corpid, leg.f_mblno, leg.f_goodsid, leg.f_warehouseid</if>
+            <if test="isCntrno == 2 ">GROUP BY leg.f_corpid, leg.f_mblno, leg.f_goodsid, leg.f_warehouseid</if>
         </where>
         ${params.dataScope}
         order by leg.f_bsdate desc

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

@@ -1228,7 +1228,7 @@
             <if test="fFeetunit != null">f_feetunit = #{fFeetunit},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
             <if test="fEmblno != null">f_emblno = #{fEmblno},</if>
-            <if test="fCompany != null">f_company = #{fCompany},</if>
+            f_company = #{fCompany},
             <if test="fVslvoy != null">f_vslvoy = #{fVslvoy},</if>
             <if test="fEta != null">f_eta = #{fEta},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
@@ -1254,8 +1254,8 @@
             <if test="fDriverTel != null">f_driver_tel = #{fDriverTel},</if>
             <if test="fDriverIdCar != null">f_driver_id_car = #{fDriverIdCar},</if>
             <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
-            <if test="fLabour != null">f_labour = #{fLabour},</if>
-            <if test="fFleet != null">f_fleet = #{fFleet},</if>
+            f_labour = #{fLabour},
+            f_fleet = #{fFleet},
             <if test="fInwarehouseid != null">f_inwarehouseid = #{fInwarehouseid},</if>
             <if test="fBstime != null">f_bstime = #{fBstime},</if>
             <if test="fCartype != null">f_cartype = #{fCartype},</if>
@@ -2656,6 +2656,9 @@
             IFNULL(ROUND(w.f_grossweight/1000.3465,2),0) fGrossweight,
             t.f_grossweight fGrossweights,
             t.f_cntqty fCntqty,
+            fleet.f_name fleetName,
+            t.f_driver_name fDriverName,
+            t.f_driver_tel fDriverTel,
         CASE
 		    WHEN t.f_billstatus = '10' THEN
 		        '计划'
@@ -2669,6 +2672,7 @@
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems t ON t.f_pid = w.f_id
+            LEFT JOIN t_corps fleet ON fleet.f_id = t.f_fleet
             LEFT JOIN t_corps c ON c.f_id = w.f_corpid
             LEFT JOIN t_goods g ON g.f_id = t.f_goodsid
             LEFT JOIN t_cntr cntr ON cntr.f_id = t.f_cntrtype

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

@@ -727,22 +727,22 @@
             t.f_id fId,
             t.f_pid fPid,
             t.f_shipper fShipper,
-            t.f_bsdate bsdate,
+            t.f_bsdate fBsdate,
             corp.f_name corpName,
             t.f_mblno fMblno,
             stor.dict_label businessType,
-            t.f_marks marks,
-            t.f_labour labour,
+            t.f_marks fMarks,
+            t.f_labour fLabour,
             g.f_name goodsName,
             fleet.f_name fleetName,
-            t.f_warehouse_information warehouseInformation,
+            t.f_warehouse_information fWarehouseInformation,
             t.f_warehouselocid fWarehouselocid,
             t.f_forkliftman fForkliftman,
-            t.f_truckno truckno,
+            t.f_truckno fTruckno,
             cntr.f_name cntrtypes,
-            t.f_cntrtype cntrtype,
-            t.f_cntqty cntqty,
-            t.f_cntrno cntrno,
+            t.f_cntrtype fCntrtype,
+            t.f_cntqty fCntqty,
+            t.f_cntrno fCntrno,
             t.f_qty fQty,
             t.f_truckno fTruckno,
             t.f_driver_name fDriverName,