From c055f092fd989a009e93e7b7b4ccceb6eaaead38 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期五, 06 十二月 2024 16:05:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  564 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 496 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d7de2ab..85093a7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,36 +43,6 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
 
-//    public static final ArrayList<Integer> staNoseee1 = new ArrayList<Integer>() {{
-//        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(2001);add(2002);add(2003);add(2004);add(2005);
-//        add(2006);add(2007);add(2008);add(2009);add(2010);
-//        add(2011);add(2012);add(2013);
-//
-//        add(2101);add(2102);add(2103);add(2104);add(2105);
-//        add(2106);add(2107);add(2108);add(2109);add(2110);
-//        add(2111);add(2112);add(2113);add(2114);
-//
-//        add(2301);add(2302);add(2303);add(2304);add(2305);
-//        add(2306);
-//
-//        add(2401);add(2402);add(2403);
-//
-//        add(3001);add(3002);add(3003);add(3004);add(3005);
-//        add(3006);add(3007);add(3008);add(3009);add(3010);
-//        add(3011);add(3012);
-//
-//        add(4001);add(4002);add(4003);add(4004);add(4005);
-//        add(4006);add(4007);
-//
-//        add(4010);add(4011);add(4012);add(4013);add(4014);
-//        add(4015);add(4016);
-//    }};
 
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
         add(1001);add(1002);add(1003);add(1004);add(1005);
@@ -83,29 +53,31 @@
     }};
 
     public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-        add(2001);add(2002);add(2003);add(2004);add(2005);add(2006);
-        add(2101);add(2102);add(2103);add(2104);add(2105);add(2106);add(2107);
-        add(2301);add(2302);add(2303);add(2304);add(2305);add(2306);
+        add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
+        add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
+        add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
     }};
 
     public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+        add(5001);add(5002);
+    }};
+
+    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
+        add(4007);
+    }};
+
+    public static final ArrayList<Integer> staNos5 = new ArrayList<Integer>() {{
+        add(4016);
+    }};
+
+    public static final ArrayList<Integer> staNos6 = new ArrayList<Integer>() {{
         add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
         add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
         add(2401);add(2402);add(2403);
     }};
-
-    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
-        add(3001);add(3002);add(3003);add(3004);add(3005);
-        add(3006);add(3007);add(3008);add(3009);add(3010);
-        add(3011);add(3012);
-    }};
-
-    public static final ArrayList<Integer> staNos5 = new ArrayList<Integer>() {{
-        add(4001);add(4002);add(4003);add(4004);add(4005);add(4006);add(4007);
-    }};
-
-    public static final ArrayList<Integer> staNos6 = new ArrayList<Integer>() {{
-        add(4010);add(4011);add(4012);add(4013);add(4014);add(4015);add(4016);
+    public static final ArrayList<Integer> staNos7 = new ArrayList<Integer>() {{
+        add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
+        add(3008);add(3009);add(3010);add(3011);add(3012);
     }};
 
 
@@ -118,29 +90,31 @@
     }};
 
     public static final ArrayList<Integer> writeStaNos2 = new ArrayList<Integer>() {{
-        add(2001);add(2002);add(2003);
-        add(2101);add(2102);add(2103);
-        add(2301);
+        add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
+        add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
+        add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
     }};
 
     public static final ArrayList<Integer> writeStaNos3 = new ArrayList<Integer>() {{
-        add(2013);
-        add(2114);
-        add(2401);add(2402);
+        add(5001);add(5002);
     }};
 
     public static final ArrayList<Integer> writeStaNos4 = new ArrayList<Integer>() {{
-        add(3001);
-        add(3007);
-        add(3012);
+        add(4007);
     }};
 
     public static final ArrayList<Integer> writeStaNos5 = new ArrayList<Integer>() {{
-        add(4001);add(4007);
+        add(4016);
     }};
 
     public static final ArrayList<Integer> writeStaNos6 = new ArrayList<Integer>() {{
-        add(4010);add(4016);
+        add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
+        add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
+        add(2401);add(2402);add(2403);
+    }};
+    public static final ArrayList<Integer> writeStaNos7 = new ArrayList<Integer>() {{
+        add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
+        add(3008);add(3009);add(3010);add(3011);add(3012);
     }};
 
     public static final ArrayList<Integer> errorStaNos1 = new ArrayList<Integer>() {{
@@ -153,6 +127,10 @@
 
     public static final ArrayList<Integer> errorStaNos4 = new ArrayList<Integer>() {{
         add(3007);add(3012);
+    }};
+
+    public static final ArrayList<Integer> errorStaNos7 = new ArrayList<Integer>() {{
+        add(3006);add(3007);
     }};
 
     /**
@@ -188,6 +166,8 @@
                 return staNos5;
             case 6:
                 return staNos6;
+            case 7:
+                return staNos7;
             default:
                 throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
         }
@@ -207,6 +187,8 @@
                 return writeStaNos5;
             case 6:
                 return writeStaNos6;
+            case 7:
+                return writeStaNos7;
             default:
                 throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
         }
@@ -220,6 +202,8 @@
                 return errorStaNos2;
             case 4:
                 return errorStaNos4;
+            case 7:
+                return errorStaNos7;
             default:
                 throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
         }
@@ -239,11 +223,44 @@
                 switch (step) {
                     // 璇绘暟鎹�
                     case 1:
-                        read();
+                        switch (slave.getId()){
+                            case 1:
+                            case 6:
+                            case 7:
+                                read();break;
+                            case 2:
+                                read10();break;
+                            case 3:
+                                read30();break;
+                            case 4:
+                                read33();break;
+                            case 5:
+                                read55();break;
+                        }
+
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
-                        write((StaProtocol)task.getData());
+                        switch (slave.getId()){
+                            case 1:
+                            case 3:
+                            case 6:
+                            case 7:
+                                write((StaProtocol)task.getData());break;
+                            case 2:
+                                write10((StaProtocol)task.getData());break;
+
+
+                        }
+
+                        break;
+                    // 鍐欐暟鎹� ID+鐩爣绔�  2106鐗逛緵
+                    case 3:
+                        switch (slave.getId()){
+                            case 2:
+                                write2106((StaProtocol)task.getData());break;
+                        }
+
                         break;
                     default:
                         break;
@@ -293,6 +310,7 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
+                staProtocol.setSiteId(siteId);
                 staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 宸ヤ綔鍙�
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 ));   // 鐩爣绔�
             }
@@ -336,18 +354,135 @@
                     }
                 }
             }
+        } else if (slave.getId() == 7) {
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result2 = null;
+            result2 = siemensS7Net.Read("DB101.104.0", (short) (barcodeSize * 8));
+            if (result2.IsSuccess) {
+                for (int i = 0; i < barcodeSize; i++) {
+                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 4);
+                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
+                }
+            }
         }
 
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = null;
-        result3 = siemensS7Net.Read("DB101.0", (short) (getErrorStaNo().size() * 8));
-        if (result3.IsSuccess) {
-            for (int i = 0; i < getErrorStaNo().size(); i++) {
-                Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+        if (slave.getId() ==1){
+            //鎶ヨ淇℃伅
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result3 = null;
+            result3 = siemensS7Net.Read("DB101.200.0", (short) (getErrorStaNo().size() * 4));
+            if (result3.IsSuccess) {
+                for (int i = 0; i < getErrorStaNo().size(); i++) {
+                    Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+//                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));   // 搴撲綅楂樺害
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+                    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]);
+                }
+
+            }
+        } else if (slave.getId() == 7) {
+            //鎶ヨ淇℃伅
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result3 = null;
+            OperateResultExOne<byte[]> result37new = null;
+            result3 = siemensS7Net.Read("DB101.96.0", (short) (getErrorStaNo().size() * 4));
+            result37new = siemensS7Net.Read("DB101.120", (short) 8);
+            if (result3.IsSuccess) {
+                for (int i = 0; i < getErrorStaNo().size(); i++) {
+                    Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+//                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));   // 搴撲綅楂樺害
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+                    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]);
+                }
+
+            }
+            if (result37new.IsSuccess) {
+                StaProtocol staProtocol11 = station.get(3011);
+                StaProtocol staProtocol06 = station.get(3006);
+                short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
+                short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);
+
+                short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
+                short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
+                staProtocol11.setStaNoEnd(a11173);
+                staProtocol11.setBan(a11171==1);
+                staProtocol06.setStaNoEnd(a11174);
+                staProtocol06.setBan(a11172==1);
+            }
+        }
+
+        if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {
+
+            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 = 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());
+            }
+
+        } 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());
+        }
+    }
+
+    private void read10() throws InterruptedException {
+        ArrayList<Integer> staNos = getStaNo();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12));
+        if (result.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
-                staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 ));   // 搴撲綅楂樺害
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4, 2);
-                staProtocol.setF(status[0]);  // 鑷姩
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12));     // 宸ヤ綔鍙�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 ));   // 鐩爣绔�
+                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12 + 6));   // 鐩爣绔�
+            }
+        }
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> result1 = null;
+        result1 = siemensS7Net.Read("DB101.10", (short) (getStaNo().size() * 12));
+        if (result1.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*12, 2);
+                StaProtocol staProtocol = station.get(siteId);
+                staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
@@ -364,7 +499,259 @@
             }
         }
 
+        OperateResultExOne<byte[]> readBatch = siemensS7Net.Read("DB101.240", (short) 20);
+        if (readBatch.IsSuccess){
+            String batch = siemensS7Net.getByteTransform().TransString(readBatch.Content, 0, 20, "UTF-8");
+            for (int i = 0; i < 1; i++) {
+                StaProtocol staProtocol = station.get(2106);
+                staProtocol.setBatch(batch);
+            }
+        }
+
+        OperateResultExOne<byte[]> readWeight = siemensS7Net.Read("DB101.260", (short) 2);
+        if (readWeight.IsSuccess){
+            Short weight = siemensS7Net.getByteTransform().TransInt16(readWeight.Content,0);
+            for (int i = 0; i < 1; i++) {
+                StaProtocol staProtocol = station.get(2102);
+                staProtocol.setWeight(weight);
+            }
+        }
+
+
+
+        // 鏉$爜鎵弿鍣�
+        if(slave.getId() == 2) {
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result2 = null;
+            result2 = siemensS7Net.Read("DB101.232.0", (short) (8));
+            if (result2.IsSuccess) {
+                for (int i = 0; i < 1; i++) {
+                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 3);
+                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
+                }
+            }
+        }
+
+
+
         if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {
+
+            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 = 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());
+            }
+
+        } 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());
+        }
+    }
+
+    private void read30() throws InterruptedException {
+        ArrayList<Integer> staNos = getStaNo();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
+
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*4));
+        if (result.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
+                short count = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
+
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setAutoing(status[0]);  // 鑷姩
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setOutEnable(status[3]);// 鍙嚭
+                staProtocol.setForce(status[4]);
+                staProtocol.setAmount(count);
+                staProtocol.setLow(true);
+
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+        }
+
+        if (result.IsSuccess) {
+
+            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 = 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());
+            }
+
+        } 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());
+        }
+    }
+
+    private void read33() throws InterruptedException {
+        ArrayList<Integer> staNos = getStaNo();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
+
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*38));
+        if (result.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
+                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
+                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
+                short amount =  siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
+                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
+                short staEnd = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 30);
+                short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 32);
+                Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 34);
+
+
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setSiteId(siteId);
+                staProtocol.setAutoing(status[0]);  // 鑷姩
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setEmptyOutPalletRequire(status[3]);
+                staProtocol.setMatnr(matnr);
+                staProtocol.setTongType(tongType);
+                staProtocol.setBatch(batch);
+                staProtocol.setAmount(amount);
+                staProtocol.setAnfme(Double.valueOf(amount));
+                staProtocol.setAnfme2(Double.valueOf(amount));
+                int i1 = w1 / 100;
+                staProtocol.setWeight1((double) i1);
+//                staProtocol.setWeight2(w2);
+//                staProtocol.setWeight3(w3);
+//                staProtocol.setWeight4(w4);
+                staProtocol.setStaNoEnd(staEnd);
+                staProtocol.setBan(ban == 1);
+                staProtocol.setLow(true);
+
+
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+        }
+
+        if (result.IsSuccess) {
+
+            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 = 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());
+            }
+
+        } 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());
+        }
+    }
+
+    private void read55() throws InterruptedException {
+        ArrayList<Integer> staNos = getStaNo();
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
+
+        result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*34));
+        if (result.IsSuccess) {
+            for (int i = 0; i < staNoSize; i++) {
+                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
+//                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
+                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 2);
+                short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
+                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
+                short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);
+                Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 30);
+
+
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setSiteId(siteId);
+                staProtocol.setAutoing(status[0]);  // 鑷姩
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setEmptyOutPalletRequire(status[3]);
+                staProtocol.setMatnr(matnr);
+                staProtocol.setAmount(amount);
+                staProtocol.setBatch(batch);
+                staProtocol.setLow(true);
+                int i1 = w1 / 100;
+                staProtocol.setWeight1((double) i1);
+                staProtocol.setBan(ban == 1);
+
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+        }
+
+        if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -419,6 +806,47 @@
     }
 
     /**
+     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+     */
+    private void write10(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        ArrayList<Integer> staNos = getWriteStaNo();
+        int index = staNos.indexOf(staProtocol.getSiteId());
+        OperateResult write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue());    // 宸ヤ綔鍙�
+        OperateResult write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo());    // 鐩爣绔�
+        OperateResult write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr());    // 鐩爣绔�
+
+        if (!write.IsSuccess || !write1.IsSuccess || !write2.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));
+        }
+    }
+    /**
+     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+     */
+    private void write2106(StaProtocol staProtocol) throws InterruptedException {
+
+        OperateResult write = siemensS7Net.Write("DB100.210", (short) 2);    // 鏉$爜閲嶅鍥為��
+
+        if (!write.IsSuccess) {
+            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));
+        }
+    }
+
+    /**
      * 蹇冭烦
      */
     private void heartbeat(){

--
Gitblit v1.9.1