From d317c70cf46549a5cc190d1e3334bd8945ee46a8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 27 六月 2023 15:45:04 +0800
Subject: [PATCH] 单步命令完成状态
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 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 c73274d..33c6fd8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1701,9 +1701,6 @@
&& !liftProtocol.getRunning()
) {
- //鏍囪澶嶄綅
- liftProtocol.setPakMk(true);
-
DevpThread devpThread = null;
Integer devpId = null;
for (DevpSlave devp : slaveProperties.getDevp()){
@@ -1715,6 +1712,16 @@
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
WrkMast wrkMast = wrkMastMapper.selectByWorkNo372428(liftProtocol.getTaskNo().intValue());
if (wrkMast != null) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌杈句换鍔℃ゼ灞�
+ String locNo = wrkMast.getIoType() < 101 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
+ int lev = Utils.getLev(locNo);//浠诲姟鐩爣妤煎眰
+ if (liftProtocol.getLev().intValue() != lev) {
+ continue;//鎻愬崌鏈烘病鏈夊埌杈剧洰鏍�
+ }
+
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+
switch (wrkMast.getWrkSts().intValue()) {
case 3://3.鎻愬崌鏈烘惉杩愪腑 ==> 4.鎻愬崌鏈烘惉杩愬畬鎴�
//缁欑洰鏍囩珯璁剧疆宸ヤ綔鍙�
@@ -1758,6 +1765,9 @@
//鏌ヨ鏄惁鏈夊厖鐢典换鍔�
WrkCharge wrkCharge = wrkChargeMapper.selectByWorkNo(liftProtocol.getTaskNo().intValue());
if (wrkCharge != null) {
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+
switch (wrkCharge.getWrkSts().intValue()) {
case 54://鎻愬崌鏈烘惉杩愪腑
wrkCharge.setWrkSts(55L);//鎻愬崌鏈烘惉杩愬畬鎴�
--
Gitblit v1.9.1