From aba87f9bdad213868e2c8faeabe631c7d882e15d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 17:35:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  392 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 265 insertions(+), 127 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..8939e1d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,27 +5,31 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgvMap;
 import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.BasRgvMapService;
+import com.zy.common.utils.News;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.DevpType.DevpWorkType;
 import com.zy.core.enums.IoModeType;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaError1;
 import com.zy.core.model.protocol.StaProtocol;
 import lombok.Data;
 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;
 
 /**
@@ -40,24 +44,69 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
-        add(110);add(111);add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);
-        add(120);add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);add(129);
-        add(130);add(131);add(132);add(133);add(134);add(135);add(136);add(137);add(138);add(139);
-        add(140);add(141);add(142);add(143);add(144);add(145);add(146);add(147);add(148);add(149);
-        add(150);add(151);add(152);add(153);add(154);add(155);add(156);add(157);add(158);add(159);
-        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);
+    private StaError1 staError1;
+    public static boolean is = true;
+//    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+//
+//    }};
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+    add(1000);	add(1001);	add(1002);	add(1003);	add(1004);	add(1005);	add(1006);	add(1007);	add(1008);	add(1009);	add(1010);
+    add(1011);	add(1012);	add(1013);	add(1014);	add(1015);	add(1016);	add(1017);	add(1018);	add(1019);	add(1020);	add(1021);
+    add(1022);	add(1023);	add(1024);	add(1025);	add(1026);	add(1027);	add(1028);	add(1029);	add(1030);
+    add(2000); add(2001); add(2002); add(2003); add(2004);add(2005); add(2006); add(2007);
+//        add(200);add(201);add(202);
+    }};
+    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+       add(1040);add(1041);add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);
+       add(2010);add(2011);add(2012);add(2013);add(2014);add(2015);add(2016);add(2017);
+       add(3010);add(3011);add(3012);add(3013);add(3014);add(3015);add(3016);add(3017);
+
+//        add(200);add(201);add(202);
     }};
 
-    public IoModeType ioMode = IoModeType.NONE;
+    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
+        add(0); add(1); add(2);
+    }};
+    public static final ArrayList<Integer> BarcodeListMat = new ArrayList<Integer>() {{
+        add(3); add(4);
+    }};
+    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
+        add(106); add(107); add(159);
+    }};
+
+    private Integer count=0;
+
+    /**
+     * 鏉$爜鏁伴噺
+     */
+    private int barcodeSize = 6;
+
+    /**
+     * 鍏ュ嚭搴撴ā寮�
+     * 0锛氭湭鐭�
+     * 1锛氬叆搴撳惎鍔ㄤ腑
+     * 2.鍏ュ簱妯″紡
+     * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+     * 4.鍑哄簱妯″紡
+     */
+    public IoModeType ioModeOf2F = IoModeType.NONE;
+//    public IoModeType ioMode = IoModeType.NONE;
+    public IoModeType ioModeOf4F = IoModeType.NONE;
+//    public IoModeType ioMode = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
+    }
+
+    private ArrayList<Integer> getStaNo() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos1;
+            case 2:
+                return staNos2;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
     }
 
     @Override
@@ -78,19 +127,65 @@
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
-                        write((StaProtocol)task.getData());
+                        writeD((StaProtocol)task.getData(),1);
+//                        log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
                         break;
                     default:
                         break;
                 }
                 // 蹇冭烦
 //                heartbeat();
-                Thread.sleep(400);
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
         }
+    }
+    /**
+     * 鍒濆鍖栫珯鐐圭姸鎬�
+     */
+    private void initSite() {
+        count ++;
+        ArrayList<Integer> staNos = getStaNo();
+        if(count > 50) {
+            // 绔欑偣缂栧彿
+            for (Integer siteId : staNos) {
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setWorkNo(0);     // 宸ヤ綔鍙�
+                staProtocol.setStaNo((short) 0);   // 鐩爣绔�
+                staProtocol.setState((short) 0);  // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
+                staProtocol.setWorkIo((short) 0);
+                staProtocol.setRequestIo((short) 0);
+                staProtocol.setTrayIo((short) 0);
+                staProtocol.setLocIo((short) 0);
+                staProtocol.setBarcode("-");
+                staProtocol.setWeightIo(0.0);
+                staProtocol.setMode((short) 0);
+
+                if (!staProtocol.isPakMk() && staProtocol.workType == DevpWorkType.IDLE) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+            count = 0;
+        }
+
+
+    }
+
+    public void initSta(){
+        if (is){
+            for (int i = 1000; i <= 1300; i++) {
+                staNos1.add(i);
+            }
+            is = false;
+        }
+
     }
 
     @Override
@@ -103,12 +198,13 @@
         if(connect.IsSuccess){
             result = true;
             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()));
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.info("SiemensDevp"+" - 1"+" - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } 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()));
-            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
+        initSite();
         return result;
     }
 
@@ -118,9 +214,11 @@
     private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
+        ArrayList<Integer> staNos = getStaNo();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*66));
         if (result.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
+            for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -128,88 +226,25 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
-            }
-        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-        if (result0.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
-            }
-        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 186);
-        if (result1.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
-                StaProtocol staProtocol = station.get(siteId);
-                staProtocol.setAutoing(status[0]);  // 鑷姩
-                staProtocol.setLoading(status[1]);  // 鏈夌墿
-                staProtocol.setInEnable(status[2]); // 鍙叆
-                staProtocol.setOutEnable(status[3]);// 鍙嚭
-                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                staProtocol.setLow(status[7]);      // 浣庡簱浣�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*66 + 8));     // 宸ヤ綔鍙�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 12));   // 鐩爣绔�
+                staProtocol.setState(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 14));  // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
+                staProtocol.setWorkIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 16));
+                staProtocol.setRequestIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 18));
+                staProtocol.setTrayIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 20));
+                staProtocol.setLocIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 22));
+                staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content,i*66 + 24,16, "UTF-8"));
+//                staProtocol.setWeightIo(siemensS7Net.getByteTransform().TransDouble(result.Content,i*66 + 40));
+                staProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 44));
 
-                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                if (!staProtocol.isPakMk() && (staProtocol.workType == DevpWorkType.IDLE  || staProtocol.isPakReset())) {
                     staProtocol.setPakMk(true);
                 }
             }
         }
 
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB300.0", (short) 10);
-        if (result3.IsSuccess) {
-//            Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-            Integer siteId = 0;
-            for (int i = 0; i < 5; i++) {
-                switch (i){
-                    case 0:
-                        siteId = 100;
-                        break;
-                    case 1:
-                        siteId = 102;
-                        break;
-                    case 2:
-                        siteId = 104;
-                        break;
-                    case 3:
-                        siteId = 106;
-                        break;
-                    case 4:
-                        siteId = 108;
-                        break;
-                }
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                short value = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
-                staProtocol.setInQty(value);     // 鍏ュ簱鏆傚瓨鏁�
-            }
-        }
-
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
-//        }
-
-        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
-
+        if (result.IsSuccess) {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
             try {
                 List<BasDevp> basDevps = new ArrayList<>();
@@ -217,26 +252,15 @@
                     StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
                 }
-
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                 if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                     throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
                 }
             } catch (Exception e) {
+                initSite();
                 e.printStackTrace();
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-                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("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+                News.error("SiemensDevp"+" - 3"+" - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
         } else {
@@ -252,30 +276,144 @@
         if (null == staProtocol) {
             return;
         }
+        ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        Thread.sleep(500);
-        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
+        OperateResult write = null;
+        OperateResult write1 = null;
+        OperateResult write2 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100." + index*66, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (index*66+4), staProtocol.getStaNo());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess){
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
-        if (!write.IsSuccess || !write1.IsSuccess) {
+        if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
                 staProtocol.setPakMk(true);
             }
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+            News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         } else {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+            News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
         }
+    }
+
+    private void writeD(StaProtocol staProtocol,Integer count)throws InterruptedException{
+
+        boolean reset = true;
+        if (null == staProtocol) {
+            return;
+        }
+        staProtocol = staProtocol.clone();
+        Integer oriWrkNo = staProtocol.getWorkNo();
+        short oriStaNo = staProtocol.getStaNo();
+        ArrayList<Integer> staNos = getStaNo();
+        int index = staNos.indexOf(staProtocol.getSiteId());
+
+
+        if(writeWrk(staProtocol,1)){
+
+            int whileCount = 0;
+            OperateResult write3 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
+            if (write3.IsSuccess){
+                News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+1+"]");
+                Thread.sleep(100);
+                do {
+                    OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100."+(index*66 +6), (short) 2);
+                    short mk = siemensS7Net.getByteTransform().TransInt16(result2.Content, 0);
+                    if (mk == 2){
+                        OperateResult write5 = siemensS7Net.Write("DB100." + index*66, 0);    // 宸ヤ綔鍙�
+                        Thread.sleep(100);
+                        OperateResult write6 = siemensS7Net.Write("DB100." + (index*66+4), (short) 0);    // 鐩爣绔�
+                        Thread.sleep(100);
+                        OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), (short) 0);
+                        reset = false;
+                        if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess){
+                            News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
+                            OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100."+(index*66), (short) 8);
+                            Integer wrkNo1 = siemensS7Net.getByteTransform().TransInt32(result1.Content, 0);
+                            short staNo1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 4);
+                            short mk1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 6);
+                            if (wrkNo1 != 0 || staNo1 !=0 || mk1 !=0){
+                                whileCount++;
+                                News.info("澶嶄綅澶辫触,杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
+                            }else {
+                                News.info("杈撻�佺嚎澶嶄綅瀹屾垚");
+                                break;
+                            }
+
+                        }
+                    }else if (reset && mk == 0 ){
+                        OperateResult write7 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
+                        News.info("鍥炶1澶辫触锛岃緭閫佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"1"+"]");
+                        Thread.sleep(100);
+                        whileCount++;
+                    }else {
+                        whileCount++;
+                    }
+                }while (whileCount <10);
+            }
+        }else {
+            log.error("杈撻�佸懡浠や笅鍙戝け璐�"+JSON.toJSONString(staProtocol));
+        }
+
+
+
+    }
+
+    private boolean writeWrk(StaProtocol staProtocol,Integer count)throws InterruptedException {
+
+        if (null == staProtocol) {
+            return false;
+        }
+        Integer oriWrkNo = staProtocol.getWorkNo();
+        short oriStaNo = staProtocol.getStaNo();
+
+        ArrayList<Integer> staNos = getStaNo();
+        int index = staNos.indexOf(staProtocol.getSiteId());
+        do {
+            log.info("杈撻�侀�掑綊娆℃暟:" + count);
+            OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(100);
+            OperateResult write2 = siemensS7Net.Write("DB100." + (index * 66 + 4), staProtocol.getStaNo());    // 鐩爣绔�
+            if (write1.IsSuccess && write2.IsSuccess) {
+                News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:" + slave.getId() + "] >>>>>" + "[" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo() + "]");
+                OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100." + (index * 66), (short) 6);
+                Integer wrkNo = siemensS7Net.getByteTransform().TransInt32(result.Content, 0);
+                short staNo = siemensS7Net.getByteTransform().TransInt16(result.Content, 4);
+                if (!oriWrkNo.equals(wrkNo) || oriStaNo != staNo) {
+                    if (count >= 5) {
+                        log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), count);
+                        return false;
+                    }
+                    count++;
+                }else {
+                    return true;
+                }
+            }
+        }while (count <=5);
+
+
+        return true;
     }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
-        if (this.ioMode != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB200", this.ioMode.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+        if (this.ioModeOf2F != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
     }
@@ -291,7 +429,7 @@
         }
         OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
         if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("SiemensDevp"+" - 7"+" - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
         }
     }
 
@@ -312,14 +450,14 @@
     }
 
     public static void main(String[] args) {
-        System.out.println(staNos.indexOf(129));
-        System.out.println(staNos.size());
-        for (int i = 0; i<staNos.size(); i++) {
+        System.out.println(staNos1.indexOf(129));
+        System.out.println(staNos1.size());
+        for (int i = 0; i<staNos1.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);
 //            System.out.println(i);
         }
-        int index = staNos.indexOf(128);
+        int index = staNos1.indexOf(128);
         System.out.println(index*2);
         System.out.println(index*2 + 200);
     }

--
Gitblit v1.9.1