From 3c56f3ed3ad8978f4cad3a684c4811026f31d17e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 19:13:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   14 +++++++-------
 src/main/resources/application.yml                          |    8 ++++----
 2 files changed, 11 insertions(+), 11 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 8cb976b..90d7515 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -167,7 +167,7 @@
                         }
 //                        News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
                         staProtocol.setWorkNo(workNo);
-                        staProtocol.setStaNo(inSta.getStaNo());
+                        staProtocol.setStaNo(inSta.getBackSta());
                         devpThread.setPakMk(staProtocol.getSiteId(), false);
                         MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                         TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
@@ -206,7 +206,7 @@
                                         return;
                                     } else {
                                         staProtocol.setWorkNo(taskWrk1.getWrkNo());
-                                        staProtocol.setStaNo(staDesc.getCrnStn());
+                                        staProtocol.setStaNo(staProtocol.getSiteId());
                                         MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                     }
                                 }
@@ -239,7 +239,7 @@
                                     log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
                                 }
                                 staProtocol.setWorkNo(9999);
-                                staProtocol.setStaNo(inSta.getStaNo());
+                                staProtocol.setStaNo(inSta.getBackSta());
                                 devpThread.setPakMk(staProtocol.getSiteId(), false);
                                 MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                 continue;
@@ -265,7 +265,7 @@
                                     log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
 
                                     staProtocol.setWorkNo(9999);
-                                    staProtocol.setStaNo(inSta.getStaNo());
+                                    staProtocol.setStaNo(inSta.getBackSta());
                                     devpThread.setPakMk(staProtocol.getSiteId(), false);
                                     MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                 }
@@ -276,7 +276,7 @@
                             log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
 
                             staProtocol.setWorkNo(9999);
-                            staProtocol.setStaNo(inSta.getStaNo());
+                            staProtocol.setStaNo(inSta.getBackSta());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
@@ -402,7 +402,7 @@
                                 log.error("鎵爜妫�娴嬬▼搴忓紓甯�" + inSta.getStaNo() + "寮傚父淇℃伅" + e1);
                             }
                             staProtocol.setWorkNo(9999);
-                            staProtocol.setStaNo(inSta.getStaNo());
+                            staProtocol.setStaNo(inSta.getBackSta());
                             devpThread.setPakMk(staProtocol.getSiteId(), false);
                             MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             continue;
@@ -429,7 +429,7 @@
                                 log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅" + e);
 
                                 staProtocol.setWorkNo(9999);
-                                staProtocol.setStaNo(inSta.getStaNo());
+                                staProtocol.setStaNo(inSta.getBackSta());
                                 devpThread.setPakMk(staProtocol.getSiteId(), false);
                                 MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a4ddf92..d75b905 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -67,15 +67,15 @@
   #url: 10.32.53.195:8080
   # WMS绯荤粺ip
   #  url: 10.210.157.109:8090
-  url: 27.172.2.107:9027
+  url: 27.172.2.132:9027
   # 鍏ュ簱浠诲姟鐢宠鎺ュ彛
   #inboundTaskApplyPath: api/InterFace/inboundTaskApply
-  inboundTaskApplyPath: sugood/inboundTaskApply
+  inboundTaskApplyPath: api/external/wcs/taskCancel
   #  inboundTaskApplyPath: open/asrs/inboundTaskApply
   # 浠诲姟鐘舵�佸弽棣堟帴鍙�
-  taskStatusFeedbackPath: external/wcs/taskStatusFeedback
+  taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback
   # 璐т綅鐘舵�佹洿鏂版帴鍙�
 #  locationUpdatePath: api/InterFace/get_InterFace_TestStorage
   # 绉诲簱鐢宠鎺ュ彛
 #  movePath: api/InterFace/get_InterFace_TestStorage
-  wmsHeartBeat: external/wcs/wmsHeartBeat
+  wmsHeartBeat: api/external/wcs/wmsHeartBeat

--
Gitblit v1.9.1