From fdb6f22f8d4bf891e47950bcf4f7cdf15a0fcdd1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 15 六月 2020 13:59:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 39ddbcb..51fb1b3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -46,15 +46,13 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- workService.startupFullStore(fullStoreParam,getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
}
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
- workService.emptyPlateIn(sourceStaNo, getUserId());
- return R.ok("鍏ュ簱鎴愬姛");
+ return R.ok("鍏ュ簱鎴愬姛").add(workService.emptyPlateIn(sourceStaNo, getUserId()));
}
@RequestMapping("/empty/plate/out/start")
@@ -68,7 +66,11 @@
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
@RequestParam Integer type){
-
+ if (type == 1) {
+ workService.completeWrkMast(workNo, getUserId());
+ } else if (type == 2) {
+ workService.cancelWrkMast(workNo, getUserId());
+ }
return R.ok();
}
--
Gitblit v1.9.1