Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -464,6 +464,7 @@
                 TLFR.RESULT_ID "resultId",
                 APO.PURCHASE_ORDER_NO "purchaseOrderNo",
                 RM.MATERIAL_NAME "materialName",
+                TWR.RESULT_NET_WEIGHT "netWeight",
                 DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
                 OO.ORDER_NUMBER "orderNumber",
                 RC.CAPACITY_NUMBER "capacityNumber",
@@ -475,6 +476,8 @@
         from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
             on OO.ORDER_ID = TTR.ORDER_ID
         left join AMS_PURCHASE_ORDER APO
@@ -511,6 +514,12 @@
                     "materialName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="netWeight != null">
+                and
+                <foreach collection="netWeight" item="item" open="(" separator="or" close=")">
+                    "netWeight" like '%${item}%'
+                </foreach>
+            </if>
             <if test="resultForeignShipName != null">
                 and
                 <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">