From 546a53d51f4e12ebeee1d060ca8d32be42f152cd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:22:16 +0800
Subject: [PATCH] 出入库模式

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   73 ++++++++++++++++++++++++++++--------
 1 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index edce7b1..660ac40 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,11 +42,11 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    private int barcodeSize = 2;
+    private int barcodeSize = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
         add(100);add(101);add(102);
-        add(200);add(201);add(202);
-        add(300);add(301);add(302);
+        add(103);add(104);add(105);
+        add(106);add(107);add(108);
     }};
 
     public boolean charge0;
@@ -132,7 +132,7 @@
             }
         }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.100", (short) (staNos.size()));
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNos.size()));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -155,7 +155,7 @@
 
         //璇绘潯鐮�
         Thread.sleep(100);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)24);
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)24);
         if (result2.IsSuccess) {
             for (int i = 0; i <= barcodeSize; i++) {
                 String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
@@ -181,12 +181,26 @@
             charge1 = status[0];
         }
 
-//        // 澶栧舰妫�娴� - 102
+        // 澶栧舰妫�娴� - 102
+        Thread.sleep(50);
+        OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB102.110", (short)1);
+        if (result102.IsSuccess) {
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(result102.Content, 0, 1);
+            StaProtocol staProtocol = station.get(102);
+            staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
+            staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
+            staProtocol.setHighErr(status[2]);// 楂樿秴闄�
+            staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
+            staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
+            staProtocol.setWeightErr(status[5]); // 瓒呴噸
+            staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
+        }
+//        // 澶栧舰妫�娴� - 201
 //        Thread.sleep(50);
-//        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.129", (short)1);
-//        if (result4.IsSuccess) {
-//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
-//            StaProtocol staProtocol = station.get(102);
+//        OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
+//        if (result201.IsSuccess) {
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
+//            StaProtocol staProtocol = station.get(201);
 //            staProtocol.setFrontErr(status[0]);
 //            staProtocol.setBackErr(status[1]);
 //            staProtocol.setHighErr(status[2]);
@@ -195,12 +209,12 @@
 //            staProtocol.setWeightErr(status[5]);
 //            staProtocol.setBarcodeErr(status[6]);
 //        }
-//        // 澶栧舰妫�娴� - 203
+//        // 澶栧舰妫�娴� - 301
 //        Thread.sleep(50);
-//        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130", (short)1);
-//        if (result5.IsSuccess) {
-//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
-//            StaProtocol staProtocol = station.get(202);
+//        OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
+//        if (result301.IsSuccess) {
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
+//            StaProtocol staProtocol = station.get(301);
 //            staProtocol.setFrontErr(status[0]);
 //            staProtocol.setBackErr(status[1]);
 //            staProtocol.setHighErr(status[2]);
@@ -209,9 +223,9 @@
 //            staProtocol.setWeightErr(status[5]);
 //            staProtocol.setBarcodeErr(status[6]);
 //        }
+
 
         if (result.IsSuccess && result1.IsSuccess) {
-
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -235,6 +249,33 @@
 //            News.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         }
     }
+
+    /**
+     * plc涓庢彁鍗囨満浜や簰
+     */
+    private void write4(Integer siteId, Integer direction) throws InterruptedException {
+        if (Cools.isEmpty(siteId, direction)) {
+            return;
+        }
+        switch (siteId) {
+            case 102:
+                siemensS7Net.Write("DB100.300", direction.shortValue());
+                break;
+            case 105:
+                siemensS7Net.Write("DB100.302", direction.shortValue());
+                break;
+            case 106:
+                siemensS7Net.Write("DB100.304", direction.shortValue());
+                break;
+            case 107:
+                siemensS7Net.Write("DB100.306", direction.shortValue());
+                break;
+            case 108:
+                siemensS7Net.Write("DB100.308", direction.shortValue());
+                break;
+        }
+    }
+
     /**
      * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
      */

--
Gitblit v1.9.1