|
|
@@ -691,7 +691,7 @@
|
|
|
db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",--外轮船名
|
|
|
RCR.PORT_NAME "carrierName",--承运单位
|
|
|
LTT."resultOutPortTime" "resultOutPortTime",--离港日期
|
|
|
- ADN.PORT_ID "sendPortId",--放货港口id
|
|
|
+ BCR.PORT_ID "sendPortId",--起运港
|
|
|
rp.PORT_NAME "portName",--放货港口
|
|
|
bcr.RESULT_ID "unitPriceId",--水运单价id
|
|
|
BCR.UNIT_PRICE "unitPrice",--水运单价
|
|
|
@@ -736,7 +736,9 @@
|
|
|
ON dbi.BATCH_INFACOTRY_ID = tlsr.BATCH_ID
|
|
|
LEFT JOIN DIL_BATCH db
|
|
|
ON db.BATCH_ID = dbi.BATCH_ID
|
|
|
- WHERE TWQR.UNIT_PRICE_ID!=0) BU
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
+ ON ADN.BATCH_ID=tlsr.BATCH_ID
|
|
|
+ where TLSR.DELETED=0 AND ADN.DELETED=0 AND TWQR.UNIT_PRICE_ID!=0) BU
|
|
|
ON BU."batchId"=DB.BATCH_ID
|
|
|
LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR
|
|
|
ON BU."unitPriceId"=BCR.RESULT_ID
|
|
|
@@ -762,7 +764,9 @@
|
|
|
ON TWQR.TOTAL_RESULT_ID=TTR.RESULT_ID
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY dbi
|
|
|
ON dbi.BATCH_INFACOTRY_ID = tlsr.BATCH_ID
|
|
|
- WHERE tlsr.DELETED=0
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
+ 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"
|
|
|
LEFT JOIN (
|
|
|
@@ -841,7 +845,9 @@
|
|
|
ON TWQR.TOTAL_RESULT_ID=TTR.RESULT_ID
|
|
|
LEFT JOIN DIL_BATCH_INFACOTRY dbi
|
|
|
ON dbi.BATCH_INFACOTRY_ID = tlsr.BATCH_ID
|
|
|
- where TLSR.DELETED=0
|
|
|
+ LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
+ 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
|
