From 21357f1d42f995e11e99a12a5f225fe6442b9ad1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 13:05:09 +0800
Subject: [PATCH] 优化定时任务及日志输出，调整订单同步逻辑
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 9fefd32..e3b35d0 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -65,12 +65,11 @@
if (floor == 1 && lev == 2) {
List<AgvLocMast> distinctRow = agvLocMastService.selectDistinctLocByLevAndFloor(lev, floor);
List<Integer> integers = new ArrayList<>();
- int rowMin = 0;
- int bayMin = 0;
+ int min = 0;
int i =1;
for (AgvLocMast locMast : distinctRow) {
- if (rowMin > locMast.getMapRow1()) {
- rowMin = locMast.getMapRow1();
+ if (min > locMast.getMapRow1()) {
+ min = locMast.getMapRow1();
}
if (locMast.getRightSide() == 1) {
integers.add(i);
@@ -80,18 +79,12 @@
}
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getMapRow1();
- Integer bay = locMast.getMapBay1();
if (row < 0) {
- row = row - rowMin + 1;
+ row = row - min + 1;
} else {
- row = row - rowMin;
+ row = row - min;
}
- if (bay < 0) {
- bay = bay - bayMin + 1;
- } else {
- bay = bay - bayMin;
- }
-
+ Integer bay = locMast.getMapBay1();
Integer rightSide = locMast.getRightSide();
int x = bay;
int y = row;
--
Gitblit v1.9.1