From 6157b339048697c2916d92da3bd2ad26458a38b7 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期日, 22 三月 2026 13:16:22 +0800
Subject: [PATCH] 入库提示无堆垛机可用修复
---
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 460ec9f..e088aed 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -166,14 +166,14 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
- crnNumber = moveCrnNo;
- if (times == 0) {
- curRow = moveCrnNo * 4 - 1;
- } else {
- curRow = moveCrnNo * 4 - 2;
- }
- }
+// if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
+// crnNumber = moveCrnNo;
+// if (times == 0) {
+// curRow = moveCrnNo * 4 - 1;
+// } else {
+// curRow = moveCrnNo * 4 - 2;
+// }
+// }
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
for (int i = times; i < crnNumber; i++) {
@@ -337,7 +337,7 @@
}
}
// 浣庡簱浣嶅悜楂樺簱浣嶅吋瀹�
- if (locMasts.size() < 5 && locTypeDto.getLocType1() == 1){
+ if (locMasts.size() < 5 && locTypeDto.getLocType1() == 2){
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LowToHeigh"));
if (config == null){
throw new CoolException("浣庡簱浣嶅吋瀹归珮搴撲綅閰嶇疆鍙傛暟寮傚父--->涓嶅瓨鍦�");
@@ -374,9 +374,9 @@
});
for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
if (Cools.isEmpty(locMast2)){
--
Gitblit v1.9.1