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/WaveController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 2f34179..f8aa130 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+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;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.WaveDetlService;
import zy.cloud.wms.manager.service.WaveService;
@@ -18,8 +20,10 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.manager.service.WorkService;
import java.util.*;
+
@RestController
public class WaveController extends BaseController {
@@ -30,6 +34,8 @@
private WaveDetlService waveDetlService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private WorkService workService;
@RequestMapping(value = "/wave/{id}/auth")
@ManagerAuth
@@ -157,9 +163,14 @@
@RequestMapping("/wave/createOut")
@ManagerAuth
- public R createWaveOut(@RequestBody Wave wave){
- waveService.createOut(wave,getUserId(),getHostId());
- return R.ok();
+ public R createWaveOut(@RequestBody List<PickOutDto> pickOutDtosk){
+ return waveService.createOut(pickOutDtosk,getUserId(),getHostId());
+ }
+
+ @RequestMapping("/wave/preview")
+ @ManagerAuth
+ public R createWavePreview(@RequestBody StockOutParam stockOutParam){
+ return workService.wavePreview(stockOutParam, getUserId(), getHostId());
}
}
--
Gitblit v1.9.1