From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图
---
src/main/webapp/static/js/agvLocMast/locMast.js | 3 +++
src/main/java/com/zy/asrs/controller/AgvMapController.java | 23 +++++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index e3b35d0..9fefd32 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -65,11 +65,12 @@
if (floor == 1 && lev == 2) {
List<AgvLocMast> distinctRow = agvLocMastService.selectDistinctLocByLevAndFloor(lev, floor);
List<Integer> integers = new ArrayList<>();
- int min = 0;
+ int rowMin = 0;
+ int bayMin = 0;
int i =1;
for (AgvLocMast locMast : distinctRow) {
- if (min > locMast.getMapRow1()) {
- min = locMast.getMapRow1();
+ if (rowMin > locMast.getMapRow1()) {
+ rowMin = locMast.getMapRow1();
}
if (locMast.getRightSide() == 1) {
integers.add(i);
@@ -79,12 +80,18 @@
}
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getMapRow1();
- if (row < 0) {
- row = row - min + 1;
- } else {
- row = row - min;
- }
Integer bay = locMast.getMapBay1();
+ if (row < 0) {
+ row = row - rowMin + 1;
+ } else {
+ row = row - rowMin;
+ }
+ if (bay < 0) {
+ bay = bay - bayMin + 1;
+ } else {
+ bay = bay - bayMin;
+ }
+
Integer rightSide = locMast.getRightSide();
int x = bay;
int y = row;
diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js
index 1951580..53f0a38 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -463,6 +463,9 @@
bay1: $('#bay1').val(),
lev1: $('#lev1').val(),
floor: $('#floor').val(),
+ mapRow1: $('#mapRow1').val(),
+ mapBay1: $('#mapBay1').val(),
+ rightSide: $('#rightSide').val(),
fullPlt: $('#fullPlt').val(),
locType1: $('#locType1').val(),
outEnable: $('#outEnable').val(),
--
Gitblit v1.9.1