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-07 14:03:00 +08:00
parent 324ac24c41
commit 3ef978b1fe
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,8 +524,21 @@ public class EmisSettleSubBillController extends EmisBaseController
return AjaxResult.error("财务已确认!");
}
// 如果已合账，也不允许不出账
// 目的地是中国时需要 4天后才可以确认
if("0086".equals(oldSubBill.getWaybillDetail().getReceiveCountry())
&& (
"2".equals(oldSubBill.getWaybillDetail().getPaymentType())
|| "4".equals(oldSubBill.getWaybillDetail().getPaymentType())
|| "5".equals(oldSubBill.getWaybillDetail().getPaymentType()) ) ){
Date sendDate=WaybillHelper.removeTimeHMS(oldSubBill.getWaybillDetail().getSendDate());
Date now=WaybillHelper.removeTimeHMS(new Date());
Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数
int dayDiff=(int)(num/24/60/60/1000);
if(dayDiff<3){
return AjaxResult.error("账单未到出账确认时间，不允许处理:"+oldSubBill.getBillCode());
}
}
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();