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

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

@@ -384,14 +384,15 @@
     select OOM.ORDER_MATERIAL_ID from OMSTRUCK_ORDER_MATERIAL OOM where OOM.ORDER_ID = #{orderId}
   </select>
   <select id="getUnloadOrderMaterial" resultType="java.util.Map" parameterType="java.util.Map">
-    select RM.MATERIAL_NAME "materialName",
-       RM.MATERIAL_SPECIFICATION || rm.material_model "materialSpeModel"
-  from OMSTRUCK_ORDER oo
-  LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
-    on oom.ORDER_ID = oo.ORDER_ID
-  LEFT JOIN RMS_MATERIAL RM
-    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-  where oo.ORDER_NUMBER = #{orderNumber}
+    select RM.MATERIAL_NAME                               "materialName",
+           RM.MATERIAL_SPECIFICATION || rm.material_model "materialSpeModel",
+           RM.MATERIAL_ID                                 "materialId"
+    from OMSTRUCK_ORDER oo
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
+                     on oom.ORDER_ID = oo.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     on RM.MATERIAL_ID = OOM.MATERIAL_ID
+    where oo.ORDER_NUMBER = #{orderNumber}
   </select>
   <!--  //通过订单号获取计量实绩主键
       BigDecimal selectWeightResultId(BigDecimal orderId);-->