|
|
@@ -150,10 +150,14 @@
|
|
|
|
|
|
<select id="getDownShipDynamaics" resultType="java.util.Map">
|
|
|
--下游港口船舶动态表
|
|
|
- select
|
|
|
+ SELECT
|
|
|
DISTINCT
|
|
|
OSI.SHIPMENT_INSTRUCTIONS_ID "instructionsId",
|
|
|
OIC.INSTRUCTIONS_CAPACITY_ID "instructionsCapacityId",
|
|
|
+ ADN.PORT_ID "adnPortId",
|
|
|
+ WGM.GM_ID "gmId",
|
|
|
+ WGM.PORT_ID "portId",
|
|
|
+ WGM.BATCH_ID "batchId",
|
|
|
RP.PORT_NAME "portName",
|
|
|
RM.MATERIAL_NAME || '（' || DB.RESULT_FOREIGN_SHIP_NAME || '）' || ADN.RESULT_NUMBER_OF_LOANS || '吨，' || TO_CHAR(ADN.NOTICE_DELIVERY_TIME,'YYYY-MM-DD') ||'放货'
|
|
|
||
|
|
|
@@ -169,7 +173,9 @@
|
|
|
else RC.CAPACITY_NUMBER
|
|
|
end)
|
|
|
"capacityNumber",
|
|
|
- oic.INSTRUCTION_PLANNED_LOADING "instructPlannedLoading",
|
|
|
+ oic.INSTRUCTION_PLANNED_LOADING "planLoadTon",
|
|
|
+ oic.INSTRUCTIONS_SHIP_POSITION "position",
|
|
|
+ TLSR.RESULT_ACTUAL_INSTALLATIONS "actualLoadTon",
|
|
|
oic.SHIP_DYNAMIC "shipDynamic",
|
|
|
oic.LOAD_DETAILS "loadDetails",
|
|
|
ADN.NOTICE_DELIVERY_TIME "noticeDeliveryTime"
|
|
|
@@ -189,11 +195,13 @@
|
|
|
left join RMS_MATERIAL RM
|
|
|
ON RM.MATERIAL_ID = DB.MATERIAL_ID
|
|
|
LEFT JOIN WMSH_GRID_MATERIAL WGM
|
|
|
- ON WGM.BATCH_ID = DB.BATCH_ID
|
|
|
+ ON WGM.BATCH_ID = DB.BATCH_ID AND ADN.PORT_ID=WGM.PORT_ID
|
|
|
LEFT JOIN TMSSHIP_TOTAL_RESULT TTR
|
|
|
ON OIC.INSTRUCTIONS_CAPACITY_ID=TTR.ORDER_ID
|
|
|
LEFT JOIN TMSSHIP_WATER_QUALITY_RESULT TWQR
|
|
|
ON TWQR.TOTAL_RESULT_ID=TTR.RESULT_ID
|
|
|
+ LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT TLSR
|
|
|
+ ON TLSR.TOTAL_RESULT_ID=TTR.RESULT_ID
|
|
|
<where>
|
|
|
ADN.DELETED=0
|
|
|
<if test="input !=null and input.toString()!=''">
|
