|
|
@@ -422,7 +422,7 @@
|
|
|
LEFT JOIN RMS_PORT rp ON rp.PORT_ID = wgm.PORT_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -555,7 +555,7 @@
|
|
|
LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -579,7 +579,7 @@
|
|
|
LEFT JOIN RMS_PORT RP ON RP.PORT_ID = WOR.HARBOR_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -601,7 +601,7 @@
|
|
|
LEFT JOIN RMS_PORT RP ON RP.PORT_ID = WIR.PORT_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -616,7 +616,6 @@
|
|
|
WHERE
|
|
|
wgm.DELETED = 0
|
|
|
AND RP.PORT_NAME = '万州港'
|
|
|
- AND wgm.GM_TONNAGE > 0
|
|
|
<if test="con!=null and con!=''.toString()">
|
|
|
and rm.MATERIAL_NAME || rp.PORT_NAME || db.RESULT_FOREIGN_SHIP_NAME like CONCAT(CONCAT('%',#{con}),'%')
|
|
|
</if>
|
|
|
@@ -757,7 +756,7 @@
|
|
|
LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -802,7 +801,7 @@
|
|
|
LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
|
|
|
LEFT JOIN (
|
|
|
SELECT DB .BATCH_ID "batchId",
|
|
|
- NVL(MAX(ADN .RESULT_MEMO),'块矿') "remark"
|
|
|
+ NVL(MAX(ADN .RESULT_MEMO),'进口块矿') "remark"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = DBI.BATCH_ID
|
|
|
@@ -823,7 +822,7 @@
|
|
|
DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
|
|
|
LT."gmTonnage" "gmTonnage",
|
|
|
MT."totalTonnage" "totalTonnage",
|
|
|
- NVL(ADN.RESULT_MEMO,'块矿') "type",
|
|
|
+ NVL(ADN.RESULT_MEMO,'进口块矿') "type",
|
|
|
temp2."totalTonnage" "typeTotalTonnage"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
@@ -860,7 +859,7 @@
|
|
|
SELECT "remark",
|
|
|
SUM("gmTonnage") "totalTonnage"
|
|
|
FROM (
|
|
|
- SELECT NVL(ADN.RESULT_MEMO,'块矿') "remark",
|
|
|
+ SELECT NVL(ADN.RESULT_MEMO,'进口块矿') "remark",
|
|
|
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
|
|
|
@@ -872,7 +871,7 @@
|
|
|
GROUP BY ADN.RESULT_MEMO
|
|
|
)
|
|
|
GROUP BY "remark"
|
|
|
- ) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'块矿')
|
|
|
+ ) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'进口块矿')
|
|
|
WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0 AND ADA.DELETED=0
|
|
|
)
|
|
|
ORDER BY "type","materialName"
|
