From 29cfbeea17c6d124a00864d1e8f0f79983059530 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 09 三月 2026 15:27:39 +0800
Subject: [PATCH] 下发任务工位调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index cc12a8f..568a5ac 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -75,7 +75,7 @@
case 1:
readStatus();
break;
- // 鍐欏叆鏁版嵁 1鍙峰伐浣�
+ // 鍐欏叆鏁版嵁
case 2:
CrnCommand data = (CrnCommand) task.getData();
crnProtocol.setLastCommandTime(System.currentTimeMillis());
@@ -252,7 +252,7 @@
}
// 澶嶄綅淇″彿
- else if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) && crnProtocol.getTaskNoTwo() != null && crnProtocol.getTaskNoTwo() != 0) {
+ else if (!Cools.isEmpty(crnProtocol.getStatusTypeTwo()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING) && crnProtocol.getTaskNoTwo() != null && crnProtocol.getTaskNoTwo() != 0) {
// if (crnProtocol.getTaskNoTwo() == 0){
// News.error("鍫嗗灈鏈哄伐浣�2宸ヤ綔鍙蜂负0锛屼笉浜堢‘璁わ紝宸ヤ綅2{}",crnProtocol.getLoadedTwo() == 1 ? "鏈夌墿" : "鏃犵墿");
// return;
@@ -263,7 +263,7 @@
if (crnProtocol.getTaskNo() == 9999) {
backHpFlag = false;
}
- Short wrkNo = crnProtocol.getTaskNo();
+ Short wrkNo = crnProtocol.getTaskNoTwo();
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short) 1);
if (write2(crnCommand)) {
--
Gitblit v1.9.1