From bcd583668d6dc95993075354a8e7b0935e92eefd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 三月 2021 11:07:26 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 48220e5..47649e2 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -15,10 +15,7 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
-import zy.cloud.wms.manager.entity.param.InitPakoutParam;
-import zy.cloud.wms.manager.entity.param.StockConfirmParam;
-import zy.cloud.wms.manager.entity.param.StockInParam;
-import zy.cloud.wms.manager.entity.param.StockOutParam;
+import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
@@ -54,6 +51,12 @@
@ManagerAuth(memo = "搴撳瓨鏁伴噺妫�娴�")
public R stockOutCheck(@RequestParam String number) {
return workService.stockOutCheck(number, getUserId());
+ }
+
+ @RequestMapping("/stock/out/preview")
+ @ManagerAuth(memo = "鎷ｈ揣棰勮")
+ public R stockOutPreview(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPreview(stockOutParam, getUserId());
}
@RequestMapping("/stock/out")
@@ -123,9 +126,21 @@
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
- return R.error("鎶辨瓑杩愭皵涓嶅ソ锛岃鍐嶇敓鎴愪竴娆�");
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
}
return R.ok().add(String.valueOf(nextId));
}
+ @RequestMapping("/order/init")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ public R initOrder(@RequestBody InitOrderParam param) {
+ return workService.initOrder(param, getUserId());
+ }
+
+ @RequestMapping("/stock/transfer")
+ @ManagerAuth(memo = "搴撳瓨璋冩嫧")
+ public R stockTransfer(@RequestParam String number) {
+ return workService.stockTransfer(number, getUserId());
+ }
+
}
--
Gitblit v1.9.1