From 9fa1cf88300beccb276982aa47c749d08f241dcf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 16 Jul 2024 07:34:52 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cWaybillController.java     | 17 +++++++++++++++--
 .../erp/oms/mapper/EmisWaybillMapper.java       |  9 +++++++++
 .../erp/oms/service/IEmisWaybillService.java    |  3 ++-
 .../service/impl/EmisWaybillServiceImpl.java    |  8 +++++++-
 .../main/resources/mapper/EmisWaybillMapper.xml |  5 +++++
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 1d8eeec..b75a8e4 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -18,6 +18,8 @@ import javax.validation.Valid;
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.oms.common.utils.DateUtils;
+import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
+import com.xdadan.erp.oms.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.oms.domain.exception.EmisBizError;
 import com.xdadan.erp.oms.domain.vo.*;
 import com.xdadan.erp.oms.domain.wms.WmsWarehouse;
@@ -215,8 +217,19 @@ public class Oms2cWaybillController extends BaseController
     @PostMapping("/bindSalesmen")
     public AjaxResult bindSalesmen(String  empCode)
     {
-        emisWaybillService.bindSalesmen(empCode);
-        return AjaxResult.success("绑定成功");
+
+        try {
+            emisWaybillService.bindSalesmen(empCode);
+            return AjaxResult.success("绑定成功");
+        }catch (Exception ex){
+            ex.printStackTrace();
+            // 返回子定义异常
+            if(ex instanceof EmisBizError){
+                return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+            }
+            return AjaxResult.error("服务器异常，联系客服");
+        }
+
     }
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
index 3ecfd93..55fcf8e 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
@@ -50,6 +50,8 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public int insertBindSalesmen(@Param("customerCode") String customerCode,@Param("empCode") String empCode);
 
+
+
     /**
      * 检查是否绑定
      * @param customerCode
@@ -58,6 +60,13 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public int checkIsBindSalesmen(@Param("customerCode") String customerCode,@Param("empCode") String empCode);
 
+
+    /**
+     * 检查业务员是否存在
+     * @return
+     */
+    public int checkEmpIsExist(@Param("empCode") String empCode);
+
     /**
      * 取消绑定
      * @param customerCode
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
index 0853ba2..fe915bb 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.xdadan.erp.oms.domain.EmisWaybill;
+import com.xdadan.erp.oms.domain.exception.EmisBizError;
 
  /**
  * @ClassName EmisWaybillService
@@ -33,7 +34,7 @@ public interface IEmisWaybillService
     public List<Map> selectUserBindSalesmenList(String searchValue);
 
 
-    public int bindSalesmen(String empCode);
+    public int bindSalesmen(String empCode) throws EmisBizError;
 
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
index d62f02f..cfe19e0 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
@@ -78,7 +78,13 @@ public class EmisWaybillServiceImpl  implements IEmisWaybillService
     }
 
     @Override
-    public int bindSalesmen(String empCode){
+    public int bindSalesmen(String empCode) throws EmisBizError {
+
+        int eCnt=emisWaybillMapper.checkEmpIsExist(empCode);
+        if(eCnt==0){
+            throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"业务员不存在");
+        }
+
 
         String customerCode=SecurityUtils.getLoginUser().getUser().getCustomerCode();
         int cnt=emisWaybillMapper.checkIsBindSalesmen(customerCode,empCode);
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 28a4284..d65c4ba 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -559,6 +559,11 @@
         </if>
     </select>
 
+
+    <select id="checkEmpIsExist" resultType="int">
+        select count(1) from sys_user  where del_flag='0' and emp_code=#{empCode}
+    </select>
+
     <select id="checkIsBindSalesmen" resultType="int">
         select count(1) from sys_oms_user_bind_emp  where customer_code=#{customerCode} and emp_code=#{empCode}
     </select>