|
|
@@ -4024,10 +4024,11 @@
|
|
|
OO.ORDER_NUMBER "orderNumber",
|
|
|
OO.ARRIVAL_FLAG "arrivalFlag",
|
|
|
CASE
|
|
|
- WHEN TEMP."orderId" IS NOT NULL
|
|
|
+ WHEN TEMP."orderId" IS NOT NULL AND ASO.SALE_TYPE = 1
|
|
|
THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||')'
|
|
|
- WHEN TEMP."orderId" IS NULL
|
|
|
+ WHEN TEMP."orderId" IS NULL AND ASO.SALE_TYPE = 1
|
|
|
THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || ')'
|
|
|
+ ELSE RC.CAPACITY_NUMBER
|
|
|
END
|
|
|
"capacityNumber",
|
|
|
RC.CAPACITY_TEL "capacityTel",
|
|
|
@@ -4204,7 +4205,10 @@
|
|
|
<select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
|
|
|
SELECT * FROM (
|
|
|
SELECT
|
|
|
- TER.INSERT_UPDATE_REMARK AS "isOk"
|
|
|
+ CASE WHEN TER.RESULT_ID is null
|
|
|
+ then 'OK'
|
|
|
+ ELSE TER.INSERT_UPDATE_REMARK
|
|
|
+ END AS "isOk"
|
|
|
FROM OMSTRUCK_ORDER OO
|
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
|
|
|
ON OO.ORDER_ID = TTR.ORDER_ID
|
Redeem