Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -238,7 +238,7 @@
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
                  left join RMS_MATERIAL RM
-                           on TWR.MATERIAL_ID = RM.MATERIAL_NAME
+                           on TWR.MATERIAL_ID = RM.MATERIAL_ID
         where TWR.RESULT_TOTAL_ID = #{resultTotalId} and TWR.TARE_SEGMENT_SQE = #{segmentSqe}
     </select>