|
@@ -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">
|