From 101daeec4a9ab95caf959c97595247c69ec3e03b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 12:56:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++--
src/main/java/com/zy/core/thread/CrnThread.java | 3 ++-
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 2 +-
3 files changed, 7 insertions(+), 4 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 ff24995..b1221d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -12,6 +12,8 @@
import com.zy.common.model.StartupDto;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.CrnForkPosType;
+import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.CrnStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
@@ -261,9 +263,9 @@
continue;
}
// 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触 todo:luxiaotao
- if (crnProtocol.mode == 3 && crnProtocol.getTaskNo() == wrkMast.getWrkNo()
+ if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
&& crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPos==0) {
+ && crnProtocol.forkPosType == CrnForkPosType.HOME) {
wrkMast.setWrkSts(14L);
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) == 0) {
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 00d6b1c..2e8b060 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -74,7 +74,7 @@
*/
public Short forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4146e8f..6545d5b 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -28,6 +28,7 @@
public CrnThread(CrnSlave slave) {
this.slave = slave;
+ this.connect();
}
@Override
@@ -118,7 +119,7 @@
/**
* 鍐欏叆鏁版嵁
*/
- private void write(){
+ private void write(CrnCommand command){
}
--
Gitblit v1.9.1