From d124f730857d21217c32307f56f3e20b6245a60c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 29 十一月 2022 15:13:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 src/main/resources/application.yml                          |    2 +-
 2 files changed, 2 insertions(+), 2 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 15a9e9e..c03dcef 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -974,7 +974,7 @@
                 wrkMastMapper.updateById(wrkMast);
 
                 // 鍒ゆ柇鏄惁涓虹┛姊簱
-                if (!locMastService.isShuttle(wrkMast.getLocNo())) {
+                if (!locMastService.isShuttle(wrkMast.getSourceLocNo())) {
 
                     // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
                     if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0dffd8c..bd1cdcf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -103,7 +103,7 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 119
-      row: 31
+      row: 32
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�

--
Gitblit v1.9.1