From bf64e8016283b18c04d5392dd9c002b921021af2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 三月 2026 09:47:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/plugin/XiaosongProcess.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/plugin/XiaosongProcess.java b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
index 84acf02..2fdf863 100644
--- a/src/main/java/com/zy/core/plugin/XiaosongProcess.java
+++ b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
@@ -77,6 +77,8 @@
         stationOperateProcessUtils.dualCrnStationOutExecute();
         //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
         stationOperateProcessUtils.stationOutExecuteFinish();
+        // 妫�娴嬩换鍔¤浆瀹屾垚
+        stationOperateProcessUtils.checkTaskToComplete();
         //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
         stationOperateProcessUtils.checkStationRunBlock();
 
@@ -157,7 +159,8 @@
 
                         // 妫�娴嬩换鍔℃槸鍚︾敓鎴�
                         List<WrkMast> wrkMasts = wrkMastService
-                                .selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+                                .selectList(new EntityWrapper<WrkMast>()
+                                        .eq("barcode", stationProtocol.getBarcode()));
                         if (!wrkMasts.isEmpty()) {
                             continue;
                         }
@@ -173,7 +176,7 @@
                         // 1. 棣栧厛鏌ヨ鏄惁鏈夊凡瀹屾垚鐨勫紓姝ュ搷搴�
                         String response = wmsOperateUtils.queryAsyncInTaskResponse(barcode, stationIdVal);
 
-                        if (response != null) {
+                        if (!Cools.isEmpty(response)) {
                             // 2. 鏈夊搷搴旂粨鏋滐紝澶勭悊鍝嶅簲
                             if (response.equals("FAILED") || response.startsWith("ERROR:")) {
                                 // 璇锋眰澶辫触锛岄噸鏂板彂璧峰紓姝ヨ姹�

--
Gitblit v1.9.1