From 001e17d89444f1dbfd2ff7ed7e88c79015ffd765 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 08 七月 2023 18:52:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 cdb869d..62cd994 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -12,8 +12,6 @@
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Monitor;
-import com.zy.asrs.utils.Roles;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
@@ -117,7 +115,6 @@
}
Short workNo = staProtocol.getWorkNo();
- Monitor.ledError(100,"娴嬭瘯");
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -339,8 +336,6 @@
staNo = 103;
if (basDevps1.size()!=0 && basDevps2.size()!=0){
continue;
- } else if (basDevps1.size()!=0){
- staNo = 203;
}
List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
@@ -363,8 +358,6 @@
staNo = 203;
if (basDevps1.size()!=0 && basDevps2.size()!=0){
continue;
- } else if (basDevps2.size()!=0){
- staNo = 103;
}
// if (basDevps2.size()!=0){
@@ -495,6 +488,15 @@
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
+ // led 寮傚父鏄剧ず
+ String errorMsg = "";
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
+ if (wrkMast.getIoType() == 103) {
+ errorMsg = "褰撳墠鎷ｆ枡浠诲姟璇风Щ鍔ㄨ嚦203绔�";
+ } else {
+ errorMsg = "褰撳墠鎷ｆ枡浠诲姟璇风Щ鍔ㄨ嚦103绔�";
+ }
+ if (ledThread != null) {MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));}
News.error("鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
continue;
}
@@ -4395,7 +4397,8 @@
if (null == loc) {
News.error("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
- throw new CoolException("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
+// return;
+// throw new CoolException("娣卞簱浣嶅嚭搴� --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
}
// 鑾峰彇宸ヤ綔鍙�
--
Gitblit v1.9.1