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/NormalProcess.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 2154359..92f770b 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -124,6 +124,7 @@
                     // 婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
                     if (stationProtocol.isAutoing()
                             && stationProtocol.isLoading()
+                            && stationProtocol.isInEnable()
                             && stationProtocol.getTaskNo() > 0) {
                         if (Cools.isEmpty(stationProtocol.getBarcode())) {
                             continue;
@@ -131,7 +132,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;
                         }
@@ -147,7 +149,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