From 46607139e955ca266e24bd8561bca1f93a650178 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

---
 src/main/java/zy/cloud/wms/manager/controller/PickoutController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
index 3878bea..2ab4c98 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.DateUtils;
 import zy.cloud.wms.manager.entity.Pickout;
+import zy.cloud.wms.manager.entity.PickoutDetl;
+import zy.cloud.wms.manager.service.PickoutDetlService;
 import zy.cloud.wms.manager.service.PickoutService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
@@ -23,6 +25,8 @@
 
     @Autowired
     private PickoutService pickoutService;
+    @Autowired
+    private PickoutDetlService pickoutDetlService;
 
     @RequestMapping(value = "/pickout/{id}/auth")
     @ManagerAuth
@@ -78,7 +82,12 @@
     @ManagerAuth
     public R delete(@RequestParam(value="ids[]") Long[] ids){
          for (Long id : ids){
+             Pickout picout = pickoutService.selectOne(new EntityWrapper<Pickout>()
+                     .eq("id", id));
+             pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
+                    .eq("head_id",id));
             pickoutService.deleteById(id);
+            pickoutService.updateWaveStatus(picout.getWaveNo());
         }
         return R.ok();
     }

--
Gitblit v1.9.1