aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-03 14:18:49 +08:00
parent 54fe327fe1
commit aaee38b6cb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -420,7 +420,7 @@ public class EmisSettleSubBillController extends EmisBaseController
Date now=WaybillHelper.removeTimeHMS(new Date()); Date now=WaybillHelper.removeTimeHMS(new Date());
Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数
int dayDiff=(int)(num/24/60/60/1000); int dayDiff=(int)(num/24/60/60/1000);
if(dayDiff<4){ if(dayDiff<3){
return AjaxResult.error("账单未到出账确认时间，不允许处理:"+old.getBillCode()); return AjaxResult.error("账单未到出账确认时间，不允许处理:"+old.getBillCode());
} }
} }

8
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -396,9 +396,13 @@ public class WaybillHelper {
//// e.printStackTrace(); //// e.printStackTrace();
//// } //// }
Date sendDate=WaybillHelper.removeTimeHMS(new Date()); String sendDateStr="2024-08-31 15:45:22";
sendDate = DateUtils.addDays(sendDate,-4); Date sendDate=DateUtils.parseDate(sendDateStr);
sendDate=WaybillHelper.removeTimeHMS(sendDate);
// sendDate = DateUtils.addDays(sendDate,-4);
Date now=WaybillHelper.removeTimeHMS(new Date()); Date now=WaybillHelper.removeTimeHMS(new Date());
System.out.println(sendDate);
System.out.println(now);
Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数
int dayDiff=(int)(num/24/60/60/1000); int dayDiff=(int)(num/24/60/60/1000);
System.out.println(dayDiff); System.out.println(dayDiff);