|
|
@@ -817,52 +817,65 @@
|
|
|
</select>
|
|
|
<select id="getRunStockList" resultType="java.util.Map">
|
|
|
SELECT * FROM (
|
|
|
- SELECT DISTINCT
|
|
|
- ADN.BATCH_ID "batchInfactoryId",
|
|
|
- DB.BATCH_ID "batchId",
|
|
|
- RM.MATERIAL_NAME "materialName",
|
|
|
- DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
|
|
|
- LT."gmTonnage" "gmTonnage",
|
|
|
- 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
|
|
|
- LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID = ADN.BATCH_ID
|
|
|
- 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 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
|
|
|
- LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
|
|
|
- LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
- 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
|
|
|
- LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID=TLR.RESULT_ID
|
|
|
- WHERE OIC.DELETED=0 AND ADN.DELETED=0 AND TLSR.DELETED=0
|
|
|
- AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > TLSR.RESULT_LOAD_SHIP_DATE
|
|
|
- AND (TUSR .RESULT_ID IS NULL OR TUSR.RESULT_START_TIME > to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss'))
|
|
|
- GROUP BY TLSR.BATCH_ID
|
|
|
- ) LT ON LT ."batchId"= ADN.BATCH_ID
|
|
|
- LEFT JOIN (
|
|
|
- --按发货通知备注统计数量
|
|
|
- SELECT NVL(ADN.RESULT_MEMO,'进口块矿') "remark",
|
|
|
- SUM(TLSR.RESULT_ACTUAL_INSTALLATIONS) "totalTonnage"
|
|
|
- FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
|
|
|
- LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
|
|
|
- LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY OIC ON OIC.INSTRUCTIONS_CAPACITY_ID=TLR.ORDER_ID
|
|
|
- LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
- 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
|
|
|
- LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID=TLR.RESULT_ID
|
|
|
- WHERE OIC.DELETED=0 AND ADN.DELETED=0 AND TLSR.DELETED=0
|
|
|
- AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > TLSR.RESULT_LOAD_SHIP_DATE
|
|
|
- AND (TUSR .RESULT_ID IS NULL OR TUSR.RESULT_START_TIME > to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss'))
|
|
|
- GROUP BY ADN.RESULT_MEMO
|
|
|
- ) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'进口块矿')
|
|
|
- WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0 AND ADA.DELETED=0
|
|
|
+ SELECT DISTINCT
|
|
|
+ ADN.BATCH_ID "batchInfactoryId",
|
|
|
+ DB.BATCH_ID "batchId",
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
+ DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
|
|
|
+ LT."gmTonnage" "gmTonnage",
|
|
|
+ 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
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID = ADN.BATCH_ID
|
|
|
+ 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 "batchId",
|
|
|
+ SUM("tonnage") "gmTonnage"
|
|
|
+ FROM (
|
|
|
+ SELECT DISTINCT
|
|
|
+ TLSR.RESULT_ACTUAL_INSTALLATIONS "tonnage",
|
|
|
+ TLSR.BATCH_ID "batchId",
|
|
|
+ TLSR.TOTAL_RESULT_ID
|
|
|
+ FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
|
|
|
+ LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
|
|
|
+ LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
+ 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
|
|
|
+ LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID=TLR.RESULT_ID
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID=ADN.BATCH_ID
|
|
|
+ WHERE ADN.DELETED=0 AND TLSR.DELETED=0 AND ADA.DELETED=0
|
|
|
+ AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > TLSR.RESULT_LOAD_SHIP_DATE
|
|
|
+ AND (TUSR .RESULT_ID IS NULL OR TUSR.RESULT_START_TIME > to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss'))
|
|
|
+ )
|
|
|
+ GROUP BY "batchId"
|
|
|
+ ) LT ON LT ."batchId"= ADN.BATCH_ID
|
|
|
+ LEFT JOIN (
|
|
|
+ --按发货通知备注统计数量
|
|
|
+ SELECT "remark",
|
|
|
+ SUM("tonnage") "totalTonnage"
|
|
|
+ FROM (
|
|
|
+ SELECT DISTINCT NVL(ADN.RESULT_MEMO,'进口块矿') "remark",
|
|
|
+ TLSR.RESULT_ACTUAL_INSTALLATIONS "tonnage",
|
|
|
+ TLSR.BATCH_ID,
|
|
|
+ TLSR.TOTAL_RESULT_ID
|
|
|
+ FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
|
|
|
+ LEFT JOIN TMSSHIP_TOTAL_RESULT TLR ON TLR.RESULT_ID=TLSR.TOTAL_RESULT_ID
|
|
|
+ LEFT JOIN DIL_BATCH_INFACOTRY DBI ON TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
|
|
|
+ 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
|
|
|
+ LEFT JOIN TMSSHIP_UNLOAD_SHIP_RESULT TUSR ON TUSR.TOTAL_RESULT_ID=TLR.RESULT_ID
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID=ADN.BATCH_ID
|
|
|
+ WHERE ADN.DELETED=0 AND TLSR.DELETED=0 AND ADA.DELETED=0
|
|
|
+ AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > TLSR.RESULT_LOAD_SHIP_DATE
|
|
|
+ AND (TUSR .RESULT_ID IS NULL OR TUSR.RESULT_START_TIME > to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss'))
|
|
|
+ )
|
|
|
+ GROUP BY "remark"
|
|
|
+ ) temp2 ON temp2."remark"=NVL(ADN.RESULT_MEMO,'进口块矿')
|
|
|
+ WHERE LT."gmTonnage" > 0 AND ADN.DELETED=0 AND ADA.DELETED=0
|
|
|
)
|
|
|
ORDER BY DECODE("type",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),"batchInfactoryId","batchId"
|
|
|
</select>
|
|
|
@@ -932,7 +945,7 @@
|
|
|
where tsl.LOCATION_STATUS is not null and tlsr.DELETED=0 and
|
|
|
to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > TLSR.RESULT_LOAD_SHIP_DATE
|
|
|
and (tusr.RESULT_ID is null or tusr.RESULT_START_TIME > to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss'))
|
|
|
- and adn.DELETED=0 and oic.DELETED=0
|
|
|
+ and adn.DELETED=0 and ADA.DELETED=0
|
|
|
union all
|
|
|
select DISTINCT
|
|
|
db.BATCH_ID "batchId",
|
|
|
@@ -942,7 +955,7 @@
|
|
|
adn.NOTICE_DELIVERY_TIME "dateOfLoans",
|
|
|
adn.RESULT_NUMBER_OF_LOANS "numberOfLoans",
|
|
|
rp.port_name "portName",
|
|
|
- wgm.gm_tonnage-NVL(TIN."afterIn",0)+NVL(TOUT."afterOut",0) "gmTonnage",
|
|
|
+ wgm.gm_tonnage - NVL( TIN."afterIn", 0 ) + NVL( TOUT."afterOut", 0 ) "gmTonnage",
|
|
|
NVL(ADN.RESULT_MEMO,'进口块矿') "type"
|
|
|
from AMSSHIP_DELIVERY_NOTICE adn
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY DBI2 on adn.batch_id=DBI2.BATCH_INFACOTRY_ID
|
|
|
@@ -970,7 +983,7 @@
|
|
|
GROUP BY BATCH_ID,HARBOR_ID
|
|
|
) TOUT ON wgm.batch_id = TOUT ."batchId" AND WGM.PORT_ID=TOUT."portId"
|
|
|
left join RMS_MATERIAL_TYPE RMT on adn.MATERIAL_TYPE_ID = RMT.MATERIAL_TYPE_ID
|
|
|
- where adn.DELETED=0 and wgm.DELETED=0 and wgm.gm_tonnage-NVL(TIN."afterIn",0)+NVL(TOUT."afterOut",0)>0
|
|
|
+ where adn.DELETED=0 and wgm.DELETED=0 and ADA.DELETED=0 and wgm.gm_tonnage-NVL(TIN."afterIn",0)+NVL(TOUT."afterOut",0)>0
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') > ADA.ATTORNEY_TIME
|
|
|
and DBI2.BATCH_INFACOTRY_ID not in(
|
|
|
select DISTINCT
|
