From 8e6af226babe20e42cbe0360b053c2044bcd8524 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 24 四月 2025 10:37:05 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 2 +-
2 files changed, 39 insertions(+), 21 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 5360e02..892adf2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -182,33 +182,20 @@
boolean back = false;
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
String errMsg = "";
- if (staProtocol.isFrontErr()) {
- errMsg = "鍓嶈秴闄�";
- back = true;
- }
if (!back && staProtocol.isBackErr()) {
- errMsg = "鍚庤秴闄�";
+ errMsg = "瓒呭寮傚父";
back = true;
}
if (!back && staProtocol.isHighErr()) {
- errMsg = "楂樿秴闄�";
- back = true;
- }
- if (!back && staProtocol.isLeftErr()) {
- errMsg = "宸﹁秴闄�";
+ errMsg = "瓒呴珮寮傚父";
back = true;
}
if (!back && staProtocol.isRightErr()) {
- errMsg = "鍙宠秴闄�";
+ errMsg = "瓒呴暱寮傚父";
back = true;
}
if (!back && staProtocol.isWeightErr()) {
errMsg = "瓒呴噸";
- back = true;
- }
- if (!back && staProtocol.isBarcodeErr()) {
- errMsg = "鎵爜澶辫触";
- log.error("鐗╂枡鐮佹壂鐮佸け璐�");
back = true;
}
// 閫�鍥�
@@ -222,11 +209,10 @@
// led 寮傚父鏄剧ず
if (ledThread != null) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
+ ledThread.error(errMsg);
}
}
- if (ledThread != null) {
- ledThread.error(errMsg);
- }
+
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && isInEnable(devpThread, inSta.getStaNo()) && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) && staProtocol.isPakMk()) {
String barcode = staProtocol.getBarcode();
@@ -896,7 +882,39 @@
if (staProtocol == null) {
return false;
}
-
+ int led = 1;
+ if (wrkMast.getSourceStaNo() == 1022) {
+ led = 3;
+ } else if (wrkMast.getSourceStaNo() == 1031) {
+ }
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led);
+ String errMsg = "";
+ if (!back && staProtocol.isBackErr()) {
+ errMsg = "瓒呭寮傚父";
+ back = true;
+ }
+ if (!back && staProtocol.isHighErr()) {
+ errMsg = "瓒呴珮寮傚父";
+ back = true;
+ }
+ if (!back && staProtocol.isRightErr()) {
+ errMsg = "瓒呴暱寮傚父";
+ back = true;
+ }
+ if (!back && staProtocol.isWeightErr()) {
+ errMsg = "瓒呴噸";
+ back = true;
+ }
+ // 閫�鍥�
+ if (back) {
+ // led 寮傚父鏄剧ず
+ if (ledThread != null) {
+ MessageQueue.offer(SlaveType.Led, led, new Task(3, errMsg));
+ ledThread.error(errMsg);
+ }
+ }
if (!staProtocol.isAutoing()) {
News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鍦ㄨ嚜鍔ㄧ姸鎬�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index d966582..c379f03 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -163,7 +163,7 @@
staProtocol.setOutEnable(status[4]);// 鍙嚭
staProtocol.setBackErr(status[5]);
- staProtocol.setLeftErr(status[6]);
+ staProtocol.setHigh(status[6]);
staProtocol.setRightErr(status[7]);
// staProtocol.setHighErr(status[8]);
// staProtocol.setWeightErr(status[9]);
--
Gitblit v1.9.1