From c70bc5a14a116014cec81c1f8ddd2e376f5d517f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 7 Apr 2025 16:07:18 +0800
Subject: [PATCH] md

---
 .../emis/EmisWaybillAjustApplyController.java | 12 ++++++++++-
 .../IEmisWaybillAjustApplyService.java        |  2 +-
 .../EmisWaybillAjustApplyServiceImpl.java     | 20 +++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
index e159959c2..53bec4c3a 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
@@ -130,7 +130,17 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
     @PostMapping
     public AjaxResult add(@RequestBody EmisWaybillAjustApply emisWaybillAjustApply)
     {
-        return toAjax(emisWaybillAjustApplyService.insertEmisWaybillAjustApply(emisWaybillAjustApply));
+        try {
+            return toAjax(emisWaybillAjustApplyService.insertEmisWaybillAjustApply(emisWaybillAjustApply));
+        }catch (Exception ex){
+            ex.printStackTrace();
+            // 返回子定义异常
+            if(ex instanceof EmisBizError){
+                return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+            }
+            return AjaxResult.error("申请异常，联系客服");
+        }
+
     }
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java
index b445c48bd..8a2bb5b14 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillAjustApplyService.java
@@ -53,7 +53,7 @@ public interface IEmisWaybillAjustApplyService
      * @param emisWaybillAjustApply 运单调整申请
      * @return 结果
      */
-    public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply);
+    public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError;
 
     /**
      * 修改运单调整申请
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 db212a41f..7d2fdfd5b 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
@@ -92,8 +92,24 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
      * @return 结果
      */
     @Override
-    public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply)
-    {
+    public int insertEmisWaybillAjustApply(EmisWaybillAjustApply emisWaybillAjustApply) throws EmisBizError {
+
+        // 判断单号是否存在
+        EmisWaybill emisWaybillOld=getWaybillByBillCode(emisWaybillAjustApply.getBillCode());
+        if(emisWaybillOld==null){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"运单不存在！");
+        }
+
+        // 如果有待审核的单子,不允许提交新审核
+        EmisWaybillAjustApply queryCond = new EmisWaybillAjustApply();
+        queryCond.setBillCode(emisWaybillAjustApply.getBillCode());
+        queryCond.getParams().put("processStatus","6");
+        List<EmisWaybillAjustApply> listHasApply=emisWaybillAjustApplyMapper.selectEmisWaybillAjustApplyList(queryCond);
+        if(!CollectionUtils.isEmpty(listHasApply)){
+            throw new EmisBizError(EmisBizErrorType.FAIL,"有申请单审核中，待审核后再提交！");
+        }
+
+        // 插入数据
         emisWaybillAjustApplyMapper.insertEmisWaybillAjustApply(emisWaybillAjustApply);
 
         SysUser sysUser=getEmisStaffByCode(emisWaybillAjustApply.getApplyManCode());