From ea5d901601c30c331829be01982ea5ecdcc08b97 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 15 七月 2025 14:47:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c83491f..2e357a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1386,7 +1386,18 @@
} else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
// 姝ゆ爣璁伴伩鍏嶅娆℃墽琛岀Щ搴撲换鍔�
- if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
+//// if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
+// wrkMast.setUpdMk("Y");
+// wrkMast.setIoPri(14D);
+// wrkMastMapper.updateById(wrkMast);
+// // 鐢熸垚宸ヤ綔妗�,灏嗘祬搴撲綅绉昏浆鍒版柊鐨勫簱浣嶄腑
+// moveLocForDeepLoc(slave, shallowLoc);
+// // 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
+//// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
+//// }
+// break;
+ WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
+ if (Cools.isEmpty(waitWrkMast)) {
wrkMast.setUpdMk("Y");
wrkMast.setIoPri(14D);
wrkMastMapper.updateById(wrkMast);
@@ -1395,7 +1406,7 @@
// 鐢熸垚宸ヤ綔妗ｃ�佹敼鍙樻祬搴撲綅鐨勬簮搴�/鐩爣搴� 搴撲綅鐘舵�併�佷笅鍙戝爢鍨涙満鍛戒护锛堢珛椹墽琛�)
// moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
}
- continue;
+ break;
} else if (shallowLoc.getLocSts().equals("Q")) {
WrkMast waitWrkMast = wrkMastMapper.selectByLocNo1(shallowLocNo);
if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
@@ -1580,7 +1591,7 @@
Integer count = wrkMastMapper.countPakOut();
for (WrkMast wrkMast : wrkMasts) {
- if(count > 30){ //璁惧涓婅蛋鎵樼洏涓嶈秴杩�30涓�
+ if(count > 20){ //璁惧涓婅蛋鎵樼洏涓嶈秴杩�30涓�
continue;
}
// 鍒ゆ柇鍫嗗灈鏈虹珯鐐规槸鍚﹀彲鐢�
--
Gitblit v1.9.1