From a00edfd8bd90940d0b6e1d6876e443a1317d5701 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 22 十二月 2025 19:40:57 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 6cb4231..d0b351d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1213,6 +1213,15 @@
News.error("" + mark + " - 2" + " - 2" + " - 鍑哄簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), sourceSta.getLocSts());
continue;
}
+ //鑾峰彇娴呭簱浣嶄俊鎭�
+ if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
+ String shallowLoc1 = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.selectById(shallowLoc1);
+ if (shallowLoc1 != null && (locMast.getLocSts().equals("P") || locMast.getLocSts().equals("Q") || locMast.getLocSts().equals("R") || locMast.getLocSts().equals("S"))) {
+ News.error(wrkMast.getSourceLocNo() + "瀵瑰簲鐨勬祬搴撲綅涓篜/Q/R/S锛屾殏鏃朵笉鍑烘繁搴撲綅");
+ continue;
+ }
+ }
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
@@ -2719,7 +2728,7 @@
if (Utils.isDeepLoc(slaveProperties, row)) {
if (shallowLoc.getBay1() == 1) {
loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
- } else if (shallowLoc.getRow1() == 29) {
+ } else if (shallowLoc.getBay1() == 29) {
loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
@@ -2745,7 +2754,7 @@
if (Utils.isShallowLoc(slaveProperties, row)) {
if (shallowLoc.getBay1() == 1) {
loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
- } else if (shallowLoc.getRow1() == 29) {
+ } else if (shallowLoc.getBay1() == 29) {
loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
} else {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
--
Gitblit v1.9.1