|
@@ -1974,7 +1974,13 @@
|
|
|
TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateReceipt",
|
|
|
R_CARRIER.CARRIER_ID "carrierId",
|
|
|
- OO.CAPACITYIDS "capacityNumbers",
|
|
|
+ (CASE WHEN
|
|
|
+ RCA.CAPACITY_NUMBER = '空白'
|
|
|
+ THEN null
|
|
|
+ else
|
|
|
+ OO.CAPACITYIDS
|
|
|
+ end
|
|
|
+ ) "capacityNumbers",
|
|
|
NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
|
|
|
OO.CAN_WORK "canwork",
|
|
|
OO.ORDER_STATUS "carStatus",
|
|
@@ -2052,7 +2058,7 @@
|
|
|
ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
|
|
|
ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
- AND TWR.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
+ AND TWR.MATERIAL_ID = RM.MATERIAL_ID
|
|
|
LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
|
|
|
ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
AND TLR.MATERIAL_ID = RM.MATERIAL_ID
|