From ece092e4c5d4e968b424421c6f78b065bbb0bd73 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 八月 2024 15:13:10 +0800
Subject: [PATCH] #修复目标站显示错误问题

---
 src/main/java/com/zy/common/web/WcsController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3b536ed..f6e5cce 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -529,7 +529,7 @@
         }
 
         //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
-        Integer staNo = liftNo * 100 + locMast1.getLev1();
+        Integer staNo = liftNo * 100 + locMast.getLev1();
 
         // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
         wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
@@ -612,7 +612,7 @@
         }
 
         //鍏ュ簱浠诲姟
-        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
             //缁戝畾绔欑偣
             agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
             //鐢熸垚宸ヤ綔妗�

--
Gitblit v1.9.1