|
|
@@ -1914,6 +1914,7 @@
|
|
|
ASO.SALE_ORDER_ID "saleOrderId",
|
|
|
ASM.SALE_MAKE_DATE "saleMakeDate",
|
|
|
to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
|
|
|
+ ASO.INSERT_UPDATE_REMARK "saleOrderInertUpdateRemark",
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
ASO.UPDATE_TIME "updateTime",
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
@@ -1973,6 +1974,11 @@
|
|
|
TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
|
|
|
TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateReceipt",
|
|
|
+ (CASE WHEN
|
|
|
+ ASM.IS_POUND_SALE = 0
|
|
|
+ THEN NULL
|
|
|
+ else ASM.MATERIAL_WEIGHT
|
|
|
+ END) "materialThoWeight",
|
|
|
R_CARRIER.CARRIER_ID "carrierId",
|
|
|
(CASE WHEN
|
|
|
RCA.CAPACITY_NUMBER = '空白'
|
|
|
@@ -1985,15 +1991,21 @@
|
|
|
OO.CAN_WORK "canwork",
|
|
|
OO.ORDER_STATUS "carStatus",
|
|
|
RSA.AREA_NAME "areaName",
|
|
|
+ OO.INSERT_UPDATE_REMARK "orderInsertUpdateRemark",
|
|
|
TAR.INSERT_TIME "arrivalTime",
|
|
|
TRR.INSERT_TIME "receiptTime",
|
|
|
ASO.sale_remark "saleRemark",
|
|
|
DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
|
|
|
decode(TSR.RESULT_ID,null,'未发送','已发送') "smsResultId",
|
|
|
- DECODE(ASO.SALE_ORDER_STATUS,1,'保存',
|
|
|
- 2,'提交',
|
|
|
- 4,'审核',
|
|
|
- 0,'未上报') "saleOrderStatus",
|
|
|
+ (CASE WHEN
|
|
|
+ ASO.DELETED = 2 then '关闭'
|
|
|
+ when ASO.DELETED = 1 then '反审批'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 4 then '审核'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 2 then '提交'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 1 then '保存'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 0 then '未上报'
|
|
|
+ END
|
|
|
+ ) "saleOrderStatus",
|
|
|
(CASE
|
|
|
when OO.ORDER_STATUS =2
|
|
|
then '已完成'
|
|
|
@@ -2075,7 +2087,6 @@
|
|
|
LEFT JOIN TMSTRUCK_SMS_RUSULT TSR
|
|
|
ON TSR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
- AND ASO.DELETED = 0
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd') < = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
@@ -2187,10 +2198,15 @@
|
|
|
</if>
|
|
|
<if test="saleOrderStatusList != null">
|
|
|
and <foreach collection="saleOrderStatusList" item="item" open="(" separator="or" close=")">
|
|
|
- DECODE(ASO.SALE_ORDER_STATUS,1,'保存',
|
|
|
- 2,'提交',
|
|
|
- 4,'审核',
|
|
|
- 0,'未上报') like '%${item}%'
|
|
|
+ (CASE WHEN
|
|
|
+ ASO.DELETED = 2 then '关闭'
|
|
|
+ when ASO.DELETED = 1 then '反审批'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 4 then '审核'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 2 then '提交'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 1 then '保存'
|
|
|
+ when ASO.SALE_ORDER_STATUS = 0 then '未上报'
|
|
|
+ END
|
|
|
+ ) like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="saleRemarkList != null">
|
luobang