From 7a806791fba46b27f4a8af6809c270f92be5f11c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 一月 2024 12:53:37 +0800
Subject: [PATCH] #堆垛机下发命令增加库位类型

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  198 ++++++++++++++++++++++++-------------------------
 1 files changed, 98 insertions(+), 100 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 40fc273..edb31c2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -47,20 +47,31 @@
 //
 //    }};
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);
-        add(105);add(106);add(107);add(108);
+        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(200);add(201);add(202);
     }};
 
-    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-        add(201);add(202);add(203);
-        add(204);add(205);add(206);
+    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
+        add(0); add(1); add(2);
     }};
-
-    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
-        add(301);add(302);add(303);
-        add(304);add(305);add(306);
+    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
+        add(106); add(107); add(159);
     }};
-
 
     private Integer count=0;
 
@@ -90,10 +101,6 @@
         switch (slave.getId()) {
             case 1:
                 return staNos1;
-            case 2:
-                return staNos2;
-            case 3:
-                return staNos3;
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -146,7 +153,7 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo((short) 0);    // ID
+                staProtocol.setWorkNo(0);    // ID
                 staProtocol.setAutoing(false);      // 鑷姩
                 staProtocol.setLoading(false);      // 鏈夌墿
                 staProtocol.setInEnable(false);     // 鍙叆
@@ -190,8 +197,7 @@
 //        updateIoMode();
         ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
-//        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -201,19 +207,11 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
-            }
-        }
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4));   // 鐩爣绔�
 
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.2", (short) (staNoSize * 4));
-        if (result1.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
-                StaProtocol staProtocol = station.get(siteId);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
                 staProtocol.setInEnable(status[2]); // 鍙叆
@@ -226,20 +224,12 @@
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
                 }
-
-                if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
-                    staProtocol.setStamp(0);
-                }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
-                    //lfd鍏ュ簱鍗拌  褰搒tamp>=2鏃舵墠鍏ュ簱
-                    staProtocol.setStamp(staProtocol.getStamp()+1);
-                }
             }
         }
-
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-//        if (result0.IsSuccess) {
-//            for (int i = 0; i < 93; i++) {
+//        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+////        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
+//        if (result.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
 //                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
 //                StaProtocol staProtocol = station.get(siteId);
 //                if (null == staProtocol) {
@@ -247,44 +237,74 @@
 //                    staProtocol.setSiteId(siteId);
 //                    station.put(siteId, staProtocol);
 //                }
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
+//                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+//
+//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
 //            }
 //        }
+//
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 4));
+//        if (result1.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 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]);      // 浣庡簱浣�
+//
+//                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+//                    staProtocol.setPakMk(true);
+//                }
+//
+//                if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
+//                    staProtocol.setStamp(0);
+//                }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
+//                    //lfd鍏ュ簱鍗拌  褰搒tamp>=2鏃舵墠鍏ュ簱
+//                    staProtocol.setStamp(staProtocol.getStamp()+1);
+//                }
+//            }
+//        }
+
         //鏉$爜鎵弿鍣�
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(short)(barcodeSize*8));
-        if (result2.IsSuccess && 1!=1) {
-            if (slave.getId()==1){
-                for (int i = 0; i < barcodeSize/3; i++) {
-                    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)){
-//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-                        barcodeThread.setBarcode(barcode);
-                    }
-                }
-            }else if (slave.getId()==2){
-                for (int i = barcodeSize/3; i < barcodeSize; i++) {
-                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/3)*8,8, "UTF-8");
-                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                    if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-                        barcodeThread.setBarcode(barcode);
-                    }
-                }
-            }else if (slave.getId()==3){
-                for (int i = barcodeSize/3+1; i < barcodeSize; i++) {
-                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-(barcodeSize/3)*2)*8,8, "UTF-8");
-                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                    if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-                        barcodeThread.setBarcode(barcode);
-                    }
+        ArrayList<Integer> barcodeList = BarcodeList;
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (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 + 1);
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
                 }
             }
         }
+        //澶栧舰妫�娴�
+        ArrayList<Integer> staNoErrs = staNosErrList;
+        int staNoErrsSize = staNoErrs.size();
+        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNoErrsSize*8));
+        if (resultErr.IsSuccess){
+            for (int i = 0;i<3;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]);
+            }
+        }
 
-        if (result.IsSuccess && result1.IsSuccess) {
+        if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -322,42 +342,20 @@
         }
         ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[2];
-        array[0] = staProtocol.getWorkNo();
-        array[1] = staProtocol.getStaNo();
-//        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-
         OperateResult write = null;
+        OperateResult write1 = null;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-//            write = siemensS7Net.Write("DB100.0" + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//            Thread.sleep(500);
-//            write1 = siemensS7Net.Write("DB100.0" + index*2+2, staProtocol.getStaNo());    // 鐩爣绔�
-            write = siemensS7Net.Write("DB100." + index*4, array);
-            if(write.IsSuccess){
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.0" + index*2, (short) 2);
-                OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100.0" + index*2+2, (short) 2);
-                if(readResult.IsSuccess && readResult1.IsSuccess){
-                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
-                    if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                        break;
-                    } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
-                        writeCount++;
-                        log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                    }
-                } else {
-                    writeCount++;
-                    log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                }
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            if(write.IsSuccess && write1.IsSuccess){
+                break;
             }
             else {
                 writeCount++;
-                log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
         }while (writeCount<5);
 

--
Gitblit v1.9.1