|
|
@@ -831,7 +831,7 @@
|
|
|
LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID=DB.BATCH_ID
|
|
|
LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
|
|
|
LEFT JOIN (
|
|
|
- SELECT DB.BATCH_ID "batchId",
|
|
|
+ SELECT TLSR.BATCH_ID "batchId",
|
|
|
SUM(TLSR.RESULT_ACTUAL_INSTALLATIONS) "gmTonnage"
|
|
|
FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
|
|
|
LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
|
|
|
@@ -840,8 +840,8 @@
|
|
|
LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID=DB.BATCH_ID
|
|
|
LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
WHERE OIC.DELETED=0 AND ADN.DELETED=0 AND TLSR.DELETED=0
|
|
|
- GROUP BY DB.BATCH_ID
|
|
|
- ) LT ON LT ."batchId"= DB.BATCH_ID
|
|
|
+ GROUP BY TLSR.BATCH_ID
|
|
|
+ ) LT ON LT ."batchId"= ADN.BATCH_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT RM.MATERIAL_NAME "materialName",
|
|
|
SUM(TLSR.RESULT_ACTUAL_INSTALLATIONS) "totalTonnage"
|
|
|
@@ -873,7 +873,7 @@
|
|
|
)
|
|
|
GROUP BY "remark"
|
|
|
) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'块矿')
|
|
|
- WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0
|
|
|
+ WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0 AND ADA.DELETED=0
|
|
|
)
|
|
|
ORDER BY "type","materialName"
|
|
|
</select>
|
