From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 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..6987853 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,11 +2,14 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
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 +34,8 @@
private AgvBasDevpService agvBasDevpService;
@Autowired
private AgvWorkService workService;
+ @Autowired
+ private OrderDetlService orderDetlService;
/*
@@ -66,9 +71,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,10 +90,37 @@
return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
- workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
+ workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(),false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
+ /*
+ 鍏ュ簱
+ */
+ @PostMapping("/pakin/empty/auth")
+ @Synchronized
+ public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
+
+ for (AgvMobileStartParam param : params){
+ workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),param.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
+
+ /*
+ 绌烘澘鍑哄簱
+ */
+ @PostMapping("/pakout/empty/auth")
+ @Synchronized
+ public R pakoutEmpty(@RequestBody List<AgvMobileStartParam> params){
+
+ for (AgvMobileStartParam param : params){
+ workService.emptyPlateOut(param.getDevNo(),param.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
}
--
Gitblit v1.9.1