From 8b1160b353768395307ca9bcb2eb4e6a6ea06479 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 九月 2022 14:12:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 4 ++--
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 4 ++--
src/main/java/com/zy/asrs/controller/SteController.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index 695e7e3..bbc2b37 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -69,7 +69,7 @@
if (steProtocol == null) {
continue;
}
- vo.setTaskNo(steProtocol.getTaskNo()); // 浠诲姟鍙�
+ vo.setTaskNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
vo.setStatusType(steProtocol.mode == 0 ? "绂荤嚎" : "鍦ㄧ嚎"); // 妯″紡鐘舵��
if (!Cools.isEmpty(steProtocol.getStatus())) {
vo.setStatus(steProtocol.getStatusType().desc); // 鐘舵��
@@ -119,7 +119,7 @@
continue;
}
- vo.setWorkNo(steProtocol.getTaskNo()); // 浠诲姟鍙�
+ vo.setWorkNo(steProtocol.getTaskNo().intValue()); // 浠诲姟鍙�
if (steProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(steProtocol.getTaskNo());
if (wrkMast != null) {
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 94e897c..3fb68ff 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1117,7 +1117,7 @@
if (steProtocol == null) { continue; }
if (steProtocol.getWaiting() && steProtocol.getTaskNo() != 0) {
// 鏌ヨ鏄惁鏈夊緟鍏ュ簱鐨勪换鍔�
- WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo());
+ WrkMast wrkMast = wrkMastMapper.selectCarWaiting(steProtocol.getTaskNo().intValue());
if (wrkMast == null) { continue; }
switch (wrkMast.getWrkSts().intValue()) {
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 87bcc77..0b053fc 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -36,7 +36,7 @@
/**
* 浠诲姟鍙�
*/
- public Integer taskNo = 0;
+ public Short taskNo = 0;
/**
* 姝ｅ湪鎵ц浠诲姟
@@ -223,7 +223,7 @@
if (alarm!=null) {
basSte.setSteErr(alarm.longValue());
}
- basSte.setWrkNo(taskNo);
+ basSte.setWrkNo(taskNo.intValue());
return basSte;
}
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index a2ad916..8188d03 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -89,7 +89,7 @@
steProtocol.setSteNo(slave.getId().shortValue());
steProtocol.setMode((short) 0);
steProtocol.setStatus(SteStatusType.OFF_LINE);
- steProtocol.setTaskNo(0);
+ steProtocol.setTaskNo((short) 0);
steProtocol.setExecute(false);
steProtocol.setWaiting(false);
}
@@ -148,7 +148,7 @@
steProtocol.setPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
steProtocol.setLoad(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
steProtocol.setTrack(siemensS7Net.getByteTransform().TransInt16(result.Content, 22));
- steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 24));
+ steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 24));
steProtocol.setTaskType(siemensS7Net.getByteTransform().TransInt16(result.Content, 28));
steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 30));
steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 32));
--
Gitblit v1.9.1