From 5dac37cde0205be965c2b74dd1bddefc7f9cceda Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期三, 26 三月 2025 08:56:57 +0800 Subject: [PATCH] Merge branch 'integrationWms' into mdqzasrs --- src/main/java/com/zy/asrs/controller/WorkController.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 8b6a223..6de7c6e 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -68,6 +68,13 @@ return R.ok().add(result); } + @RequestMapping("/turn/over/out/start") + @ManagerAuth(memo = "瀹㈡埛杞崲") + public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) { + workService.turnOverOut(param, getUserId()); + return R.ok("瀹㈡埛杞崲鎴愬姛"); + } + @RequestMapping("/available/take/check/site") @ManagerAuth() public R availableTakeCheckSite(){ @@ -83,7 +90,12 @@ @RequestMapping("/full/store/put/start") @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱") public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) { - return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId())); + try { + String locNo = workService.startupFullPutStore(fullStoreParam, getUserId()); + return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo); + } catch (Exception e){ + return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage()); + } } @RequestMapping("/plate/out/start") -- Gitblit v1.9.1