From ee81ed0a1bec1bf29f3e20eba60a8e1e17c882f2 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 11 Sep 2025 15:52:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../EmisWaybillAjustApplyServiceImpl.java | 183 +++++++++++++++++- 1 file changed, 176 insertions(+), 7 deletions(-) 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 5ec79d07e..393d28396 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,12 +10,14 @@ package com.xdadan.erp.emis.service.impl; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.Calendar; +import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; -import java.util.Objects; +import java.util.Set; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.core.domain.entity.SysUser; @@ -27,12 +29,13 @@ import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper; import com.xdadan.erp.emis.service.*; -import com.xdadan.erp.emis.utils.WaybillHelper; +import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.mapper.SysPostMapper; -import com.xdadan.erp.system.service.ISysFileInfoService; -import com.xdadan.erp.system.service.ISysNoticeService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper; @@ -45,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2024-06-25 23:39:28 */ @Service +@Slf4j public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements IEmisWaybillAjustApplyService { @Autowired @@ -417,8 +421,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements emisWaybillService.reUpdateWayBill(emisWaybillOld, emisWaybillSave, false, false); } - String title="费用调整已审批通过，单号【"+emisWaybillAjustApply.getBillCode()+"】"; - sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); + String title = "费用调整已审批通过，单号【" + emisWaybillAjustApply.getBillCode() + "】"; + sendNoticeToEmpUser(emisWaybillAjustApply.getApplyManCode(), title, "", + "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); + + // 检查申请人是否为单证员且费用发生变化时，需要通知相关人员 + checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave); if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 @@ -519,4 +527,165 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements return emisWaybillAjustApplyMapper.auditCenterNoPass(emisWaybillAjustApply); } + /** + * 检查申请人是否为单证员且费用发生变化时，通知相关人员 + * + * @param emisWaybillAjustApply 运单调整申请 + * @param emisWaybillOld 原运单信息 + * @param emisWaybillSave 新运单信息 + */ + private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply, + EmisWaybill emisWaybillOld, + EmisWaybill emisWaybillSave) { + try { + String title = "费用调整已审批通过，单号【" + emisWaybillAjustApply.getBillCode() + "】"; + String message = "单证员已对运单费用进行调整，请关注相关变化"; + String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; + + // 1. 根据applyManCode查询用户岗位，判断是否包含CP（单证员） + boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); + + // 2. 检测网点费用申请是否涉及费用发生变化 + boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); + + if (!isCP || !feeChanged) { + return; // 不是单证员/费用没有变化，无需特殊处理 + } + + // 3. 获取运单对应的payee、salesmen信息 + String payee = emisWaybillSave.getPayee(); + String salesmen = emisWaybillSave.getSalesmen(); + + // 4. 将payee、salesmen放到Set集合中去重 + Set empNames = new HashSet<>(); + if (!StringUtils.isEmpty(payee)) { + empNames.add(payee); + } + if (!StringUtils.isEmpty(salesmen)) { + empNames.add(salesmen); + } + + // 5. 查询去重后的emp_name对应的emp_code + Set notifyEmpCodes = new HashSet<>(); + for (String empName : empNames) { + List empCodes = getEmpCodesByEmpName(empName); + notifyEmpCodes.addAll(empCodes); + } + + // 6. 分别调用sendNoticeToEmpUser发送通知 + if (!notifyEmpCodes.isEmpty()) { + for (String empCode : notifyEmpCodes) { + if (!StringUtils.isEmpty(empCode)) { + sendNoticeToEmpUser(empCode, title, message, + clickPath); + } + } + } + + } catch (Exception e) { + // 记录异常但不影响主流程 + log.error("检查费用变化通知时发生异常", e); + } + } + + /** + * 检查申请人是否为单证员（岗位代码包含CP） + * + * @param empCode 员工代码 + * @return 是否为单证员 + */ + private boolean checkIsCP(String empCode) { + if (StringUtils.isEmpty(empCode)) { + return false; + } + + try { + SysUser opUser = getEmisStaffByCode(empCode); + if (opUser == null) { + return false; + } + + // 根据user_id关联sys_user_post查询post_id + List postIds = postMapper.selectPostListByUserId(opUser.getUserId()); + if (CollectionUtils.isEmpty(postIds)) { + return false; + } + + // 根据post_id关联sys_post获取post_code，判断是否包含CP + for (Long postId : postIds) { + SysPost sysPost = new SysPost(); + sysPost.setPostId(postId); + List postList = postMapper.selectPostList(sysPost); + if (!CollectionUtils.isEmpty(postList)) { + SysPost post = postList.get(0); + if (post.getPostCode() != null && post.getPostCode().contains("CP")) { + return true; + } + } + } + + } catch (Exception e) { + log.error("检查单证员岗位时发生异常", e); + } + + return false; + } + + /** + * 检查费用是否发生变化 + * + * @param oldWaybill 原运单 + * @param newWaybill 新运单 + * @return 费用是否发生变化 + */ + private boolean checkFeeChanged(EmisWaybill oldWaybill, EmisWaybill newWaybill) { + if (oldWaybill == null || newWaybill == null) { + return false; + } + + // 比较运费 + BigDecimal oldFreight = oldWaybill.getFreight(); + BigDecimal newFreight = newWaybill.getFreight(); + + if (oldFreight == null && newFreight == null) { + return false; + } + + if (oldFreight == null || newFreight == null) { + return true; + } + + return oldFreight.compareTo(newFreight) != 0; + } + + /** + * 根据员工姓名获取员工代码列表 + * 一个emp_name可能对应多个emp_code + * + * @param empName 员工姓名 + * @return 员工代码列表 + */ + private List getEmpCodesByEmpName(String empName) { + List empCodes = new ArrayList<>(); + if (StringUtils.isEmpty(empName)) { + return empCodes; + } + + try { + // 使用现有的方法获取单个用户 + SysUser user = getEmisStaffByEmpName(empName); + if (user != null && !StringUtils.isEmpty(user.getEmpCode())) { + empCodes.add(user.getEmpCode()); + } + + // 如果还需要查询多个同名用户，可以在这里添加额外的查询逻辑 + // 目前先使用单个查询，如果需要支持多个同名用户，需要添加新的查询方法 + + } catch (Exception e) { + log.error("根据员工姓名查询员工代码时发生异常，empName: {}", empName, e); + } + + return empCodes; + } + } From 30f12b876cf4a6d773f02704e88a11e6d03c0336 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 11 Sep 2025 17:39:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../impl/EmisWaybillAjustApplyServiceImpl.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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 393d28396..e9cd055a4 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 @@ -13,11 +13,7 @@ package com.xdadan.erp.emis.service.impl; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.core.domain.entity.SysUser; @@ -613,12 +609,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements // 根据post_id关联sys_post获取post_code，判断是否包含CP for (Long postId : postIds) { - SysPost sysPost = new SysPost(); - sysPost.setPostId(postId); - List postList = postMapper.selectPostList(sysPost); - if (!CollectionUtils.isEmpty(postList)) { - SysPost post = postList.get(0); - if (post.getPostCode() != null && post.getPostCode().contains("CP")) { + SysPost sysPost = postMapper.selectPostById(postId); + if (Objects.nonNull(sysPost)) { + if (sysPost.getPostCode() != null && sysPost.getPostCode().contains("CP")) { return true; } } From 7fb3581adf523b0013f20b0a94ba2bf4829117c2 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 11 Sep 2025 18:17:27 +0800 Subject: [PATCH 03/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../impl/EmisWaybillAjustApplyServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 e9cd055a4..87c63fc87 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 @@ -27,6 +27,7 @@ import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper; import com.xdadan.erp.emis.service.*; import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.mapper.SysPostMapper; +import com.xdadan.erp.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -72,6 +73,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements @Autowired private IEmisSettleBillService emisSettleBillService; + @Autowired + private SysUserMapper sysUserMapper; + /** * 查询运单调整申请 @@ -666,13 +670,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements try { // 使用现有的方法获取单个用户 - SysUser user = getEmisStaffByEmpName(empName); - if (user != null && !StringUtils.isEmpty(user.getEmpCode())) { - empCodes.add(user.getEmpCode()); - } - - // 如果还需要查询多个同名用户，可以在这里添加额外的查询逻辑 - // 目前先使用单个查询，如果需要支持多个同名用户，需要添加新的查询方法 + SysUser user = new SysUser(); + user.setEmpName(empName); + List sysUsers = sysUserMapper.selectUserList(user); + sysUsers.stream().map(SysUser::getEmpCode).forEach(empCodes::add); } catch (Exception e) { log.error("根据员工姓名查询员工代码时发生异常，empName: {}", empName, e); From 14866770d28004f35b4da80474316c38c59ae408 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 09:19:08 +0800 Subject: [PATCH 04/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 87c63fc87..66408a349 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 @@ -538,8 +538,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements EmisWaybill emisWaybillOld, EmisWaybill emisWaybillSave) { try { - String title = "费用调整已审批通过，单号【" + emisWaybillAjustApply.getBillCode() + "】"; - String message = "单证员已对运单费用进行调整，请关注相关变化"; + // String message = "单证员已对运单费用进行调整，请关注相关变化"; String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; // 1. 根据applyManCode查询用户岗位，判断是否包含CP（单证员） @@ -576,7 +575,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if (!notifyEmpCodes.isEmpty()) { for (String empCode : notifyEmpCodes) { if (!StringUtils.isEmpty(empCode)) { - sendNoticeToEmpUser(empCode, title, message, + String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; + sendNoticeToEmpUser(empCode, title, "", clickPath); } } From ca94198d512a554fed4593bca3a7671b7d3d2470 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 09:39:14 +0800 Subject: [PATCH 05/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../impl/EmisWaybillAjustApplyServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 66408a349..7c3e4cd0f 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 @@ -31,8 +31,6 @@ import com.xdadan.erp.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper; @@ -426,7 +424,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); // 检查申请人是否为单证员且费用发生变化时，需要通知相关人员 - checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave); + checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave, isDZZS); if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 @@ -533,21 +531,22 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements * @param emisWaybillAjustApply 运单调整申请 * @param emisWaybillOld 原运单信息 * @param emisWaybillSave 新运单信息 + * @param isDZZS */ private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply, - EmisWaybill emisWaybillOld, - EmisWaybill emisWaybillSave) { + EmisWaybill emisWaybillOld, + EmisWaybill emisWaybillSave, boolean isDZZS) { try { // String message = "单证员已对运单费用进行调整，请关注相关变化"; String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; // 1. 根据applyManCode查询用户岗位，判断是否包含CP（单证员） - boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); +// boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); // 2. 检测网点费用申请是否涉及费用发生变化 boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); - if (!isCP || !feeChanged) { + if (!isDZZS || !feeChanged) { return; // 不是单证员/费用没有变化，无需特殊处理 } From 68a271d733598d2150fbfcf96194ed242eec87ad Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 10:21:31 +0800 Subject: [PATCH 06/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E5=BD=93=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=91=98=E5=B7=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=8D=95=E8=AF=81=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E4=BA=A7=E7=94=9F=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=EF=BC=8C.=E6=8F=90=E9=86=92=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=9A=E8=AF=A5=E8=BF=90=E5=8D=95=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BB=A5=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../impl/EmisWaybillAjustApplyServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 7c3e4cd0f..dddf0cd64 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 @@ -424,7 +424,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"); // 检查申请人是否为单证员且费用发生变化时，需要通知相关人员 - checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave, isDZZS); + checkAndNotifyFeeChange(emisWaybillAjustApply, emisWaybillOld, emisWaybillSave); if ("6".equals(emisWaybillOld.getPaymentType()) && !"6".equals(emisWaybillSave.getPaymentType())) { // 重新计算提成 @@ -531,11 +531,10 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements * @param emisWaybillAjustApply 运单调整申请 * @param emisWaybillOld 原运单信息 * @param emisWaybillSave 新运单信息 - * @param isDZZS */ private void checkAndNotifyFeeChange(EmisWaybillAjustApply emisWaybillAjustApply, EmisWaybill emisWaybillOld, - EmisWaybill emisWaybillSave, boolean isDZZS) { + EmisWaybill emisWaybillSave) { try { // String message = "单证员已对运单费用进行调整，请关注相关变化"; String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; @@ -546,8 +545,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements // 2. 检测网点费用申请是否涉及费用发生变化 boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); - if (!isDZZS || !feeChanged) { - return; // 不是单证员/费用没有变化，无需特殊处理 + if (!feeChanged) { + return; //费用没有变化，无需特殊处理 + } + + boolean isDZZS = checkIsDZZS(emisWaybillAjustApply.getApplyManCode()); + + if (!isDZZS ) { + return; // 不是单证专属，无需特殊处理 } // 3. 获取运单对应的payee、salesmen信息 From b103d976a96e374a4a452ac43e60a8adb3a6f986 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 14:36:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E9=94=80=E5=94=AE=E5=AF=B9=E5=BA=94=E7=9A=84=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8A=A9=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../EmisWaybillAjustApplyServiceImpl.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) 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 dddf0cd64..6efc9671f 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 @@ -24,6 +24,7 @@ import com.xdadan.erp.emis.domain.enumtype.WaybillOperLogType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.WaybillOrder; import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper; +import com.xdadan.erp.emis.mapper.EmisSalesmenRelMapper; import com.xdadan.erp.emis.service.*; import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.mapper.SysPostMapper; @@ -74,6 +75,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements @Autowired private SysUserMapper sysUserMapper; + @Autowired + private EmisSalesmenRelMapper emisSalesmenRelMapper; + /** * 查询运单调整申请 @@ -540,18 +544,18 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements String clickPath = "/d24/expenseRecognitionManagemen/WaybillAjustApplyList"; // 1. 根据applyManCode查询用户岗位，判断是否包含CP（单证员） -// boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); + // boolean isCP = checkIsCP(emisWaybillAjustApply.getApplyManCode()); // 2. 检测网点费用申请是否涉及费用发生变化 boolean feeChanged = checkFeeChanged(emisWaybillOld, emisWaybillSave); if (!feeChanged) { - return; //费用没有变化，无需特殊处理 + return; // 费用没有变化，无需特殊处理 } boolean isDZZS = checkIsDZZS(emisWaybillAjustApply.getApplyManCode()); - if (!isDZZS ) { + if (!isDZZS) { return; // 不是单证专属，无需特殊处理 } @@ -566,6 +570,18 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements } if (!StringUtils.isEmpty(salesmen)) { empNames.add(salesmen); + // 从销售关联表查询销售助理并加入通知名单 + EmisSalesmenRel relCond = new EmisSalesmenRel(); + relCond.setSalesmen(salesmen); + relCond.setBlOpen("1"); + List relList = emisSalesmenRelMapper.selectEmisSalesmenRelList(relCond); + if (!CollectionUtils.isEmpty(relList)) { + for (EmisSalesmenRel rel : relList) { + if (rel != null && !StringUtils.isEmpty(rel.getSalesAss())) { + empNames.add(rel.getSalesAss()); + } + } + } } // 5. 查询去重后的emp_name对应的emp_code @@ -579,7 +595,8 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if (!notifyEmpCodes.isEmpty()) { for (String empCode : notifyEmpCodes) { if (!StringUtils.isEmpty(empCode)) { - String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; + String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" + + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; sendNoticeToEmpUser(empCode, title, "", clickPath); } From a3f9ec0bff3b0fd1021745f407b9f1e6e7d274f0 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 15:22:28 +0800 Subject: [PATCH 08/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=BB=8E=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=94=E5=91=8A?= =?UTF-8?q?=E7=9F=A5=E8=B4=B9=E7=94=A8=E5=8F=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../EmisWaybillAjustApplyServiceImpl.java | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) 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 6efc9671f..5e5fc31ed 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 @@ -62,7 +62,6 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements @Autowired private SysPostMapper postMapper; - @Autowired private IEmisSettleSubBillService emisSettleSubBillService; @@ -584,19 +583,44 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements } } - // 5. 查询去重后的emp_name对应的emp_code + // 5. 查询去重后的emp_name对应的emp_code，并构建empCode->empName映射，避免后续重复查询 Set notifyEmpCodes = new HashSet<>(); - for (String empName : empNames) { - List empCodes = getEmpCodesByEmpName(empName); - notifyEmpCodes.addAll(empCodes); + java.util.Map empCodeToName = new java.util.HashMap<>(); + for (String name : empNames) { + SysUser cond = new SysUser(); + cond.setEmpName(name); + List users = sysUserMapper.selectUserList(cond); + if (!CollectionUtils.isEmpty(users)) { + for (SysUser u : users) { + if (u != null && !StringUtils.isEmpty(u.getEmpCode())) { + notifyEmpCodes.add(u.getEmpCode()); + if (!StringUtils.isEmpty(u.getEmpName())) { + empCodeToName.put(u.getEmpCode(), u.getEmpName()); + } + } + } + } } - // 6. 分别调用sendNoticeToEmpUser发送通知 + // 6. 循环外预先计算申请人姓名与费用变更字符串，减少重复计算 + SysUser applyUser = getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode()); + String applyManName = (applyUser != null && !StringUtils.isEmpty(applyUser.getEmpName())) + ? applyUser.getEmpName() + : emisWaybillAjustApply.getApplyManCode(); + BigDecimal oldFreight = emisWaybillOld != null ? emisWaybillOld.getFreight() : null; + BigDecimal newFreight = emisWaybillSave != null ? emisWaybillSave.getFreight() : null; + String oldFreightStr = oldFreight == null ? "-" : oldFreight.stripTrailingZeros().toPlainString(); + String newFreightStr = newFreight == null ? "-" : newFreight.stripTrailingZeros().toPlainString(); + + // 7. 分别调用sendNoticeToEmpUser发送通知 if (!notifyEmpCodes.isEmpty()) { for (String empCode : notifyEmpCodes) { if (!StringUtils.isEmpty(empCode)) { - String title = emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empCode + "仔细核对，" - + "单号【" + emisWaybillAjustApply.getBillCode() + "】"; + String empName = !StringUtils.isEmpty(empCodeToName.get(empCode)) ? empCodeToName.get(empCode) + : empCode; + String title = applyManName + "已对运单费用进行调整，" + "请" + empName + "仔细核对，" + + "单号【" + emisWaybillAjustApply.getBillCode() + "】" + "，运费由" + oldFreightStr + "调整为" + + newFreightStr; sendNoticeToEmpUser(empCode, title, "", clickPath); } From 6ddf026275359055e4c1e0dd74174f3f9eedb48d Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 15:28:52 +0800 Subject: [PATCH 09/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=BB=8E=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=94=E5=91=8A?= =?UTF-8?q?=E7=9F=A5=E8=B4=B9=E7=94=A8=E5=8F=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e5fc31ed..aecd9219d 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 @@ -618,7 +618,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if (!StringUtils.isEmpty(empCode)) { String empName = !StringUtils.isEmpty(empCodeToName.get(empCode)) ? empCodeToName.get(empCode) : empCode; - String title = applyManName + "已对运单费用进行调整，" + "请" + empName + "仔细核对，" + String title = applyManName + "_" + emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empName + "_" + empCode + "仔细核对，" + "单号【" + emisWaybillAjustApply.getBillCode() + "】" + "，运费由" + oldFreightStr + "调整为" + newFreightStr; sendNoticeToEmpUser(empCode, title, "", From 019de52f66aba2d8b9b4488728ef0c3e69a90a05 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 12 Sep 2025 15:41:24 +0800 Subject: [PATCH 10/10] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=BB=8E=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=94=E5=91=8A?= =?UTF-8?q?=E7=9F=A5=E8=B4=B9=E7=94=A8=E5=8F=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../emis/service/impl/EmisWaybillAjustApplyServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 aecd9219d..17357f3fc 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 @@ -618,8 +618,9 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements if (!StringUtils.isEmpty(empCode)) { String empName = !StringUtils.isEmpty(empCodeToName.get(empCode)) ? empCodeToName.get(empCode) : empCode; - String title = applyManName + "_" + emisWaybillAjustApply.getApplyManCode() + "已对运单费用进行调整，" + "请" + empName + "_" + empCode + "仔细核对，" - + "单号【" + emisWaybillAjustApply.getBillCode() + "】" + "，运费由" + oldFreightStr + "调整为" + String title = applyManName + "(" + emisWaybillAjustApply.getApplyManCode() + ")" + + "已对运单费用进行调整，" + "请" + empName + "(" + empCode + ")" + "仔细核对，" + + "运单号" + emisWaybillAjustApply.getBillCode() + "，运费由" + oldFreightStr + "调整为" + newFreightStr; sendNoticeToEmpUser(empCode, title, "", clickPath);