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

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

@@ -869,7 +869,8 @@
     <select id="getMaterial" parameterType="int" resultType="java.util.Map">
         SELECT RM.MATERIAL_NAME                                                               "materialName",
                CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "specificationModel",
-               OM.ORDER_MATERIAL_NUMBER                                                       "orderMaterialNumber"
+               OM.ORDER_MATERIAL_NUMBER                                                       "orderMaterialNumber",
+               OM.ORDER_MATERIAL_WEIGHT                                                       "orderMaterialWeight"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN OMSTRUCK_ORDER_MATERIAL OM
                            ON OO.ORDER_ID = OM.ORDER_ID

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

@@ -1108,6 +1108,7 @@
         RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
         --         RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
@@ -1234,6 +1235,7 @@
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
         OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",