From b28ae910ed7b7dc9ba563d36fe8b07d1077d7e8c Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 13:34:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 460cfd6..9645650 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,11 +50,14 @@
         add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
         add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
         add(180);add(181);add(182);
-        add(183);add(184);add(185);add(186);add(187);add(188);add(189);
-        add(190);add(191);add(192);
+        add(183);add(184);add(185);add(186);add(187);add(188);add(189);add(190);add(191);add(192);
     }};
 
     public IoModeType ioMode = IoModeType.NONE;
+    /**
+     * 182绔欏爢鍨涙満鎵ц涓嚭搴撴暟閲�
+     */
+    public int PRE_COUNT=0;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -228,16 +231,24 @@
                 log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
-            //鍑哄簱鍒�182绔欏爢鍨涙満浠诲姟鏁版嵁鍙戦�佺粰PLC
-            try{
-                WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
-                if(null != wrkMastService){
-                    int count = wrkMastService.getOutToStn182(182);
-                    OperateResult write = siemensS7Net.Write("DB200.2",(short)count);
-                }
-            }catch (Exception e) {
-                log.error("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-            }
+//            //鍑哄簱鍒�182绔欏爢鍨涙満浠诲姟鏁版嵁鍙戦�佺粰PLC
+//            try{
+//                WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+//                if(null != wrkMastService){
+//                    int count = wrkMastService.getOutToStn182(182);
+//                    if(count != PRE_COUNT){
+//                        OperateResult write = siemensS7Net.Write("DB300.2",(short)count);
+//                        if (write.IsSuccess) {
+//                            PRE_COUNT = count;
+//                        } else {
+//                            log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忛敊璇�,浠诲姟鏁伴噺==>>" + count);
+//                        }
+//                    }
+//                }
+//            }catch (Exception e) {
+//                e.printStackTrace();
+//                log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忓け璐�");
+//            }
 
         } else {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));

--
Gitblit v1.9.1