From 469be99743f499c38d710056d17609f384b6e66d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 10:26:27 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 941160f..7c826d2 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -13,6 +13,7 @@
import zy.cloud.wms.common.web.BaseController;
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;
@@ -49,13 +50,13 @@
}
@RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎹¤揣")
+ @ManagerAuth(memo = "鎷ｈ揣")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
return workService.stockOut(stockOutParam, getUserId());
}
@RequestMapping("/stock/out/print")
- @ManagerAuth(memo = "鎹¤揣鍗曟墦鍗�")
+ @ManagerAuth(memo = "鎷ｈ揣鍗曟墦鍗�")
public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
return workService.stockOutPrint(stockOutParam, getUserId());
}
@@ -88,9 +89,27 @@
}
@RequestMapping("/stock/out/confirm")
- @ManagerAuth(memo = "鎹¤揣纭")
+ @ManagerAuth(memo = "鎷ｈ揣纭")
public R stockOutConfirm(@RequestBody StockConfirmParam param) {
return workService.stockOutComplete(param, getUserId());
}
+ @RequestMapping("/pakout/init")
+ @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
+ public R initPakout(@RequestBody List<InitPakoutParam> params) {
+ return workService.initPakout(params, getUserId());
+ }
+
+
+ @RequestMapping("/hand/control/pakout")
+ @ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
+ public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
+ if (type == 1) {
+ return workService.completePakout(wrkNo, getUserId());
+ } else if (type == 2) {
+ return workService.cancelPakout(wrkNo, getUserId());
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1