From 2ec8d040b9a33b83c0c78a29b7decbd8816d6cc0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 16 九月 2025 14:35:21 +0800
Subject: [PATCH] 入库分配库位，判断深库位状态
---
src/main/java/com/zy/common/service/CommonService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fd6c66a..fe43f14 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -183,13 +183,24 @@
if (locMasts.isEmpty()) {
throw new CoolException("娌℃湁鍙敤搴撲綅");
}
-
+ // 娴呭簱浣�
+ String[] split = "02,03,06,07,10,11,14,15,18,19,22,23".split(",");
// 璁板綍鍫嗗灈鏈烘槸鍚︽煡璇㈣繃锛岄伩鍏嶉噸澶嶆煡璇�
Map<Integer,Boolean> crnMap = new HashMap<>();
for (LocMast mast : locMasts) {
if (crnMap.get(mast.getCrnNo()) == null) {
//棰勭暀绌哄簱浣�
if (locMastService.checkEmptyCount(mast, 10)) {
+ Integer row1 = mast.getRow1();
+ if(slaveProperties.getDoubleLocs().contains(row1)){
+ // 鍙栨祬搴撲綅
+ String s = split[slaveProperties.getDoubleLocs().indexOf(row1)];
+ LocMast locMast1 = locMastService.selectById(s + mast.getLocNo().substring(2));
+ if(locMast1 != null && !locMast1.getLocSts().equals("O")) {
+ log.warn("鍏ュ簱鍒嗛厤搴撲綅锛歿}锛屽搴旀祬搴撲綅{}涓嶄负绌猴細{}",mast.getLocNo(),locMast1.getLocNo(),locMast1.getLocSts());
+ continue;
+ }
+ }
locMast = mast;
break;
} else {
@@ -198,6 +209,11 @@
}
}
+ if (locMast == null) {
+ log.error("鍏ュ簱璇锋眰搴撲綅涓嶈冻锛屽墿浣欏簱浣嶄笉瓒�/涓嶆弧瓒冲叆搴撴潯浠�");
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅涓嶈冻锛屽墿浣欐暟閲忎笉瓒�/涓嶆弧瓒冲叆搴撴潯浠�");
+ }
+
return locMast;
}
--
Gitblit v1.9.1