diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index 69c349503..5ec79d07e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -10,6 +10,9 @@ package com.xdadan.erp.emis.service.impl; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Objects; @@ -166,7 +169,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements sendAddress.setAddressType("1"); sendAddress.setEnterpriseName(emisWaybillSave.getEnterpriseName()); sendAddress.setEnterpriseTaxId(emisWaybillSave.getEnterpriseTaxId()); -// checkAdress(sendAddress); + + LocalDateTime thresholdDateTime = LocalDateTime.of(2025, 9, 1, 0, 0, 0); + Date thresholdDate = Date.from(thresholdDateTime.atZone(ZoneId.systemDefault()).toInstant()); + + Date sendDate = emisWaybillSave.getSendDate(); + if (sendDate != null && sendDate.after(thresholdDate)) { + checkAdress(sendAddress); + } // 插入数据 emisWaybillAjustApply.setApplyDate(new Date()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 3ba2b0990..958603850 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -64,6 +64,8 @@ package com.xdadan.erp.emis.service.impl; import java.math.RoundingMode; import java.net.URLEncoder; import java.text.DecimalFormat; + import java.time.LocalDateTime; + import java.time.ZoneId; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -2628,8 +2630,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 保存客户收件、寄件地址,开单不要关联客户地址数据 -// createCustomerAddressNew(sendAddress); - createCustomerAddress(sendAddress); + // 定义阈值日期:2025年9月1日 00:00:00 + LocalDateTime thresholdDateTime = LocalDateTime.of(2025, 9, 1, 0, 0, 0); + Date thresholdDate = Date.from(thresholdDateTime.atZone(ZoneId.systemDefault()).toInstant()); + + Date sendDate = emisWaybillSave.getSendDate(); + if (sendDate != null && sendDate.before(thresholdDate)) { + createCustomerAddress(sendAddress); + } else { + createCustomerAddressNew(sendAddress); + } createCustomerAddress(recieveAddress); emisWaybillSave.setCustomerCode(customerCode);