|
|
@@ -1859,6 +1859,7 @@
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
ASM.MATERIAL_NUMBER "materialNum",
|
|
|
+ ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
@@ -1873,7 +1874,6 @@
|
|
|
RM.MATERIAL_ID "materialId",
|
|
|
RM.MATERIAL_NAME || RM.MATERIAL_MODEL "materialName",
|
|
|
RM.MATERIAL_SPECIFICATION "materialSpe",
|
|
|
- ASM.EAS_PRIMARY_ID "easPrimary",
|
|
|
R_CARRIER.CARRIER_ABBREVIATION "carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
@@ -1897,6 +1897,8 @@
|
|
|
TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
|
|
|
TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateReceipt",
|
|
|
+ R_CARRIER.CARRIER_ID "carrierId",
|
|
|
+ NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
|
|
|
DECODE(ASO.SALE_ORDER_STATUS,0,'销售订单未上报',
|
|
|
1,'销售订单已上报',
|
|
|
2,'销售已提交',
|
|
|
@@ -2024,7 +2026,7 @@
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= ASOM.SALE_DATE_OF_RECEIPT
|
|
|
</if>
|
|
|
<if test="remark != null" >
|
|
|
- and RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
|
|
|
+ and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
|
|
|
</if>
|
|
|
<if test="salers != null">
|
|
|
and RSR.SALER_NAME = #{salers}
|
