From c45d612c0673c5037a12b4a7514b5c52e7ecdbe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 11:14:03 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index e8000cd..e3b35d0 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -66,7 +66,7 @@
List<AgvLocMast> distinctRow = agvLocMastService.selectDistinctLocByLevAndFloor(lev, floor);
List<Integer> integers = new ArrayList<>();
int min = 0;
- int i = 1;
+ int i =1;
for (AgvLocMast locMast : distinctRow) {
if (min > locMast.getMapRow1()) {
min = locMast.getMapRow1();
@@ -143,7 +143,7 @@
private Integer generateMap1Bay(int bay) {
int y = bay;
- Integer[] bayAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31};
+ Integer[] bayAdd = {1, 3, 5, 7, 9, 11, 13, 15, 17, 19};
for (int i = 0; i < bayAdd.length; i++) {
if (bay > bayAdd[i]) {
y++;
@@ -171,7 +171,7 @@
private Integer generateMap2Row(int row) {
int x = row;
- Integer[] rowAdd = {2, 4, 6, 7, 8, 10, 12, 13, 15, 17, 19, 20, 22, 24, 26, 28, 30, 32};
+ Integer[] rowAdd = {2, 4, 6, 7, 8, 10, 12, 13, 15, 17, 19, 20, 22, 24};
for (int i = 0; i < rowAdd.length; i++) {
if (row > rowAdd[i]) {
x++;
@@ -196,7 +196,7 @@
private Integer generateMap3Row(int row) {
int x = row;
- Integer[] rowAdd = {2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40};
+ Integer[] rowAdd = {2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 22, 24, 26, 28, 30, 32};
for (int i = 0; i < rowAdd.length; i++) {
if (row >= rowAdd[i]) {
x++;
@@ -216,7 +216,13 @@
@RequestMapping("/map/searchData/auth")
@ManagerAuth
- public R searchLoc(@RequestParam("lev") Integer lev, @RequestParam("locNo") String locNo, @RequestParam("orderNo") String orderNo, @RequestParam("specs") String specs, @RequestParam("matnr") String matnr, @RequestParam("maktx") String maktx) {
+ public R searchLoc(@RequestParam("lev") Integer lev,
+ @RequestParam("locNo") String locNo,
+ @RequestParam("orderNo") String orderNo,
+ @RequestParam("specs") String specs,
+ @RequestParam("matnr") String matnr,
+ @RequestParam("maktx") String maktx
+ ) {
List<AgvLocDetl> locDetls = agvLocDetlService.searchByLike(orderNo, matnr, maktx, specs, locNo);
ArrayList<AgvLocDetl> lists = new ArrayList<>();
--
Gitblit v1.9.1