|
@@ -4490,10 +4490,14 @@
|
|
WHERE
|
|
WHERE
|
|
ASM.TRANSFER_OUT_OF_WAREHOUSE IS NOT NULL
|
|
ASM.TRANSFER_OUT_OF_WAREHOUSE IS NOT NULL
|
|
AND RC.CARRIER_ABBREVIATION IS NOT NULL
|
|
AND RC.CARRIER_ABBREVIATION IS NOT NULL
|
|
- AND ASO.SALE_ORDER_ISSELF_MENTION != '是'
|
|
|
|
|
|
+ AND ((ASO.SALE_ORDER_ISSELF_MENTION != '是'
|
|
and to_date(#{startDate}, 'yyyy-mm-dd') <= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
and to_date(#{startDate}, 'yyyy-mm-dd') <= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
- AND ASO.SALE_TYPE in (1,4)) T0
|
|
|
|
|
|
+ AND ASO.SALE_TYPE = 1)
|
|
|
|
+ OR (to_date(#{startDate}, 'yyyy-mm-dd') <= to_date(to_char(ASO.INSERT_TIME,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASO.INSERT_TIME,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
|
+ AND ASO.SALE_TYPE = 4))
|
|
|
|
+ ) T0
|
|
LEFT JOIN
|
|
LEFT JOIN
|
|
(
|
|
(
|
|
SELECT
|
|
SELECT
|