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

Merge pull request 'demand:修复运单录入问题件后运单预计送达时间计算不准确的问题。' (#173) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/173
This commit is contained in:
heyu 2025-09-02 14:53:46 +08:00
commit 53cd9e2378
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -2447,7 +2447,7 @@ public class EmisBaseService {
EmisWaybill oldEmisWaybill=getWaybillByBillCode(waybillProblemInfo.getMainBillCode()); EmisWaybill oldEmisWaybill=getWaybillByBillCode(waybillProblemInfo.getMainBillCode());
Date oldEstDate=oldEmisWaybill.getEstimateDate(); Date oldEstDate=oldEmisWaybill.getEstimateDate();
Date currentTime=new Date(); Date currentTime=new Date();
Date startDate=oldEmisWaybill.getSendDate(); Date startDate=oldEmisWaybill.getEstimateDate();
// 如果当前时间已经超过当前预估时间需要使用当前时间 // 如果当前时间已经超过当前预估时间需要使用当前时间
if(currentTime.getTime()>oldEstDate.getTime()){ if(currentTime.getTime()>oldEstDate.getTime()){