From c945a29f5be6b38dd5fb0b398abf3ca3e937dd56 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 19 三月 2022 09:39:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WaveController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
index f3eba6a..2f34179 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -7,6 +7,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.manager.entity.Wave;
+import zy.cloud.wms.manager.entity.WaveDetl;
+import zy.cloud.wms.manager.service.OrderService;
+import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -23,6 +26,10 @@
@Autowired
private WaveService waveService;
+ @Autowired
+ private WaveDetlService waveDetlService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/wave/{id}/auth")
@ManagerAuth
@@ -77,9 +84,37 @@
@RequestMapping(value = "/wave/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waveService.deleteById(id);
+ HashSet<String> orders = new HashSet<>();
+ for (Long id : ids){
+ List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
+ .eq("wave_id", id));
+ for (WaveDetl waveDetl : waveDetls) {
+
+ String orderNos = waveDetl.getOrderNos();
+ String[] split = orderNos.split(",");
+ for (String s : split) {
+ orders.add(s);
+ }
+ }
+
+ /**
+ * 鍒犻櫎娉㈡琛ㄨ韩
+ */
+ waveDetlService.delete(new EntityWrapper<WaveDetl>()
+ .eq("wave_id",id));
+ /**
+ * 鍒犻櫎娉㈡琛ㄥご
+ */
+ waveService.deleteById(id);
+ /**
+ * 鏇存敼鍑哄簱鍗曠姸鎬�
+ */
+ for (String order : orders) {
+ orderService.updateStatus(order);
+ }
+
}
+
return R.ok();
}
@@ -120,4 +155,11 @@
return R.ok();
}
+ @RequestMapping("/wave/createOut")
+ @ManagerAuth
+ public R createWaveOut(@RequestBody Wave wave){
+ waveService.createOut(wave,getUserId(),getHostId());
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1