From 30250cdfb6caa5ced4bd19056cea84f79c719f32 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 16 八月 2025 09:59:37 +0800
Subject: [PATCH] 分开允许每台堆垛机连续出库
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index b58bf09..f4a0b8d 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -831,8 +831,15 @@
News.warnNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
boolean crnAvailableOut = false;
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","removeCrnAvailableOut"));
- if (config != null && config.getStatus() == 1) {
- crnAvailableOut = true;
+ if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+ // 闇�瑕佽嚜鍔ㄨˉ绌烘《鐨勭珯鐐�
+ String[] split = config.getValue().split("=");
+ for (String item : split) {
+ if (slave.getId() == Integer.parseInt(item)) {
+ crnAvailableOut = true;
+ break;
+ }
+ }
}
// 闄愬埗鍘绘崋缁戞満鍣ㄤ换鍔℃暟
int kbWrks = wrkMastMapper.selectCountByKb();
@@ -2344,8 +2351,8 @@
}
} else if (wantBucket.getSite() == 1071 && count <= 2 || wantBucket.getSite() == 1064 && count == 0 || wantBucket.getSite() == 1078 && count <= 2) { // 鍙互鍑轰袱涓�
- // 鑷姩鍑虹┖妗跺垽鏂�4鍙峰爢鍨涙満鏈夋棤鍑哄簱浠诲姟锛屾湁鍒欎笉鐢熸垚锛岃鍏ュ簱鍙ｇ洿渚涚綈瑁呯嚎
- Integer count1 = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 4).eq("wrk_sts", 11));
+ // 鑷姩鍑虹┖妗讹紝鍧囧寑鍑哄埌姣忓彴缃愯绾�
+ Integer count1 = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", 4).eq("sta_no",wantBucket.getSite()).in("wrk_sts", 11,12));
if(count1 > 0) {
return;
}
--
Gitblit v1.9.1