From 0b0aff446e1ca31e277c318814fb076033bf7a3d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 22 七月 2025 09:45:06 +0800
Subject: [PATCH] 新增中间表
---
src/main/java/com/zy/common/service/CommonService.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 854ca6f..9302a77 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -109,14 +109,20 @@
// } else if (sourceStaNo > 399){
// whsType = 4;
// }
-
- if (sourceStaNo ==101||sourceStaNo==103){
- whsType = 1;
- } else if (sourceStaNo ==105||sourceStaNo==107){
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ if (sourceStaNo ==102) {
+ whsType = 3;
+ crnNo = 3;
+ }else if (sourceStaNo ==104) {
whsType = 2;
- } else{
+ crnNo = 2;
+ }else if(sourceStaNo ==106) {
+ whsType = 1;
+ crnNo = 1;
+ }else
throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
+
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -129,8 +135,7 @@
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
+
// 鐩爣搴撲綅
LocMast locMast = null;
@@ -183,6 +188,9 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
+ if(crnNo>1) {
+ curRow = curRow -2;
+ }
Shelves shelves = new Shelves(rowCount, crn_qty);
int divides = (int) Arith.divides(1, curRow - 1, 4);
curRow = (int) Arith.remainder(curRow, 4);
@@ -194,13 +202,13 @@
if (curRow < 0) {
throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
- Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides*1;
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
+ if (basCrnpService.checkSiteError(crnNo, true)) {
curRow = curRow + divides*4;
break;
}
+ }
+ if(crnNo>1) {
+ curRow = curRow +2;
}
}
@@ -245,18 +253,20 @@
if (!locMastService.checkEmptyCount(locMast)) {
locMast = null;
}
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
+ if(curRow >2){
+ // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
+ if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
+ if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
+ locMast = null;
+ }
}
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
+ // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
+ if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
+ if (!shallowLoc.getLocSts().equals("O")) {
+ locMast = null;
+ }
}
}
}
--
Gitblit v1.9.1