From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  125 +++++++++++++++++++++++++----------------
 1 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b930438..80fce32 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -133,7 +133,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 5;
+    private int barcodeSize = 9;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -207,6 +207,8 @@
                     case 11:
                         write11((StaProtocol)task.getData());
                         break;
+                    case 99:
+                        write99((Integer) task.getData());
                     default:
                         break;
                 }
@@ -310,14 +312,13 @@
                     Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
                     StaProtocol staProtocol = station.get(siteId);
                     if (null == staProtocol) {
-                        staProtocol = new StaProtocol();
-                        staProtocol.setSiteId(siteId);
-                        station.put(siteId, staProtocol);
+                        continue;
                     }
                     try{
                         staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
 
                         staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 褰撳墠浣嶇疆
+//                        staProtocol.setNowRow((short)2);   // 褰撳墠浣嶇疆
 
                         boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
                         staProtocol.setRGV1(status[0]);  // 灏忚溅鏃犺揣绌洪棽
@@ -353,12 +354,19 @@
         Thread.sleep(200);
         OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
         if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174 4:214  5:120
+            int[] staNosRgv = {281,292,173,214,120,100,101,102,103};
+
+            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174(173) 4:214  5:120
                 String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        continue;
+                    }
+                    staProtocol.setBarcode(barcode);
                     barcodeThread.setBarcode(barcode);
-                    System.out.println(barcode+"璇诲彇鍒版潯鐮侊細"+i);
                 }
             }
         }
@@ -424,9 +432,9 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(500);
             write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+//            Thread.sleep(500);
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
             if(write.IsSuccess || write1.IsSuccess){
                 writeCount=6;
             }else {
@@ -459,26 +467,8 @@
         Integer siteId = staProtocol.getSiteId();
         Integer index =0;
         switch (siteId){
-            case 118:
+            case 607:
                 index=0;
-                break;
-            case 119:
-                index=1;
-                break;
-            case 120:
-                index=2;
-                break;
-            case 121:
-                index=3;
-                break;
-            case 131:
-                index=4;
-                break;
-            case 135:
-                index=5;
-                break;
-            case 147:
-                index=6;
                 break;
             default:
                 return;
@@ -488,7 +478,7 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100.600." + index, true);    // 浠诲姟瀹屾垚
+            write = siemensS7Net.Write("DB100.1872", (short) 1);    // 浠诲姟瀹屾垚
             if(write.IsSuccess){
                 writeCount=6;
             }else {
@@ -517,26 +507,8 @@
         Integer siteId = staProtocol.getSiteId();
         Integer index =0;
         switch (siteId){
-            case 118:
+            case 607:
                 index=0;
-                break;
-            case 119:
-                index=1;
-                break;
-            case 120:
-                index=2;
-                break;
-            case 121:
-                index=3;
-                break;
-            case 131:
-                index=4;
-                break;
-            case 135:
-                index=5;
-                break;
-            case 147:
-                index=6;
                 break;
             default:
                 return;
@@ -546,10 +518,10 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100.600." + index, false);    // 浠诲姟瀹屾垚澶嶄綅
+            write = siemensS7Net.Write("DB100.1872", (short) 0);    // 浠诲姟瀹屾垚澶嶄綅
             if(write.IsSuccess){
                 writeCount=6;
-            }else {
+            } else {
                 writeCount++;
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
@@ -963,7 +935,60 @@
         }
     }
 
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
+    private void write99(Integer devNo) throws InterruptedException {
+        String resultV1 = "";
+        switch (devNo){
+            case 1:
+                resultV1 = "DB500.0.0";
+                break;
+            case 2:
+                resultV1 = "DB500.0.1";
+                break;
+            case 3:
+                resultV1 = "DB500.0.2";
+                break;
+            default:
+                return;
+        }
+        OperateResult result = siemensS7Net.Write(resultV1, true);
+        Integer writeCount = 0;
+        do {
+            try{
+                if(!result.IsSuccess){
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                    result = siemensS7Net.Write(resultV1, true);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
+                if (resultRead1.IsSuccess) {
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+                    if (status[devNo-1]){
+                        break;
+                    } else {
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                        result = siemensS7Net.Write(resultV1, true);
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                    result = siemensS7Net.Write(resultV1, true);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+            }catch (Exception e){
+                log.error("鍐欏叆鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+            }
+            writeCount++;
+        } while (writeCount<6);
+    }
+
+
+        // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
         if (this.ioModeOf2F != IoModeType.NONE) {
             if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {

--
Gitblit v1.9.1