From be8a12f3c9c5c0b9db9f8144ab644fcb20c1af5e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 16:58:32 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4756a9a..44f90d9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -340,8 +340,10 @@
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
-                    if (!barcode.equals("000000")){
+                    if (!Cools.isEmpty(barcode) && !barcode.equals("000000")){
                         staProtocol.setBarcodeNow(barcode);
+                    } else if (Cools.isEmpty(barcode)){
+                        staProtocol.setBarcodeNow("-");
                     }
                 }
 
@@ -614,6 +616,17 @@
         }
     }
 
+
+    /**
+     * 璁剧疆鍏ュ簱鏍囪
+     */
+    @Override
+    public void setPakMkRun(Integer siteId, boolean pakMk) {
+        StaProtocol staProtocol = station.get(siteId);
+        if (null != staProtocol) {
+            staProtocol.setPakMkRun(pakMk);
+        }
+    }
     /**
      * 璁剧疆鍏ュ簱鏍囪
      */

--
Gitblit v1.9.1