|
@@ -2199,6 +2199,7 @@
|
|
|
ASO.SALE_ORDER_ID "saleOrderId",
|
|
ASO.SALE_ORDER_ID "saleOrderId",
|
|
|
to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
|
|
to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
|
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
ASO.SALE_NUMBER "saleOrderNo",
|
|
|
|
|
+ ASO.SALE_ORDER_STATUS "saleOrderStatus",
|
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
ASM.SALE_MATERIAL_ID "saleMaterialId",
|
|
|
ASM.MATERIAL_NUMBER "materialNum",
|
|
ASM.MATERIAL_NUMBER "materialNum",
|
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
ASM.EAS_PRIMARY_ID "closeEntryId",
|
|
@@ -2320,7 +2321,6 @@
|
|
|
WHERE ASO.SALE_TYPE = 1
|
|
WHERE ASO.SALE_TYPE = 1
|
|
|
AND ASO.DELETED = 0
|
|
AND ASO.DELETED = 0
|
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
- and BDO.WETHER_TO_STATEMENT = 0
|
|
|
|
|
<if test="oneDate != null">
|
|
<if test="oneDate != null">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd') < = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd') < = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
</if>
|
|
</if>
|
