|
|
@@ -1877,8 +1877,8 @@
|
|
|
ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
|
|
|
RSR.SALER_NAME "saler",
|
|
|
RM.MATERIAL_ID "materialId",
|
|
|
- RM.MATERIAL_NAME || RM.MATERIAL_MODEL "materialName",
|
|
|
- RM.MATERIAL_SPECIFICATION "materialSpe",
|
|
|
+ RM.MATERIAL_NAME "materialName",
|
|
|
+ RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
|
|
|
R_CARRIER.CARRIER_ABBREVIATION "carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
@@ -1905,10 +1905,10 @@
|
|
|
R_CARRIER.CARRIER_ID "carrierId",
|
|
|
NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
|
|
|
OO.ORDER_STATUS "carStatus",
|
|
|
- DECODE(ASO.SALE_ORDER_STATUS,0,'销售订单未上报',
|
|
|
- 1,'销售订单已上报',
|
|
|
+ DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
|
|
|
2,'销售已提交',
|
|
|
- 4,'财务已审批') "saleOrderStatus",
|
|
|
+ 4,'财务已审批',
|
|
|
+ 0,'销售订单未上报') "saleOrderStatus",
|
|
|
DECODE(OO.ORDER_STATUS || NVL(OO.ORDER_LINE_SEQUENCE, 0),
|
|
|
40,
|
|
|
'运单未接收',
|
