From 1079d6a9e117288b78de0e21a444f0e08e4286c3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 5 May 2025 18:43:34 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E4=B8=8D=E7=9B=B4=E6=8E=A5=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?/=E9=94=80=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8Cbug=E4=BF=AE=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/EmisBaseService.java     | 10 +++++++
 .../service/impl/EmisWaybillServiceImpl.java  | 26 ++++++++++++++++---
 2 files changed, 33 insertions(+), 3 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 2bbe3d24f..621e86440 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
@@ -3128,6 +3128,16 @@ public class EmisBaseService {
          return sysUserMapper.selectUserByEmpName(empName);
      }
 
+     /**
+      * 获取用户列表
+      *
+      * @param sysUser
+      * @return 用户列表
+      */
+     public List<SysUser> getEmisStaffListByEmpName(SysUser sysUser) {
+         return sysUserMapper.selectUserList(sysUser);
+     }
+
      public SysUser getEmisStaffBySiteCodeAndEmpName(String ownerSiteCode,String empName){
          return sysUserMapper.selectUserBySiteCodeAndEmpName(ownerSiteCode,empName);
      }
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 448190c93..623b9b885 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
@@ -19,9 +19,6 @@ package com.xdadan.erp.emis.service.impl;
  import com.deepoove.poi.data.Pictures;
  import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
  import com.googlecode.aviator.AviatorEvaluator;
- import com.xdadan.erp.common.annotation.audit.DataAuditLog;
- import com.xdadan.erp.common.annotation.audit.OperateType;
- import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
  import com.xdadan.erp.common.config.PayConfig;
  import com.xdadan.erp.common.core.domain.entity.SysUser;
  import com.xdadan.erp.common.core.redis.RedissonService;
@@ -64,6 +61,7 @@ package com.xdadan.erp.emis.service.impl;
  import java.net.URLEncoder;
  import java.text.DecimalFormat;
  import java.util.*;
+ import java.util.stream.Collectors;
 
  /**
  * 运单列表Service业务层处理
@@ -932,6 +930,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             emisWaybillSave.setTakePieceEmployeeCode(empUser.getEmpCode());
         }
 
+        // 收款人备注
+        List<SysUser> payeeUsers = getSysUsers(emisWaybillSave.getPayee());
+        if (CollectionUtil.isEmpty(payeeUsers)) {
+            throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人不支持回款");
+        }
+        List<SysUser> salesmenUsers = getSysUsers(emisWaybillSave.getSalesmen());
+        if (CollectionUtil.isEmpty(salesmenUsers)) {
+            throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不支持回款");
+        }
+
 //     包装类型
         String  packTypeStr = emisWaybillSave.getPackType();
         if(StringUtils.isEmpty(packTypeStr)){
@@ -1080,6 +1088,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
     }
 
+    private List<SysUser> getSysUsers(String userName) {
+        SysUser sysUser = new SysUser();
+        sysUser.setEmpName(userName);
+        List<SysUser> userList = getEmisStaffListByEmpName(sysUser);
+        List<SysUser> users = userList.stream()
+                .filter(i -> i.getEmpName() != null &&
+                        i.getEmpName().equals(userName) &&
+                        "1".equals(i.getBlPayeeRemark()))
+                .collect(Collectors.toList());
+        return users;
+    }
+
 
     private void cvtWaybillDraftToRealByOms(EmisWaybill emisWaybillSave) throws EmisBizError {