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

demand: 运单录入/运单批量录入/运单修改/网点费用申请企业名称、企业税号相关逻辑添加开关，9月1号以前的执行旧逻辑，9月1号以后的执行新逻辑

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-08-27 09:19:09 +08:00
parent b4cfe386cf
commit 04db785ccf
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -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());

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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);