|
|
@@ -3924,7 +3924,13 @@
|
|
|
OO.ORDER_TYPE "orderType",
|
|
|
OO.ORDER_LINE_SEQUENCE "orderLineSequence",
|
|
|
OO.ORDER_NUMBER "orderNumber",
|
|
|
- RC.CAPACITY_NUMBER || '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || '）' "capacityNumber",
|
|
|
+ CASE
|
|
|
+ WHEN TEMP."orderId" IS NOT NULL
|
|
|
+ THEN RC.CAPACITY_NUMBER || '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||'）'
|
|
|
+ WHEN TEMP."orderId" IS NULL
|
|
|
+ THEN RC.CAPACITY_NUMBER || '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || '）'
|
|
|
+ END
|
|
|
+ "capacityNumber",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
|
|
|
@@ -3944,6 +3950,14 @@
|
|
|
LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
|
|
|
LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
|
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
|
|
|
+ LEFT JOIN (
|
|
|
+ select OO.ORDER_ID "orderId"
|
|
|
+ from OMSTRUCK_ORDER OO
|
|
|
+ left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
|
|
|
+ left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
+ where OO.ORDER_STATUS=5 and
|
|
|
+ RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
|
|
|
+ ) TEMP ON TEMP."orderId"=OO.ORDER_ID
|
|
|
WHERE
|
|
|
OO.ORDER_ID = #{orderId}
|
|
|
AND ASO.DELETED = 0
|
