diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java index 9d8f573..539f14e 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java @@ -34,6 +34,10 @@ public interface EasOutInBillDetailMapper extends BaseMapper @DS("oracle_eas") List selectPageWithInventory(); + @DS("oracle_eas") + Set selectEasIds(); + @DS("mysql_srm") + Set selectSrmIds(); @DS("mysql_srm") List selectSrmPageWithInventory(); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java index 776b5b6..8c1b57f 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java @@ -25,7 +25,10 @@ public interface EasOutInBillMapper extends BaseMapper { List getSrmBills(); //AND STR_TO_DATE( cjsj, '%Y-%m-%d' ) >= CURDATE() - INTERVAL 1 MONTH; - List queryExistBills(); + Set queryExistBills(); + Set queryLocalBills(); + + List queryBillList(@Param("ids") Set ids); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml index 25a1770..105d9f7 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml @@ -9,12 +9,26 @@ WHERE DJZT = '提交' AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '91' DAY(3) + + SELECT - djid + DJID FROM - eas_out_in_bill + EAS_OUT_IN_BILL + + +