From ea77d405ce81eccb08cbfe786088006573c6dde7 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 10 Apr 2026 13:00:15 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?= =?UTF-8?q?=20=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=20-=20=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=20=20=20TMS?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20-=20=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20-=20=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5?= =?UTF-8?q?=20-=20=E7=BC=85=E7=94=B8=E8=99=9A=E6=8B=9F=E5=8D=95=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=20=20TMS/APP=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20-=20=E6=8E=A5=E5=8D=95/=E8=BF=90=E5=8D=95=E5=BD=95?= =?UTF-8?q?=E5=85=A5/=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=20/=20=E7=BD=91?= =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7/=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=BD=95=E5=85=A5=20-=20=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=9A=E5=88=B0=E4=BB=98/=E7=8E=B0=E9=87=91/?= =?UTF-8?q?=E5=85=B6=E4=BB=96=20=E5=88=A4=E6=96=AD=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA/=E9=94=80=E5=94=AE=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA/=E9=94=80=E5=94=AE=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmisWaybillServiceImpl.java | 64 ++++++++----------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 1dc55e448..fcfbe1664 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1269,55 +1269,41 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb String payee = wb.getPayee(); if (StringUtils.isNotBlank(payee)) { String payeeName = payee.trim(); - SysUser payeeUser = getEmisStaffByEmpName(payeeName); - if (payeeUser == null) { - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人" + payeeName + "不存在"); - } - if (!"1".equals(payeeUser.getBlPayeeRemark())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "无回款权限"); - } - if (!"1".equals(payeeUser.getBlOpen())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "回款联系人" + payeeName + "未启用"); + SysUser payeeCond = new SysUser(); + payeeCond.setEmpName(payeeName); + payeeCond.setBlPayeeRemark("1"); + payeeCond.setBlOpen("1"); + List payeeUsers = sysUserMapper.selectUserList(payeeCond); + if (CollectionUtil.isEmpty(payeeUsers)) { + throw new EmisBizError(EmisBizErrorType.FAIL, "当前回款联系人" + payeeName + "已失效，请更换客户对应的回款联系人"); } } String salesmen = wb.getSalesmen(); if (StringUtils.isNotBlank(salesmen)) { String salesmenName = salesmen.trim(); - SysUser salesUser = getEmisStaffByEmpName(salesmenName); - if (salesUser == null) { - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人" + salesmenName + "不存在"); - } - if (!"1".equals(salesUser.getBlPayeeRemark())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "无回款权限"); - } - if (!"1".equals(salesUser.getBlOpen())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "销售联系人" + salesmenName + "未启用"); + SysUser salesCond = new SysUser(); + salesCond.setEmpName(salesmenName); + salesCond.setBlPayeeRemark("1"); + salesCond.setBlOpen("1"); + List salesUsers = sysUserMapper.selectUserList(salesCond); + if (CollectionUtil.isEmpty(salesUsers)) { + throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售联系人" + salesmenName + "已失效，请更换客户对应的销售联系人"); } } - String salesSupportRaw = null; - if (wb.getWaybillOther() != null) { - salesSupportRaw = wb.getWaybillOther().getSalesSupport(); + if(wb.getWaybillOther()==null){ + return; } - if (StringUtils.isBlank(salesSupportRaw)) { - salesSupportRaw = wb.getSalesSupport(); - } - String salesSupportToCheck = StringUtils.trimToEmpty(salesSupportRaw); - if (StringUtils.isNotBlank(salesSupportToCheck)) { - String[] supports = salesSupportToCheck.split("[,，]"); - for (String support : supports) { - if (StringUtils.isBlank(support)) { - continue; - } - String supportName = support.trim(); - SysUser supportUser = getEmisStaffByEmpName(supportName); - if (supportUser == null) { - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售支持" + supportName + "不存在"); - } - if (!"1".equals(supportUser.getBlOpen())) { - throw new EmisBizError(EmisBizErrorType.FAIL, "销售支持" + supportName + "未启用"); - } + String support = wb.getWaybillOther().getSalesSupport().trim(); + if (StringUtils.isNotBlank(support)) { + SysUser supportCond = new SysUser(); + supportCond.setEmpName(support); + supportCond.setBlOpen("1"); + List supportUsers = sysUserMapper.selectUserList(supportCond); + if (CollectionUtil.isEmpty(supportUsers)) { + throw new EmisBizError(EmisBizErrorType.FAIL, "当前销售支持" + support + "已失效，请更换客户对应的销售支持"); } } + }