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 | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 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 f515e5c..e088aed 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -13,6 +13,8 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -50,6 +52,8 @@
private SlaveProperties slaveProperties;
@Autowired
private MatServiceImpl matService;
+ @Autowired
+ private ConfigService configService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -162,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++) {
@@ -332,7 +336,25 @@
}
}
- if (locMasts.size() < 2){
+ // 浣庡簱浣嶅悜楂樺簱浣嶅吋瀹�
+ if (locMasts.size() < 5 && locTypeDto.getLocType1() == 2){
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LowToHeigh"));
+ if (config == null){
+ throw new CoolException("浣庡簱浣嶅吋瀹归珮搴撲綅閰嶇疆鍙傛暟寮傚父--->涓嶅瓨鍦�");
+ }else if (config.getValue().equals("N")){
+ throw new CoolException("浣庡簱浣嶅吋瀹归珮搴撲綅閰嶇疆鍙傛暟寮傚父--->鍙傛暟鍊间负N--->鏈墦寮�");
+ } else if (config.getValue().equals("Y")) {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").eq("loc_type1", 5));
+ if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){
+ if (nearRow == 2){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",nearRow + 1).eq("loc_sts", "O").eq("loc_type1", 5));
+ } else if (nearRow == 3) {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",nearRow - 1).eq("loc_sts", "O").eq("loc_type1", 5));
+ }
+ }
+ }
+ }
+ if (locMasts.size() < 5){
throw new CoolException("鏃犵┖搴撲綅鍙敤");
}
List<LocMast> locMastList = new ArrayList<>();
@@ -352,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