From be412111689a7f27abfadb1241dfa5b70ac4c170 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 12 十月 2022 16:02:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 8 ++++++++
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 6 ++++++
src/main/resources/mapper/WrkMastMapper.xml | 4 ++--
3 files changed, 16 insertions(+), 2 deletions(-)
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 0b6a91a..42515cc 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -190,6 +190,12 @@
*/
private Short chargeStatus;
+ // 鍏ュ簱鍙栫┖
+ private Boolean inEmpty;
+
+ // 鍑哄簱鍙栫┖
+ private Boolean outEmpty;
+
public void setStatus(Short status){
this.status = status;
this.statusType = SteStatusType.get(status);
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index a278c53..4adf992 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -138,6 +138,14 @@
if (waitingRes.IsSuccess) {
steProtocol.setWaiting(waitingRes.Content);
}
+ OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
+ if (inEmptyRes.IsSuccess) {
+ steProtocol.setInEmpty(inEmptyRes.Content);
+ }
+ OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
+ if (outEmptyRes.IsSuccess) {
+ steProtocol.setOutEmpty(outEmptyRes.Content);
+ }
steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
steProtocol.setCharge(siemensS7Net.getByteTransform().TransSingle(result.Content, 10));
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 1e7c71c..4349215 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -132,7 +132,7 @@
<select id="selectPakin" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
where 1=1
- and wrk_sts in (3,4,5,6,7,8)
+ and wrk_sts in (3,4,5,6,7,8,9)
and crn_no=#{crnNo}
<if test="steNo != null">
and ste_no = #{steNo}
@@ -142,7 +142,7 @@
<select id="selectPakout" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
where 1=1
- and wrk_sts in (12,13,14,15,16)
+ and wrk_sts in (12,13,14,15,16,17)
and crn_no=#{crnNo}
<if test="steNo != null">
and ste_no = #{steNo}
--
Gitblit v1.9.1