From 964b8b59ad2a37c92bd3c738bf98d65e3916d0e7 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 07 七月 2024 13:27:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 +++++--
 src/main/java/com/zy/core/thread/SiemensDevpThread.java     |    4 ++--
 src/main/resources/application.yml                          |   10 +++++-----
 3 files changed, 12 insertions(+), 9 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 ab2630e..1328eee 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -156,8 +156,10 @@
                     errMsg = "鎵爜澶辫触";
                     back = true;
                 }
+
                 // 閫�鍥�
                 if (back) {
+                    log.info("errmsg: " + errMsg);
 //                        News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
                     MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
 
@@ -1134,7 +1136,7 @@
                     crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡:  搴撲綅绉昏浆
                     crnCommand.setSourcePosX((short)(sourceSta.getRow1()+slave.getOffset()));     // 婧愬簱浣嶆帓
                     crnCommand.setSourcePosY((short)(sourceSta.getBay1()+slave.getOffset()));     // 婧愬簱浣嶅垪
-                    crnCommand.setSourcePosZ((short)(sourceSta.getBay1()+slave.getOffset()));     // 婧愬簱浣嶅眰
+                    crnCommand.setSourcePosZ((short)(sourceSta.getLev1()+slave.getOffset()));     // 婧愬簱浣嶅眰
                     crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 鐩爣搴撲綅鎺�
                     crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 鐩爣搴撲綅鍒�
                     crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 鐩爣搴撲綅灞�
@@ -1579,7 +1581,8 @@
 
                             // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
                             staProtocol.setWorkNo(dto.getWorkNo());
-                            staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
+                            staProtocol.setStaNo(dto.getStaNo().shortValue());
+                            //staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2286c33..288fb99 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -67,7 +67,7 @@
     }};
 
     public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
-        add(101); add(201);
+        add(1); add(2);
     }};
     public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
         add(101); add(201);
@@ -246,7 +246,7 @@
             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);
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
                 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 017f96a..068aeb7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,7 +52,7 @@
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
-    offset: 1
+    offset: 0
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
@@ -90,7 +90,7 @@
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 1
+    offset: 0
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
@@ -128,7 +128,7 @@
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 1
+    offset: 0
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
@@ -149,14 +149,14 @@
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 104
       row: 6
-      bay: 41
+      bay: 42
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 108
       row: 5
-      bay: 41
+      bay: 42
       lev: 1
   # 杈撻�佺嚎1
   devp[0]:

--
Gitblit v1.9.1