From 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 三月 2024 15:33:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 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 d1bd0b8..8143d47 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,12 +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;
@@ -69,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");
@@ -84,5 +95,32 @@
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
+ /*
+ 鍏ュ簱
+ */
+ @PostMapping("/pakin/empty/auth")
+ @Synchronized
+ public R pakinEmpty(@RequestBody AgvMobileStartParam params){
+
+ for (AgvMobileStartParam.Pad pad : params.getPad()) {
+ workService.emptyPlateIn(pad.getDevNo(),pad.getContainerCode(),pad.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
+
+ /*
+ 绌烘澘鍑哄簱
+ */
+ @PostMapping("/pakout/empty/auth")
+ @Synchronized
+ public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
+
+ for (AgvMobileStartParam.Pad pad : params.getPad()) {
+ workService.emptyPlateOut(pad.getDevNo(),pad.getContainerType(), getUserId());
+ }
+
+ return R.ok();
+ }
}
--
Gitblit v1.9.1