From 0cdbbb60b9549be1c99ff7d5a37936dadac61649 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 27 三月 2024 10:50:30 +0800 Subject: [PATCH] AGV任务下发 --- src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 53 ++++++++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java index 56c60df..58aa710 100644 --- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java +++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java @@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.*; @RestController @@ -158,30 +157,30 @@ return R.ok(); } - @RequestMapping(value = "/wrkMast/startWrk/auth") - @ManagerAuth(memo = "宸ヤ綔妗e紑濮嬩换鍔�") - public R startWrk(@RequestParam String param) throws IOException { - List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class); - if (Cools.isEmpty(agvWrkMastList)){ - return R.error(); - } - int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway"); - - int code = agvWrkMastService.containerMoveIn(agvWrkMastList); - - if(code == 0){ - agvWrkMastList.forEach(agvWrkMast -> { - //202.RCS鍙栬揣涓� - agvWrkMast.setWrkSts((long)202); - //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y - agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y"); - }); - agvWrkMastService.updateBatchById(agvWrkMastList); - - return R.ok("浠诲姟鍚姩鎴愬姛"); - } - - return R.error("浠诲姟鍚姩澶辫触"); - - } +// @RequestMapping(value = "/wrkMast/startWrk/auth") +// @ManagerAuth(memo = "宸ヤ綔妗e紑濮嬩换鍔�") +// public R startWrk(@RequestParam String param) throws IOException { +// List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class); +// if (Cools.isEmpty(agvWrkMastList)){ +// return R.error(); +// } +// int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway"); +// +// int code = agvWrkMastService.containerMoveIn(agvWrkMastList); +// +// if(code == 0){ +// agvWrkMastList.forEach(agvWrkMast -> { +// //202.RCS鍙栬揣涓� +// agvWrkMast.setWrkSts((long)202); +// //淇敼AGV鍏ュ簱閫氱煡妗g姸鎬佸叆鍑虹姸鎬佷负Y +// agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y"); +// }); +// agvWrkMastService.updateBatchById(agvWrkMastList); +// +// return R.ok("浠诲姟鍚姩鎴愬姛"); +// } +// +// return R.error("浠诲姟鍚姩澶辫触"); +// +// } } -- Gitblit v1.9.1