From 09f658d805f714fc2b90794e4b772aa802ca55a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 10 七月 2024 08:27:59 +0800
Subject: [PATCH] 更新库位状态修改
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6322db8..17ccc10 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,7 +9,6 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
@@ -29,10 +28,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -148,6 +144,9 @@
write2((StaProtocol)task.getData());
read();
break;
+ case 4:
+ write3((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -158,6 +157,38 @@
e.printStackTrace();
}
+ }
+ }
+
+ // 鍐欑粍鎷撲俊鍙�(娌℃湁鏌ヨ鍒拌鎵樼洏鐮佷换鍔�)
+ private void write3(StaProtocol staProtocol) {
+ // 涓�涓猻hort=涓や釜瀛楄妭=2*byte 1byte = 8浣�
+ // 鍏堣涓�娆�
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.200", (short) 1);
+ if(read.IsSuccess){
+ byte[] content = read.Content;
+ boolean[] array = siemensS7Net.getByteTransform().TransBool(content, 0,1);
+ // 濡傛灉宸茬粡涓簍rue锛屽垯涓嶉噸澶嶅啓
+ boolean flag = false;
+ switch (staProtocol.getSiteId()) {
+ case 103: if(array[0]) {
+ } else array[0] = true; flag = true; break;
+ case 107: if(array[1]) {
+ } else array[1] = true; flag = true; break;
+ case 111: if(array[2]) {
+ } else array[2] = true; flag = true; break;
+ case 115: if(array[3]) {
+ } else array[3] = true; flag = true; break;
+ case 119: if(array[4]) {
+ } else array[4] = true; flag = true; break;
+ case 123: if(array[5]) {
+ } else array[5] = true; flag = true; break;
+ default:
+ }
+ if (flag) {
+ siemensS7Net.Write("DB100.200", array);
+ log.info("鍐欏叆缁勬墭淇″彿锛歿}", Arrays.toString(array));
+ }
}
}
@@ -480,14 +511,14 @@
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
StaProtocol staProtocol = station.get(siteId);
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
+ staProtocol.setBreakerErr(status[0]); //鎻愬崌鏈� 涓婂崌鏋侀檺
+ staProtocol.setInfraredErr(status[1]); //鎻愬崌鏈� 涓嬮檷鏋侀檺
staProtocol.setOutTimeErr(status[2]);
staProtocol.setSeizeSeatErr(status[3]);
staProtocol.setWrkYgoodsN(status[4]);
staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
+ staProtocol.setContactErr(status[6]); //鎻愬崌鏈� 宸﹁秴闄�
+ staProtocol.setUpcontactErr(status[7]); //鎻愬崌鏈� 鍙宠秴闄�
}
}
--
Gitblit v1.9.1