|
@@ -2203,7 +2203,12 @@
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
ASO.SALE_ORDER_STATUS "saleOrderStatus",
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
- ASM.MATERIAL_NUMBER "materialNum",
|
|
|
+ CASE
|
|
|
+ WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
|
|
|
+ then null
|
|
|
+ when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
|
|
|
+ then ASM.MATERIAL_NUMBER
|
|
|
+ end "materialNum",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
ASM.DELETED "deletedStatus",
|
|
|
RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
@@ -2242,8 +2247,15 @@
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
end "addressPlace",
|
|
|
+ --卸货城市
|
|
|
+ case
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
|
|
|
+ THEN NULL
|
|
|
+ WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
|
|
|
+ THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
- RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "actualAddress",
|
|
|
+ RRA.ADDRESS_TOWN AS "actualCity",
|
|
|
RRP.PLACE_ID "placeId",
|
|
|
RRP.ADDRESS_DELIVERY_ADDRESS "place",
|
|
|
RRA.ADDRESS_ID "shipperAddressId",
|
|
@@ -2272,7 +2284,19 @@
|
|
|
TRR.INSERT_TIME "receiptTime",
|
|
|
ASO.sale_remark "saleRemark",
|
|
|
DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
|
|
|
- BDO.PRICEIDS "priceIds"
|
|
|
+ BDO.PRICEIDS "priceIds",
|
|
|
+ --理重
|
|
|
+ ASM.MATERIAL_WEIGHT "materialWeight",
|
|
|
+ --收款客户
|
|
|
+ ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
|
|
|
+ --结算方式
|
|
|
+ RC.CONSIGNEE_SETTLEMENT_METHOD "consingneeSettlementMethod",
|
|
|
+ --付款客户
|
|
|
+ ASO.SALE_ORDER_RECEIVE_CUSTOMER "paymentCustomer",
|
|
|
+ --卸货类别
|
|
|
+ RRP.UNLOAD_TYPE "unloadType",
|
|
|
+ --计划件数
|
|
|
+ ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
|
|
|
FROM AMS_SALE_ORDER ASO
|
|
|
LEFT JOIN RMS_CONSIGNEE RC
|
|
|
ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
@@ -2455,7 +2479,12 @@
|
|
|
to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
- ASM.MATERIAL_NUMBER "materialNum",
|
|
|
+ CASE
|
|
|
+ WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
|
|
|
+ then null
|
|
|
+ when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
|
|
|
+ then ASM.MATERIAL_NUMBER
|
|
|
+ end "materialNum",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
|
ASM.DELETED "deletedStatus",
|
|
|
RC.CONSIGNEE_COMPANY_NAME "consigneeName",
|
|
@@ -2481,8 +2510,28 @@
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
|
|
|
TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
|
|
|
+ case
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
|
|
|
+ then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
|
|
|
+ ||RRP.ADDRESS_DELIVERY_ADDRESS "realAddress"
|
|
|
+ from RMS_RECEIVE_PLACE RRP
|
|
|
+ LEFT JOIN RMS_RECEIVE_ADDRESS RRA
|
|
|
+ ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
|
|
|
+ WHERE RRP.PLACE_ID=ASOM.HISTORY_SHIPPING_ADDRESS_ID)
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) =0
|
|
|
+ then
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
- RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
|
|
|
+ RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
+ end "addressPlace",
|
|
|
+ --卸货城市
|
|
|
+ case
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
|
|
|
+ THEN NULL
|
|
|
+ WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
|
|
|
+ THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
|
|
|
+ RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN AS "actualCity",
|
|
|
RRP.PLACE_ID "placeId",
|
|
|
RRP.ADDRESS_DELIVERY_ADDRESS "place",
|
|
|
RRA.ADDRESS_ID "shipperAddressId",
|
|
@@ -2511,7 +2560,19 @@
|
|
|
TRR.INSERT_TIME "receiptTime",
|
|
|
ASO.sale_remark "saleRemark",
|
|
|
DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
|
|
|
- BDO.PRICEIDS "priceIds"
|
|
|
+ BDO.PRICEIDS "priceIds",
|
|
|
+ --理重
|
|
|
+ ASM.MATERIAL_WEIGHT "materialWeight",
|
|
|
+ --收款客户
|
|
|
+ ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
|
|
|
+ --付款客户
|
|
|
+ ASO.SALE_ORDER_RECEIVE_CUSTOMER "paymentCustomer",
|
|
|
+ --结算方式
|
|
|
+ RC.CONSIGNEE_SETTLEMENT_METHOD "consingneeSettlementMethod",
|
|
|
+ --卸货类别
|
|
|
+ RRP.UNLOAD_TYPE "unloadType",
|
|
|
+ --计划件数
|
|
|
+ ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
|
|
|
FROM AMS_SALE_ORDER ASO
|
|
|
LEFT JOIN RMS_CONSIGNEE RC
|
|
|
ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
@@ -2552,7 +2613,7 @@
|
|
|
LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
|
|
|
ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
|
|
|
LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
|
|
|
- ON actp.PRICE_ID = bdo.PRICE_ID
|
|
|
+ ON actp.PRICE_ID = oo.PRICE_ID
|
|
|
LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
|
|
|
ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
|