From 224e8d3b57fecf5a904ffa06ef0bb8b646d73a29 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 21 十一月 2025 09:28:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5ea65cd..5b49931 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -42,6 +42,16 @@
add("ea1f0459efc02a79f046f982767939ae");
}};
+ public static final ArrayList<String> agvSta1 = new ArrayList<String>() {{
+ add("5400101");add("5400102");add("5400103");add("5400104");add("5400105");add("5400106");add("5400107");
+ }};
+ public static final ArrayList<String> agvSta2 = new ArrayList<String>() {{
+ add("5400201");add("5400202");add("5400203");add("5400204");add("5400205");add("5400206");add("5400207");
+ }};
+ public static final ArrayList<String> agvSta3 = new ArrayList<String>() {{
+ add("5400301");add("5400302");add("5400303");add("5400304");add("5400305");add("5400306");add("5400307");
+ }};
+
@Autowired
private MobileService mobileService;
@Autowired
@@ -89,6 +99,11 @@
return R.ok();
}
+ @PostMapping("/agv/AGVDismantle")
+ @ManagerAuth
+ public R pdaAGVDismantle(@RequestBody Map<String,Object> map){
+ return mobileService.AgvDismantle(map);
+ }
@PostMapping("/agv/finishedCall")
@ManagerAuth
public R pdaAgvFinishedCall(@RequestBody Map<String,Object> map){
@@ -103,6 +118,11 @@
@ManagerAuth
public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
return mobileService.lineCall(map);
+ }
+ @PostMapping("/agv/lineCall2")
+ @ManagerAuth
+ public R pdaAgvLineCall2(@RequestBody Map<String,Object> map){
+ return mobileService.lineCall2(map);
}
@GetMapping("/agv/site/list")
@@ -173,11 +193,32 @@
if (Cools.isEmpty(site)) {
return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
}
- boolean b = mobileService.bindPodAndBerth(site);
- if (b){
- return R.ok();
+
+ // 鍒ゆ柇site鍦ㄥ摢涓垪琛ㄤ腑锛屽苟鑾峰彇瀵瑰簲鐨勫垪琛�
+ ArrayList<String> targetList = null;
+ if (agvSta1.contains(site)) {
+ targetList = agvSta1;
+ } else if (agvSta2.contains(site)) {
+ targetList = agvSta2;
+ } else if (agvSta3.contains(site)) {
+ targetList = agvSta3;
}
- return R.error();
+
+ // 濡傛灉site鍦╝gvSta1銆乤gvSta2鎴朼gvSta3涓紝寰幆璋冪敤bindPodAndBerth
+ if (targetList != null) {
+ // 寰幆璋冪敤bindPodAndBerth澶勭悊鍒楄〃涓殑鎵�鏈夋暟鎹�
+ for (String siteItem : targetList) {
+ boolean b = mobileService.bindPodAndBerth(siteItem);
+ }
+ return R.ok();
+ } else {
+ // 鍘熸湁閫昏緫锛氫笉鍦ㄦ寚瀹氱珯鐐逛腑锛屽彧澶勭悊鍗曚釜site
+ boolean b = mobileService.bindPodAndBerth(site);
+ if (b){
+ return R.ok();
+ }
+ return R.error();
+ }
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
--
Gitblit v1.9.1