diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java index ac1c517..aee4a25 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java @@ -22,10 +22,10 @@ public interface AllocationBillMapper extends BaseMapper { @DS("oracle_eas") - Long getAllocationCount(@Param("fuzzy") String fuzzy,@Param("ckbm") String ckbm); + Long getAllocationCount(@Param("fuzzy") String fuzzy,@Param("drkcbm") String drkcbm,@Param("dckcbm") String dckcbm); @DS("oracle_eas") - List allocationPage(@Param("fuzzy") String fuzzy, @Param("ckbm") String ckbm,@Param("page") Integer page, @Param("size") Integer size ); + List allocationPage(@Param("fuzzy") String fuzzy,@Param("drkcbm") String drkcbm,@Param("dckcbm") String dckcbm,@Param("page") Integer page, @Param("size") Integer size ); @Select("SELECT COUNT(*) FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL WHERE DJID = #{djid}") 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 f50f3ab..a179b46 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 @@ -5,7 +5,7 @@ SELECT * FROM EAS_NOBLE.V_UC_OUTINBILL WHERE DJZT = '提交' - AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '60' DAY(3) + AND TO_DATE(cjsj, 'YYYY-MM-DD HH24:MI:SS') >= TRUNC(SYSDATE) - INTERVAL '1' DAY(3)