From 2fa5571c76fa3a9f115a7e7598b297879a437228 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 13 八月 2024 18:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/common/service/CommonService.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bd21470..d10d337 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -123,20 +123,40 @@
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
int divides = (int) Arith.divides(1, curRow - 1, 2);
- curRow = (int) Arith.remainder(curRow, 2);
+ //curRow = (int) Arith.remainder(curRow, 2);
if (curRow == 0) {
- curRow = 2;
+ curRow = 6;
+ } else if (curRow == 7) {
+ curRow = 1;
}
for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
+ //curRow = shelves.start(curRow);
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides*1;
+ //Integer crnNo1 = shelves.get(curRow);
+ Integer crnNo1 = 0;
+ switch (curRow) {
+ case 1:
+ case 2:
+ crnNo1 = 1;
+ break;
+ case 3:
+ case 4:
+ crnNo1 = 2;
+ break;
+ case 5:
+ case 6:
+ crnNo1 = 3;
+ break;
+ }
+ //crnNo1 = crnNo1 + divides*1;
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
- curRow = curRow + divides*2;
+ //curRow = curRow + divides*2;
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow + 1);
+ rowLastnoService.updateById(rowLastno);
break;
}
}
@@ -161,8 +181,8 @@
}
// 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
+ //rowLastno.setCurrentRow(curRow);
+ //rowLastnoService.updateById(rowLastno);
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
--
Gitblit v1.9.1