From 66546c7df9a8ddf6ca6a36f4168fb25c568adb13 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 19 十一月 2021 13:45:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6df78ab..20fc60e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -180,7 +180,6 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- // 閲嶅簱浣� 1 - 4鎺�
if (whsType == 1) {
for (int i = 0; i < shelves.group; i ++) {
curRow = shelves.start(curRow);
@@ -190,25 +189,18 @@
Integer crnNo1 = shelves.getCrnNo(curRow);
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
+ if (curRow == 3 || curRow == 4) {
+ curRow = 3;
+ }
+ if (curRow == 5 || curRow == 6) {
+ curRow = 4;
+ }
+ if (curRow == 7 || curRow == 8) {
+ curRow = 5;
+ }
break;
}
}
-// // 杞诲簱浣� 5 - 12鎺�
-// } else {
-// curRow = curRow - 4;
-// for (int i = 0; i < shelves.group; i ++) {
-// curRow = shelves.start(curRow);
-// if (curRow < 0) {
-// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// Integer crnNo1 = shelves.getCrnNo(curRow);
-// if (basCrnpService.checkSiteError(crnNo1 + 1, true)) {
-// // 鍋忕Щ閲忚ˉ鍋�
-// curRow = curRow + 4;
-// crnNo = crnNo1 + 1;
-// break;
-// }
-// }
}
}
@@ -461,4 +453,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1