From 0b83d075e78acfded07fafe8da133376b2260ef6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 10:26:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 0f1a5a1..a79ba54 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -56,23 +56,23 @@
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
+ @RequestMapping("/plate/out/start")
+ @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
+ public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+ workService.startupFullTakeStore(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
- @RequestMapping("/plate/out/start")
- @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
- public R fullStoreTakeStart(EmptyPlateOutParam param) {
- workService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
- }
-
@RequestMapping("/empty/plate/out/start")
@ManagerAuth(memo = "绌烘澘鍑哄簱")
- public R emptyPlateOutStart(StockOutParam param) {
-
+ public R emptyPlateOutStart(EmptyPlateOutParam param) {
+ workService.emptyPlateOut(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -90,8 +90,10 @@
@RequestParam Integer type){
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
}
return R.ok();
}
--
Gitblit v1.9.1