From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/utils/Utils.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e80f7e5..40c644e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -76,6 +76,9 @@
*/
public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
if (slaveProperties.isDoubleDeep()) {
+ if(row == 1||row == 2){
+ return false;
+ }
return !slaveProperties.getDoubleLocs().contains(row);
} else {
return false;
@@ -88,7 +91,7 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ int shallowRow = remainder == 3 ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -107,6 +110,7 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
+ remainder = remainder + 2;
if (remainder == 2) {
targetRow = row - 1;
} else if (remainder == 3) {
@@ -123,9 +127,9 @@
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
+ if (remainder == 0) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (remainder == 1) {
targetRow = shallowRow + 1;
} else {
throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
--
Gitblit v1.9.1