From 16e508d2b0d38d2d063ab3767adc79d2d96c0dd9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 13 一月 2024 16:10:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   24 ++++++------
 src/main/java/com/zy/core/MainProcess.java                  |    6 +-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |   21 +---------
 src/main/resources/application.yml                          |   13 +++---
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3d1ef7e..a95bdc6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -288,7 +288,7 @@
 
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - 缁勬墭  ===銆嬫墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 缁勬墭  ===銆嬫墽琛屽畬鎴�");
 
     }
 
@@ -354,7 +354,7 @@
                 }
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - wms鍏ュ簱  ===銆嬫墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - wms鍏ュ簱  ===銆嬫墽琛屽畬鎴�");
 
     }
 
@@ -493,7 +493,7 @@
             }
 
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱  ===銆嬫墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱  ===銆嬫墽琛屽畬鎴�");
     }
 
     /**
@@ -565,7 +565,7 @@
                 }
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯  ===銆嬫墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯  ===銆嬫墽琛屽畬鎴�");
     }
 
     /**
@@ -624,7 +624,7 @@
 //            this.crnRebackHp(crnProtocol, crnThread);
 
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
+//        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂鎵ц瀹屾垚");
     }
 
     /**
@@ -1218,7 +1218,7 @@
 
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - 瀵瑰伐浣滄。鐨勫畬鎴愭搷浣滄墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 瀵瑰伐浣滄。鐨勫畬鎴愭搷浣滄墽琛屽畬鎴�");
     }
 
     /**
@@ -1340,7 +1340,7 @@
             }
 
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄紓甯镐俊鎭褰曟墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 鍫嗗灈鏈哄紓甯镐俊鎭褰曟墽琛屽畬鎴�");
     }
 
 
@@ -1451,7 +1451,7 @@
                 }
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐ф墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐ф墽琛屽畬鎴�");
     }
 
     /**
@@ -1580,7 +1580,7 @@
             }
 
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣ㄦ墽琛屽畬鎴�");
+//        News.infoNoLog(""+mark+" - 0"+" - 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣ㄦ墽琛屽畬鎴�");
     }
 
     /**
@@ -1588,7 +1588,7 @@
      */
     public synchronized void ledReset(Integer mark) {
 
-        News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�:鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
+//        News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�:鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
         for (LedSlave led : slaveProperties.getLed()) {
 
             // 鑾峰彇杈撻�佺嚎plc绾跨▼
@@ -1618,7 +1618,7 @@
                 }
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - 鎵ц瀹屾垚锛氬叾浠�  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
+//        News.infoNoLog(""+mark+" - 0"+" - 鎵ц瀹屾垚锛氬叾浠�  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅");
     }
 
     /**
@@ -2051,7 +2051,7 @@
                 }
             }
         }
-        News.infoNoLog(""+mark+" - 0"+" - outOfDevp鎵ц瀹屾垚");
+//        News.infoNoLog(""+mark+" - 0"+" - outOfDevp鎵ц瀹屾垚");
     }
 
 
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index f60a85a..e55135e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -93,9 +93,9 @@
                     mainService.rgvCompleteWrkMastSta();
                     //鎵ц灏忚溅璐х墿鎼繍浠诲姟
                     mainService.rgvRunWrkMastFullSta();
-                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
+//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
+//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
+//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
                     mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
 
 
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a7ba3b2..376d10a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -335,28 +335,11 @@
             Thread.sleep(500);
             write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.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);
-                }
+                break;
             }
             else {
                 writeCount++;
-                log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
         }while (writeCount<5);
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 23af70c..eae7162 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -234,24 +234,25 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 101
+      staNo: 106
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
+      backSta: 105
       led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 101
+      staNo: 106
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
+      backSta: 105
       led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 101
+      staNo: 106
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[1].id}
+      backSta: 105
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 106
+      staNo: 100
       led: ${wcs-slave.led[0].id}
 
   # 鏉$爜鎵弿浠�1

--
Gitblit v1.9.1