|
|
@@ -692,7 +692,7 @@
|
|
|
RCR.PORT_NAME "carrierName",--承运单位
|
|
|
LTT."resultOutPortTime" "resultOutPortTime",--离港日期
|
|
|
BCR.PORT_ID "sendPortId",--起运港
|
|
|
- rp.PORT_NAME "portName",--放货港口
|
|
|
+ rp.PORT_NAME "portName",--起运港
|
|
|
bcr.RESULT_ID "unitPriceId",--水运单价id
|
|
|
BCR.UNIT_PRICE "unitPrice",--水运单价
|
|
|
LTT."totalLoadTonnage" "monthLoadTonnage",--月份总装船吨位
|
|
|
@@ -717,6 +717,8 @@
|
|
|
RS.SHIPPER_NAME "shipperName",--结算单位名
|
|
|
LTT."inspectionsFee" "inspectionsFee"
|
|
|
FROM AMSSHIP_DELIVERY_NOTICE adn
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
|
|
|
+ ON adn.BATCH_ID=ADA.BATCH_ID
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY dbi
|
|
|
ON adn.BATCH_ID=dbi.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN DIL_BATCH db
|
|
|
@@ -743,7 +745,7 @@
|
|
|
LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR
|
|
|
ON BU."unitPriceId"=BCR.RESULT_ID
|
|
|
LEFT JOIN RMS_PORT rp
|
|
|
- ON rp.PORT_ID=adn.PORT_ID
|
|
|
+ ON rp.PORT_ID=ada.DOWN_SWIM_PORT_ID
|
|
|
LEFT JOIN AMS_PURCHASE_ORDER apo
|
|
|
ON db.BATCH_ID=apo.BATCH_ID
|
|
|
LEFT JOIN BMSSHIP_STATEMENT BS
|
|
|
@@ -768,7 +770,7 @@
|
|
|
ON ADN.BATCH_ID=tlsr.BATCH_ID
|
|
|
where TLSR.DELETED=0 AND ADN.DELETED=0
|
|
|
GROUP BY dbi.BATCH_ID)
|
|
|
- LT ON db.BATCH_ID = LT."batchId"
|
|
|
+ LT ON db.BATCH_ID = LT."batchId"--批次的总装船吨位，用于计算装船比例
|
|
|
LEFT JOIN (
|
|
|
select SHIP."batchId",
|
|
|
SHIP."resultForeignShipName",
|
|
|
@@ -831,7 +833,7 @@
|
|
|
AND RM.MATERIAL_NAME IS NOT NULL
|
|
|
GROUP BY DB.BATCH_ID,RM.MATERIAL_NAME,DB.RESULT_FOREIGN_SHIP_NAME
|
|
|
) TRUCK ON SHIP."batchId"=TRUCK."batchId")
|
|
|
- ET ON ET."batchId"=DB.BATCH_ID
|
|
|
+ ET ON ET."batchId"=DB.BATCH_ID--批次总进厂吨位
|
|
|
LEFT JOIN
|
|
|
(SELECT dbi.BATCH_ID "batchId",
|
|
|
TWQR.UNIT_PRICE_ID "unitPriceId",
|
|
|
@@ -849,8 +851,8 @@
|
|
|
ON ADN.BATCH_ID=tlsr.BATCH_ID
|
|
|
where TLSR.DELETED=0 AND ADN.DELETED=0
|
|
|
GROUP BY dbi.BATCH_ID,TWQR.UNIT_PRICE_ID)
|
|
|
- LTT ON BU."batchId" = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId"
|
|
|
- WHERE adn.DELETED=0 AND ada.DELETED=0 AND APO.DELETED=0
|
|
|
+ LTT ON BU."batchId" = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId" --批次和单价的月份装船吨位，用于计算月份装船比例
|
|
|
+ WHERE adn.DELETED=0 AND ada.DELETED=0 AND APO.DELETED=0
|
|
|
and (BS.STATEMENT_ID is null or BS.STATEMENT_STATUS=0)
|
|
|
<if test="con!=null and con!=''.toString()">
|
|
|
and (
|
