diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index 33adf4a4f..96d6d1ce2 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -420,7 +420,7 @@ public class EmisSettleSubBillController extends EmisBaseController Date now=WaybillHelper.removeTimeHMS(new Date()); Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 int dayDiff=(int)(num/24/60/60/1000); - if(dayDiff<4){ + if(dayDiff<3){ return AjaxResult.error("账单未到出账确认时间,不允许处理:"+old.getBillCode()); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java index 4520eee2e..16ba26fe2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java @@ -396,9 +396,13 @@ public class WaybillHelper { //// e.printStackTrace(); //// } - Date sendDate=WaybillHelper.removeTimeHMS(new Date()); - sendDate = DateUtils.addDays(sendDate,-4); + String sendDateStr="2024-08-31 15:45:22"; + Date sendDate=DateUtils.parseDate(sendDateStr); + sendDate=WaybillHelper.removeTimeHMS(sendDate); +// sendDate = DateUtils.addDays(sendDate,-4); Date now=WaybillHelper.removeTimeHMS(new Date()); + System.out.println(sendDate); + System.out.println(now); Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 int dayDiff=(int)(num/24/60/60/1000); System.out.println(dayDiff);