From 54b8aa931c9f3890fb9660988fedab6ccdbb42e6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 4 Aug 2024 08:45:33 +0800
Subject: [PATCH] md

---
 .../emis/EmisWaybillAjustApplyController.java | 29 ++++++++++++++++++-
 .../resources/mapper/EmisWaybillMapper.xml    |  9 ------
 2 files changed, 28 insertions(+), 10 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 49ee4b29a..e159959c2 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
@@ -152,7 +152,34 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(emisWaybillAjustApplyService.deleteEmisWaybillAjustApplyByIds(ids));
+        if(ids!=null && ids.length>0){
+            for(int i=0;i<ids.length;i++){
+                try {
+                    long id=ids[i];
+                    EmisWaybillAjustApply emisWaybillAjustApply = emisWaybillAjustApplyService.selectEmisWaybillAjustApplyById(id);
+                    if(emisWaybillAjustApply==null){
+                        return AjaxResult.error("申请不存在");
+                    }
+
+                    if(!"0".equals(emisWaybillAjustApply.getBlCenterConfirmed() )
+                        || !"0".equals(emisWaybillAjustApply.getBlDestConfirmed() )
+                    ){
+                        return AjaxResult.error("该已有操作，不允许删除");
+                    }
+
+                    emisWaybillAjustApplyService.deleteEmisWaybillAjustApplyById(id);
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                    // 返回子定义异常
+                    if(ex instanceof EmisBizError){
+                        return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+                    }
+
+                    return AjaxResult.error("审核异常，联系客服");
+                }
+            }
+        }
+        return AjaxResult.success("操作成功");
     }
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 745380fd7..99ad5be0f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1064,15 +1064,6 @@
                         UNION
                         SELECT #{params.privSiteCode} FROM dual
                     )
-                    or
-                    a.sign_site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
                     or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
                     or a.salesmen=#{params.privEmpName}
                     or a.payee=#{params.privEmpName}