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-04-30 12:18:11 +08:00
parent cb9c892be9
commit 1b529c09d7
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,11 @@ public class EmisBaseService {
int weekDays = computeWeekDays(startDate,endDate,true); int weekDays = computeWeekDays(startDate,endDate,true);
// 计算不计较时效的时间 // 计算不计较时效的时间
int notCaclDays=emisNotCalcAgingMapper.getNotCalcAgingDays(receiveCountry,sendCountry,startDate,endDate); int notCaclDays=emisNotCalcAgingMapper.getNotCalcAgingDays(
receiveCountry,
sendCountry,
startDate,
endDate);
int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays; int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays;
log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays); log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays);

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

@ -265,7 +265,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(emisWaybillSave.getSendDate()==null){ if(emisWaybillSave.getSendDate()==null){
emisWaybillSave.setSendDate(new Date()); emisWaybillSave.setSendDate(new Date());
} }
Date estDate = getEstimateDate(emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(),emisWaybillSave.getSendCountry(),emisWaybillSave.getReceiveCountry()); Date estDate = getEstimateDate(
emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(),
emisWaybillSave.getSendCountry(),
emisWaybillSave.getReceiveCountry());
// 预计到达时间 // 预计到达时间
log.info("预估到达时间==>"+ DateUtils.dateTime(estDate)); log.info("预估到达时间==>"+ DateUtils.dateTime(estDate));

2
emis-biz/src/main/resources/mapper/EmisNotCalcAgingMapper.xml
View File

@ -31,7 +31,7 @@
select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code}) select GROUP_CONCAT(name) from emis_country where FIND_IN_SET(`code`,#{code})
</select> </select>
<select id="getNotCalcAgingDays" parameterType="String" resultType="int"> <select id="getNotCalcAgingDays" resultType="integer">
select count(1) from emis_not_calc_aging where ( FIND_IN_SET('-1',country) or FIND_IN_SET(#{recieveCountry},country) or FIND_IN_SET(#{sendCountry},country) ) and no_calc_day <![CDATA[ >= ]]> #{startDate} and no_calc_day <![CDATA[ <= ]]> #{endDate} select count(1) from emis_not_calc_aging where ( FIND_IN_SET('-1',country) or FIND_IN_SET(#{recieveCountry},country) or FIND_IN_SET(#{sendCountry},country) ) and no_calc_day <![CDATA[ >= ]]> #{startDate} and no_calc_day <![CDATA[ <= ]]> #{endDate}
</select> </select>