From 8d589bc8baeadc9d29c2523cf766040a5f5e5995 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 07 五月 2024 00:30:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index d1f5b6f..702995d 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -10,6 +10,7 @@ import com.zy.asrs.entity.param.AgvMobileStartPakin; import com.zy.asrs.entity.param.AgvMobileStartParam; import com.zy.asrs.entity.param.CombParam; +import com.zy.asrs.entity.param.PickParam; import com.zy.asrs.service.*; import com.zy.common.web.BaseController; import lombok.Synchronized; @@ -56,6 +57,14 @@ agvMobileService.comb(combParam, getUserId()); return R.ok(); + } + + // 鍐嶆鎷f枡 + @RequestMapping("/pick/again/auth") +// @ManagerAuth(memo = "缁勬墭") + public R pickAgain(@RequestBody PickParam pickParams){ + agvMobileService.pickAgain(pickParams, 1l); + return R.ok("缁勬墭鎴愬姛"); } /* @@ -184,6 +193,12 @@ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper); + for (AgvLocDetl agvLocDetl : agvLocDetls) { + AgvLocMast locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo())); + agvLocDetl.setLocSts(locNo.getLocSts()); + agvLocDetl.setLocSts$(locNo.getLocSts$()); + } + return R.ok(agvLocDetls); } -- Gitblit v1.9.1