From 06bbad8098ce1ff349aec865767cc232df084718 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 12 Mar 2025 14:49:56 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 +++++++++++- .../service/impl/EmisTmsScanRecordServiceImpl.java | 7 ++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 585437faa..de6dcd64a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2014,9 +2014,19 @@ public class EmisBaseService { waybill.preUpdate(); emisWaybillMapper.updateProblemStatus(waybill); + // 重新计算信用额度 173,170,151 + Integer typeId = emisProblemType.getId(); + if(typeId == 173 || typeId == 170 || typeId == 151) { + try { + adjustUseQuotaCredit(oldEmisWaybill, null); + } catch (EmisBizError emisBizError) { + log.error("问题件信用额度计算失败"); + emisBizError.printStackTrace(); + } + } + // 判断是否需要发问题件短信 if( emisProblemType.getIsSendSms() == 1 ) { - //发送寄件短信 String content="尊敬的用户：您的运单${name}从${Sendingcountry}寄往${Receivingcountry}因${Problemtype}的问题导致货物时效延误预计送达时间${time},详询400-025-7080感谢您对探路速运的支持！"; String sendingcountry=oldEmisWaybill.getSendCountryName(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 2b57ddde8..4f2e005b4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1583,9 +1583,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } - if( - !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite()) - && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode()) + if(!getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite()) + && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode()) ){ scanResultItem.setResult("fail"); scanResultItem.setMessage("合包不在当前网点或下一网点，无权拆包"); @@ -1628,7 +1627,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 插入扫描记录 addScanRecord(emisTmsScanRecord); - // 更新合包运单扫描状态 ,拆包 emisTmsPackDtl.setBillCode(scanBillCode); emisTmsPackDtl.setPackStatus("0"); @@ -1880,7 +1878,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm itemList.add(scanResultItem); } - return itemList; }