From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  480 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 348 insertions(+), 132 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..4055c3b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,27 +5,30 @@
 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.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 +43,123 @@
     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 final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+//
+//    }};
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+        add(121);add(122);add(123);add(124);add(125);
+        add(126);
+        add(221);add(222);add(223);add(224);add(225);
+        add(226);add(227);add(228);add(229);add(230);
+        add(231);
+        add(411);add(412);add(413);add(414);
     }};
 
-    public IoModeType ioMode = IoModeType.NONE;
+    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+        add(101);add(102);add(103);
+        add(104);add(105);add(106);add(107);
+        add(108);add(109);
+
+        add(201);add(202);add(203);
+        add(204);add(205);add(206);add(207);
+        add(208);add(209);add(210);add(211);
+
+        add(401);add(402);add(403);add(404);
+    }};
+
+    public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
+        add(1); add(2);add(3);add(4);add(5);
+    }};
+
+    public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+        add(6);add(7);add(8);add(9);
+        add(10); add(11); add(12); add(13);
+    }};
+    public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
+        add(102); add(105);add(107);add(109);
+        add(203);add(205);add(208);add(211);
+    }};
+
+    public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
+        add(123);
+        add(223);add(225);add(228);add(231);
+    }};
+
+    public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
+        add(223);add(225);add(228);add(231);
+    }};
+
+    public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
+        add(102);add(105);add(107);add(109);
+        add(203);add(205);add(208);add(211);
+    }};
+
+    private Integer count=0;
+
+    /**
+     * 鏉$爜鏁伴噺
+     */
+    private int barcodeSize = 13;
+
+    /**
+     * 鍏ュ嚭搴撴ā寮�
+     * 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> getStaNoErr() {
+        switch (slave.getId()) {
+            case 1:
+                return staNosErrList1;
+            case 2:
+                return staNosErrList2;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
+
+    private ArrayList<Integer> getStaNoWeight() {
+        switch (slave.getId()) {
+            case 1:
+                return staNoWeight1;
+            case 2:
+                return staNoWeight2;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
+
+    private ArrayList<Integer> getStaNo() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos1;
+            case 2:
+                return staNos2;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
+    private ArrayList<Integer> getBarcodeList() {
+        switch (slave.getId()) {
+            case 1:
+                return BarcodeList1;
+            case 2:
+                return BarcodeList2;
+            default:
+                throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
+        }
     }
 
     @Override
@@ -79,17 +181,48 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol)task.getData());
+                        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 > 48) {
+            // 绔欑偣缂栧彿
+            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);    // ID
+                staProtocol.setAutoing(false);      // 鑷姩
+                staProtocol.setLoading(false);      // 鏈夌墿
+                staProtocol.setInEnable(false);     // 鍙叆
+                staProtocol.setOutEnable(false);    // 鍙嚭
+                staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
+                staProtocol.setStaNo((short) 0);     // 鐩爣绔�
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+            count = 0;
         }
     }
 
@@ -103,13 +236,28 @@
         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();
+//        siemensS7Net.ConnectClose();
+        initSite();
         return result;
+    }
+
+    public static int getOffsetFromSiteId(int siteId) {
+        if (siteId < 100 || siteId > 450) {
+            throw new IllegalArgumentException("siteId 瓒呭嚭鏈夋晥鑼冨洿: " + siteId);
+        }
+        return (siteId - 100) * 8;
+    }
+
+    public static int getOffsetFromSiteId2(int siteId) {
+        if (siteId < 100 || siteId > 450) {
+            throw new IllegalArgumentException("siteId 瓒呭嚭鏈夋晥鑼冨洿: " + siteId);
+        }
+        return (siteId - 100) * 6;
     }
 
     /**
@@ -118,9 +266,24 @@
     private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
-        if (result.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
+
+//        if (slave.getId()==1) return;
+        ArrayList<Integer> staNos = getStaNo();
+        ArrayList<Integer> staNosErrList = getStaNoErr();
+        ArrayList<Integer> staNoWeight = getStaNoWeight();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (500 * 8));
+        OperateResultExOne<byte[]> resultWeight = null;
+        if(staNoWeight.size()>4){
+            resultWeight = siemensS7Net.Read("DB102.0", (short)  (8 * 4));
+        }else{
+            resultWeight = siemensS7Net.Read("DB102.0", (short)  (4 * 4));
+        }
+        OperateResultExOne<byte[]> resultWeight2 = siemensS7Net.Read("DB102.0", (short)  (4 * 4));
+
+        if (result.IsSuccess && resultWeight.IsSuccess) {
+            int j = 0;
+            for(int i = 0 ; i<staNoSize;i++){
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -128,30 +291,23 @@
                     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);
+                boolean[] status = null;
+                int offset = getOffsetFromSiteId(siteId);//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
+
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset));     // 宸ヤ綔鍙�
+                if (staNoWeight.contains(siteId)) {
+                    if(staNoWeight.size() == 4){
+                        staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
+                        j = j + 4;
+                    }else{
+                        staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight.Content, j));
+                        j = j + 4;
+
+                    }
                 }
-                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.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4));   // 鐩爣绔�
+                status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
+
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
@@ -167,83 +323,114 @@
             }
         }
 
-        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;
+            //鏉$爜鎵弿鍣�
+            ArrayList<Integer> barcodeList = getBarcodeList();
+            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+            if (result2.IsSuccess) {
+                for (int i = 0; i < barcodeList.size(); i++) {
+                    Integer barcodeId = barcodeList.get(i);
+                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
                 }
-                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);     // 鍏ュ簱鏆傚瓨鏁�
             }
-        }
+            //澶栧舰妫�娴�
+            ArrayList<Integer> staNoErrs = staNosErrList;
+            int staNoErrsSize = staNoErrs.size();
+            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
+            if (resultErr.IsSuccess) {
+                for (int i = 0; i < staNoErrsSize; i++) {
+                    Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+                    StaProtocol staProtocol = station.get(siteId);
+                    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]);
+                }
+            }
 
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
+//        //plc鏁呴殰
+//        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.1728", (short) (staNoSize*4));
+//        if (resultErr2.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4, 1);
+//                StaProtocol staProtocol = station.get(siteId);
+//                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]);
+//
+//            }
+//        }
+//        OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
+//        if (resultErr3.IsSuccess) {
+//            if (staError1 == null){
+//                staError1 = new StaError1();
+//            }
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
+//            staError1.setEMERGENCY_Stop_Core(status[0]);
+//            staError1.setEMERGENCY_STOP1(status[1]);
+//            staError1.setEMERGENCY_STOP2(status[2]);
+//            staError1.setEMERGENCY_STOP3(status[3]);
+//            staError1.setEMERGENCY_STOP4(status[4]);
+//
+//            staError1.setDoor_EMERGENCY_STOP1(status[5]);
+//            staError1.setDoor_EMERGENCY_STOP2(status[6]);
+//            staError1.setDoor_EMERGENCY_STOP3(status[7]);
+//            staError1.setDoor_EMERGENCY_STOP4(status[8]);
+//            staError1.setDoor_EMERGENCY_STOP5(status[9]);
+//            staError1.setDoor_EMERGENCY_STOP6(status[10]);
+//
+//            staError1.setDoor_Open_Err1(status[11]);
+//            staError1.setDoor_Open_Err1(status[12]);
+//            staError1.setDoor_Open_Err1(status[13]);
+//            staError1.setDoor_Open_Err1(status[14]);
+//            staError1.setDoor_Open_Err1(status[15]);
+//            staError1.setDoor_Open_Err1(status[16]);
+//
 //        }
 
-        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
 
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+            if (result.IsSuccess) {
 
-            // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-            try {
-                List<BasDevp> basDevps = new ArrayList<>();
-                for (Integer siteId : staNos) {
-                    StaProtocol staProtocol = station.get(siteId);
-                    basDevps.add(staProtocol.toSqlModel());
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+
+                // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+                try {
+                    List<BasDevp> basDevps = new ArrayList<>();
+                    for (Integer siteId : staNos) {
+                        StaProtocol staProtocol = station.get(siteId);
+                        basDevps.add(staProtocol.toSqlModel());
+                    }
+                    BasDevpService basDevpService = SpringContextUtil.getBean(BasDevpService.class);
+                    //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()));
+                    News.error("SiemensDevp" + " - 3" + " - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                 }
 
-                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
-                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-                }
-            } catch (Exception e) {
-                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("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-            }
-
-        } 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()));
+            } 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:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            }
         }
-    }
+
 
     /**
      * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
@@ -252,30 +439,59 @@
         if (null == staProtocol) {
             return;
         }
-        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());    // 鐩爣绔�
+        ArrayList<Integer> staNos = getStaNo();
+//        int index = staNos.indexOf(staProtocol.getSiteId());
+        int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
 
-        if (!write.IsSuccess || !write1.IsSuccess) {
+        OperateResult write = null;
+        OperateResult write1 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess){
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
+
+        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));
-        } 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.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
         }
+//        else {
+//            //dang 101,201zhan xaifazhiling qingchu tiaoxingsaomaolide shuju shanchu
+//            if (staProtocol.getSiteId()==101){
+//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
+//                log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
+//                barcodeThread.clearBarcode();
+//            }
+//            if (staProtocol.getSiteId()==201){
+//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 2);
+//                log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
+//                barcodeThread.clearBarcode();
+//            }
+//            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+//            News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+//        }
     }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     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 +507,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 +528,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