|
@@ -738,7 +738,7 @@
|
|
|
ON db.BATCH_ID = dbi.BATCH_ID
|
|
ON db.BATCH_ID = dbi.BATCH_ID
|
|
|
LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
|
|
LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
|
|
|
ON ADN.BATCH_ID=tlsr.BATCH_ID
|
|
ON ADN.BATCH_ID=tlsr.BATCH_ID
|
|
|
- where TLSR.DELETED=0 AND ADN.DELETED=0 AND TWQR.UNIT_PRICE_ID!=0) BU
|
|
|
|
|
|
|
+ where TLSR.DELETED=0 AND ADN.DELETED=0) BU
|
|
|
ON BU."batchId"=DB.BATCH_ID
|
|
ON BU."batchId"=DB.BATCH_ID
|
|
|
LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR
|
|
LEFT JOIN BMSSHIP_CONTRACT_PRICE BCR
|
|
|
ON BU."unitPriceId"=BCR.RESULT_ID
|
|
ON BU."unitPriceId"=BCR.RESULT_ID
|
|
@@ -850,7 +850,7 @@
|
|
|
where TLSR.DELETED=0 AND ADN.DELETED=0
|
|
where TLSR.DELETED=0 AND ADN.DELETED=0
|
|
|
GROUP BY dbi.BATCH_ID,TWQR.UNIT_PRICE_ID)
|
|
GROUP BY dbi.BATCH_ID,TWQR.UNIT_PRICE_ID)
|
|
|
LTT ON BU."batchId" = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId"
|
|
LTT ON BU."batchId" = LTT."batchId" and BU."unitPriceId"=LTT."unitPriceId"
|
|
|
- WHERE adn.DELETED=0 AND ada.DELETED=0
|
|
|
|
|
|
|
+ WHERE adn.DELETED=0 AND ada.DELETED=0 AND APO.DELETED=0
|
|
|
and (BS.STATEMENT_ID is null or BS.STATEMENT_STATUS=0)
|
|
and (BS.STATEMENT_ID is null or BS.STATEMENT_STATUS=0)
|
|
|
<if test="con!=null and con!=''.toString()">
|
|
<if test="con!=null and con!=''.toString()">
|
|
|
and (
|
|
and (
|
