|
@@ -2386,7 +2386,7 @@
|
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
- AND ASO.DELETED = 0
|
|
|
+ and (aso.DELETED = 1 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED != 1 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
and (BDO.WETHER_TO_STATEMENT IS NULL or BDO.WETHER_TO_STATEMENT != 1)
|
|
|
<if test="oneDate != null">
|
|
@@ -2659,7 +2659,7 @@
|
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
- AND ASO.DELETED = 0
|
|
|
+ and (aso.DELETED = 1 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED != 1 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
and BDO.WETHER_TO_STATEMENT = 1
|
|
|
<if test="oneDate != null">
|