소스 검색

火车发运明细修改增加计量单号

shxiaoc 1 년 전
부모
커밋
d438cc361f
1개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      src/main/resources/com/steerinfo/dil/mapper/OmstrainOrderMapper.xml

+ 7 - 0
src/main/resources/com/steerinfo/dil/mapper/OmstrainOrderMapper.xml

@@ -547,9 +547,16 @@
   <select id="getMaterialList" resultType="java.util.Map" parameterType="java.util.Map">
     SELECT RM.MATERIAL_ID "materialId",
            RM.MATERIAL_NAME||'-'||RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_SPECIFICATION||')'||'-'||OOM.ORDER_MATERIAL_NUMBER||'件' "materialName"
+           , TWR.INSERT_UPDATE_REMARK "platformInboundWeightNo"
     FROM OMSTRUCK_ORDER_MATERIAL OOM
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+              ON TTR.ORDER_ID = OOM.ORDER_ID
+    LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+              ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                AND ((TWR.MATERIAL_ID = OOM.MATERIAL_ID AND TWR.SALE_MATERIAL_ID IS null)
+                  OR (TWR.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID AND TWR.SALE_MATERIAL_ID IS not null))
     WHERE OOM.ORDER_ID = #{orderId}
   </select>
   <select id="getLuhaoNum" resultType="java.util.Map" parameterType="decimal">