From 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 21:30:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 84 +++++++++++++++++++++---------------------
src/main/java/com/zy/asrs/utils/LocUtils.java | 11 +++++
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 2
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 2
4 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 581c210..5236ba6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -159,48 +159,48 @@
if (!agvLockMastService.updateById(locMast)) {
throw new CoolException("涓诲簱浣嶄慨鏀瑰け璐�");
} else {
- try {
- if (locMast.getLocSts().equals("O")) {
- HashMap<String, String> data = new HashMap<>();
- data.put("reqCode", System.currentTimeMillis() + "");
- data.put("podCode", barcode);
- data.put("positionCode", locMast.getLocNo());
- data.put("indBind", "0");
- String response = "";
- boolean success = false;
- int code = 0;
- try {
- response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(locStsUrl)
- .setTimeout(30, TimeUnit.SECONDS)
- .setJson(JSONObject.toJSONString(data))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- code = Integer.parseInt(jsonObject.get("code").toString());
- if (code != 0) {
- log.info("搴撲綅瑙ｇ粦AGV鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + response);
- } else {
- success = true;
- }
- } catch (Exception e) {
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- } finally {
- apiLogService.save(
- "璐ф灦涓庝綅缃В缁�",
- url + locStsUrl,
- null,
- "127.0.0.1",
- JSON.toJSONString(data),
- response,
- success
- );
- }
- }
- } catch (Exception e) {
-
- }
+// try {
+// if (locMast.getLocSts().equals("O")) {
+// HashMap<String, String> data = new HashMap<>();
+// data.put("reqCode", System.currentTimeMillis() + "");
+// data.put("podCode", barcode);
+// data.put("positionCode", locMast.getLocNo());
+// data.put("indBind", "0");
+// String response = "";
+// boolean success = false;
+// int code = 0;
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(url)
+// .setPath(locStsUrl)
+// .setTimeout(30, TimeUnit.SECONDS)
+// .setJson(JSONObject.toJSONString(data))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// code = Integer.parseInt(jsonObject.get("code").toString());
+// if (code != 0) {
+// log.info("搴撲綅瑙ｇ粦AGV鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + response);
+// } else {
+// success = true;
+// }
+// } catch (Exception e) {
+// throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+// } finally {
+// apiLogService.save(
+// "璐ф灦涓庝綅缃В缁�",
+// url + locStsUrl,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(data),
+// response,
+// success
+// );
+// }
+// }
+// } catch (Exception e) {
+//
+// }
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index c41f549..6b8d368 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -309,7 +309,7 @@
private void executeLocType6() {
// 鏌ヨ 浜屽巶鐨勭殑鍗婃垚鍝佺澹崇被鍨嬬殑绌鸿揣鏋�
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).eq("floor", 2).orderBy("bay1",false));
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).in("floor", 2,3).orderBy("bay1",false));
if (agvLocMasts.isEmpty()) {
return;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 1a5e60b..0761285 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -203,7 +203,7 @@
AgvLocMast locMast;
if (Integer.parseInt(barcode.substring(0, 2)) == 31) {
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- locMast = agvCommonService.getLocByLocRule(6, 2, 1);
+ locMast = agvCommonService.getLocByLocRule(6, agvWrkMast.getCrnNo(), 1);
} else {
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
locMast = agvCommonService.getLocNo(3, agvWrkMast.getCrnNo(), false, true);
diff --git a/src/main/java/com/zy/asrs/utils/LocUtils.java b/src/main/java/com/zy/asrs/utils/LocUtils.java
index 76d8425..ab5fedf 100644
--- a/src/main/java/com/zy/asrs/utils/LocUtils.java
+++ b/src/main/java/com/zy/asrs/utils/LocUtils.java
@@ -19,6 +19,7 @@
/**
* 鏌ヨ搴撲綅
+ *
* @param type
* @param factory
* @return
@@ -56,6 +57,7 @@
/**
* 鏌ヨ搴撲綅
+ *
* @param type
* @param floor
* @return
@@ -71,6 +73,15 @@
}
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
for (AgvLocMast agvLocMast : agvLocMasts) {
+ if (floor == 2) {
+ if (agvLocMast.getFloor() == 3) {
+ continue;
+ }
+ } else if (floor == 3) {
+ if (agvLocMast.getFloor() == 2) {
+ continue;
+ }
+ }
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
if (agvLocMast1.getLocSts().equals("O")) {
return agvLocMast1;
--
Gitblit v1.9.1