From 2844f9c2b8a644fa9d712d65a9117b5771eb987d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 15 六月 2020 13:13:17 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/WorkController.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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..2557170 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -46,7 +46,7 @@ @RequestMapping("/full/store/put/start") @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱") public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) { - workService.startupFullStore(fullStoreParam,getUserId()); + workService.startupFullPutStore(fullStoreParam,getUserId()); return R.ok("鍏ュ簱鎴愬姛"); } @@ -68,7 +68,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