From 2f932f2675b0e7cfa7c5466b058d93aec67d6f3c Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WaitPakinController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 9898dde..0947e50 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,7 +11,9 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkMastService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,9 @@
 
     @Autowired
     private WaitPakinService waitPakinService;
+
+    @Autowired
+    private WrkMastService wrkMastService;
 
     @RequestMapping(value = "/waitPakin/{id}/auth")
     @ManagerAuth
@@ -88,7 +93,11 @@
             return R.error();
         }
         for (WaitPakin entity : list){
-            waitPakinService.delete(new EntityWrapper<>(entity));
+            WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
+            if (Cools.isEmpty(wrkMast)) {
+                waitPakinService.delete(new EntityWrapper<>(entity));
+            }
+            return R.error("宸ヤ綔妗f暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒");
         }
         return R.ok();
     }

--
Gitblit v1.9.1