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

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

@@ -1329,7 +1329,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
         ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber} and RM.MATERIAL_NAME=#{materialName}
-        AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        AND TWB.BATCH_NET_WEIGHT IS NOT NULL
     </select>
 <!--    获取物资理重-->
     <select id="getTheoryWeight" resultType="java.util.Map" parameterType="java.util.Map">