|
|
@@ -1952,6 +1952,8 @@
|
|
|
RRA.ADDRESS_TOWN "addressTown",
|
|
|
OO.ORDER_LINE_SEQUENCE "lineSqe",
|
|
|
OO.DRIVER_TEL "capacityTel",
|
|
|
+ QQR.RESULT_START_TIME "queueStartTime",
|
|
|
+ QQR.UPDATE_TIME "allowEnfactoryTime",
|
|
|
TWR.RESULT_GROSS_WEIGHT "grossWeight",
|
|
|
TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
|
|
|
TWR.RESULT_TARE_WEIGHT "tareWeight",
|
|
|
@@ -1973,10 +1975,10 @@
|
|
|
TRR.INSERT_TIME "receiptTime",
|
|
|
DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
|
|
|
decode(TSR.RESULT_ID,null,'未发送','已发送') "smsResultId",
|
|
|
- DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
|
|
|
- 2,'销售已提交',
|
|
|
- 4,'财务已审批',
|
|
|
- 0,'销售订单未上报') "saleOrderStatus",
|
|
|
+ DECODE(ASO.SALE_ORDER_STATUS,1,'保存',
|
|
|
+ 2,'提交',
|
|
|
+ 4,'审核',
|
|
|
+ 0,'未上报') "saleOrderStatus",
|
|
|
(CASE
|
|
|
when OO.ORDER_STATUS =2
|
|
|
then '作业已完成'
|
|
|
@@ -1994,6 +1996,8 @@
|
|
|
THEN '已出厂'
|
|
|
WHEN TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
|
|
|
THEN '已进厂'
|
|
|
+ WHEN QQR.RESULT_START_TIME IS NOT NULL
|
|
|
+ THEN '排队中'
|
|
|
when OO.ORDER_STATUS=5
|
|
|
then '司机已接单'
|
|
|
WHEN TER.INSERT_TIME IS NULL
|
|
|
@@ -2033,6 +2037,8 @@
|
|
|
ON RCA.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
|
|
|
ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
+ LEFT JOIN QMS_QUEUE_RESULT QQR
|
|
|
+ ON QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
|
|
|
ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
|
|
|
@@ -2080,7 +2086,12 @@
|
|
|
</if>
|
|
|
<if test="capacityList != null">
|
|
|
and <foreach collection="capacityList" item="item" open="(" separator="or" close=")">
|
|
|
- RCA.CAPACITY_NUMBER like '%${item}%'
|
|
|
+ <if test="item == null">
|
|
|
+ RCA.CAPACITY_NUMBER is null
|
|
|
+ </if>
|
|
|
+ <if test="item != null">
|
|
|
+ RCA.CAPACITY_NUMBER like '%${item}%'
|
|
|
+ </if>
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="consigneeNames != null">
|
|
|
@@ -2136,6 +2147,8 @@
|
|
|
THEN '已出厂'
|
|
|
WHEN TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
|
|
|
THEN '已进厂'
|
|
|
+ WHEN QQR.RESULT_START_TIME IS NOT NULL
|
|
|
+ THEN '排队中'
|
|
|
when OO.ORDER_STATUS=5
|
|
|
then '司机已接单'
|
|
|
WHEN TER.INSERT_TIME IS NULL
|
|
|
@@ -2155,6 +2168,14 @@
|
|
|
RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like '%${item}%'
|
|
|
</foreach>
|
|
|
</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}%'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID DESC
|
|
|
)
|
|
|
</select>
|
