From f3603d9f0eb85d2a42edbcadd0950889af2c24d2 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期一, 19 二月 2024 18:14:05 +0800 Subject: [PATCH] #库存迁移逻辑修改,从工作明细档进行处理 --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index d7b10ae..9161d1d 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -6,7 +6,9 @@ import com.zy.asrs.service.AgvBasDevpService; import com.zy.asrs.service.AgvMobileService; import com.zy.asrs.service.AgvWorkService; +import com.zy.asrs.service.OrderDetlService; import com.zy.common.web.BaseController; +import lombok.Synchronized; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -31,6 +33,8 @@ private AgvBasDevpService agvBasDevpService; @Autowired private AgvWorkService workService; + @Autowired + private OrderDetlService orderDetlService; /* @@ -66,9 +70,18 @@ } /* + 鑾峰彇杈撻�佺嚎绔欑偣 + */ + @PostMapping("/getBasDevp/noCacheShelves/auth") + public R getBasDevpByNoCacheShelves(){ + return R.ok(agvBasDevpService.getBasDevpByNoCacheShelves()); + } + + /* 鍚姩鍏ュ簱锛岀敓鎴愬伐浣滄。 */ @PostMapping("/pakin/auth") + @Synchronized public R pakin(@RequestBody Map<String,Object> map){ List<String> devNos = (List<String>) map.get("devNo"); @@ -76,7 +89,7 @@ return agvBasDevpService.selectById(devNo); }).collect(Collectors.toList()); - workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId()); + workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false); return R.ok("鐢熸垚宸ヤ綔妗f垚鍔�"); } -- Gitblit v1.9.1