From d2adac4e369165ec523c23e7ffd19fc5775d43b5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 08:14:14 +0800
Subject: [PATCH] Changes
---
src/main/java/zy/cloud/wms/manager/controller/WaveController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 3982916..b8e71e8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.core.exception.CoolException;
+import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -52,7 +54,8 @@
EntityWrapper<Wave> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("create_time",false);
return R.ok(waveService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -89,10 +92,22 @@
@RequestMapping(value = "/wave/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
+ /**
+ * 鎺х涓庡垵濮嬪寲
+ */
HashSet<String> orders = new HashSet<>();
for (Long id : ids){
- List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
+ Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
+ .eq("id", id));
+ if (Cools.isEmpty(wave)) {
+ throw new CoolException("鎵句笉鍒拌娉㈡");
+ }
+ if (wave.getStatus() != 0){
+ throw new CoolException("浠呮敮鎸佹挙閿�'寰呭鐞�'鐘舵�佺殑璁㈠崟");
+ }
+ List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
.eq("wave_id", id));
+
for (WaveDetl waveDetl : waveDetls) {
String orderNos = waveDetl.getOrderNos();
@@ -162,9 +177,8 @@
@RequestMapping("/wave/createOut")
@ManagerAuth
- public R createWaveOut(@RequestBody Wave wave){
-
- return waveService.createOut(wave,getUserId(),getHostId());
+ public R createWaveOut(@RequestBody List<PickOutDto> pickOutDtosk){
+ return waveService.createOut(pickOutDtosk,getUserId(),getHostId());
}
@RequestMapping("/wave/preview")
--
Gitblit v1.9.1