From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 四月 2025 14:22:20 +0800
Subject: [PATCH] #新增盘点单号，页面修改
---
src/main/java/com/zy/asrs/utils/Utils.java | 20 +++++++++++++++++---
1 files changed, 17 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 b4de45a..69af95a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -311,11 +311,11 @@
if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - sRow) % 4 == 0) {
+ if ((curRow - sRow) % 4 == 0) {//1\5\9\13
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow + 3) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 4 == 0) {
+ } else if ((curRow - sRow + 1) % 4 == 0) {//4\8\12\16
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
@@ -560,4 +560,18 @@
return result;
}
+ // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
+ public static List<String> getGroupOutsideLocCrn(String locNo){
+ int row = getRow(locNo);
+ List<String> result = new ArrayList<>();
+ if (row==3 || row == 4){
+ result.add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ result.add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ return result;
+ }else{
+ result.add(locNo);
+ return result;
+ }
+ }
+
}
--
Gitblit v1.9.1