From 3ef978b1fe77f52f72e3ae3851f6c53cfccdbfa9 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 7 Sep 2024 14:03:00 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisSettleSubBillController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 ce6f6de44..8e75e4746 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 @@ -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();