|
@@ -2345,8 +2345,9 @@
|
|
|
ON TTR.ORDER_ID = OO.ORDER_ID
|
|
ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
AND NVL(OO.ORDER_TYPE, 0) in (0, 1)
|
|
AND NVL(OO.ORDER_TYPE, 0) in (0, 1)
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
- AND (OO.ORDER_STATUS = 2 or OO.ORDER_STATUS = 5 and ttr.ORDER_STATUS = '已出厂')
|
|
|
|
|
|
|
+ AND NVL(OO.ORDER_STATUS,0) in (0,2,4,5)
|
|
|
AND ASO.DELETED = 0
|
|
AND ASO.DELETED = 0
|
|
|
|
|
+ AND NVL(OO.CAPACITY_ID,0) != 35128
|
|
|
AND ASO.SALE_ORDER_STATUS = 4
|
|
AND ASO.SALE_ORDER_STATUS = 4
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
and asm.DELETED is null
|
|
and asm.DELETED is null
|
|
@@ -3589,7 +3590,7 @@
|
|
|
OO.CAN_WORK "canwork",
|
|
OO.CAN_WORK "canwork",
|
|
|
OO.ORDER_STATUS "carStatus",
|
|
OO.ORDER_STATUS "carStatus",
|
|
|
ASOM.TRUCK_REMARK "truckRemark",
|
|
ASOM.TRUCK_REMARK "truckRemark",
|
|
|
- RSA.AREA_NAME "areaName",
|
|
|
|
|
|
|
+ ASM.TRANSFER_OUT_OF_WAREHOUSE "areaName",
|
|
|
RSA.AREA_NAME "saleArea",
|
|
RSA.AREA_NAME "saleArea",
|
|
|
DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
|
|
DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
|
|
|
2,'销售已提交',
|
|
2,'销售已提交',
|
luobang