|
|
@@ -684,7 +684,8 @@
|
|
|
|
|
|
<select id="getShipFeeStatement" resultType="java.util.Map">
|
|
|
--查询计费详单及其计费账单信息
|
|
|
- SELECT db.BATCH_ID "batchId",--批次id
|
|
|
+ select * from(
|
|
|
+ SELECT DISTINCT db.BATCH_ID "batchId",--批次id
|
|
|
apo.PURCHASE_ORDER_ID "purchaseOrderId",--采购订单id
|
|
|
RM.MATERIAL_NAME "materialName",--物资名
|
|
|
RC.CAPACITY_NUMBER "capacityNumber",--江船船名
|
|
|
@@ -711,7 +712,8 @@
|
|
|
BS.TOTAL_WET_TON "totalEnTonnage",--到场湿吨
|
|
|
BS.STATEMENT_TOTAL_AMOUNT "stateMentTotalAmount",--账单总金额
|
|
|
BS.STATEMENT_SHIPPER_ID "stateMentShipperId",--结算单位id
|
|
|
- RS.SHIPPER_NAME "shipperName"--结算单位名
|
|
|
+ RS.SHIPPER_NAME "shipperName",--结算单位名
|
|
|
+ ADN.INSERT_TIME "noticeTime"
|
|
|
FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
|
|
|
LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
|
|
|
ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
|
|
|
@@ -747,7 +749,7 @@
|
|
|
on ada.BATCH_ID=dbi.BATCH_INFACOTRY_ID
|
|
|
LEFT JOIN RMS_PORT RCR
|
|
|
on ada.CARRIER_ID=RCR.PORT_ID
|
|
|
- WHERE tlsr.DELETED=0
|
|
|
+ WHERE tlsr.DELETED=0 AND adn.DELETED=0
|
|
|
<if test="con!=null and con!=''.toString()">
|
|
|
and (
|
|
|
RM.MATERIAL_NAME like concat('%',concat(#{con},'%'))
|
|
|
@@ -760,7 +762,7 @@
|
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= tlsr.RESULT_OUT_PORT_TIME
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= tlsr.RESULT_OUT_PORT_TIME
|
|
|
</if>
|
|
|
- ORDER BY tlsr.RESULT_OUT_PORT_TIME DESC,db.BATCH_ID,BS.STATEMENT_ID DESC
|
|
|
+ ) ORDER BY "noticeTime" DESC,"statementId" ASC
|
|
|
</select>
|
|
|
|
|
|
<select id="findTotalTonnage" resultType="java.util.Map">
|
