From 8dc3bcb40363cc6f9281092b4f6ea0ebcb9335b0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 07 二月 2024 11:27:36 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index e37e85a..9cbaf56 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -9,7 +9,14 @@
 import com.zy.core.model.command.LedCommand;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import onbon.bx05.Bx5GEnv;
+import onbon.bx05.Bx5GScreenClient;
+import onbon.bx05.area.TextCaptionBxArea;
+import onbon.bx05.area.page.TextBxPage;
+import onbon.bx05.file.ProgramBxFile;
+import onbon.bx05.utils.DisplayStyleFactory;
 
+import java.awt.*;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -23,6 +30,8 @@
 
     private Slave slave;
     private Set<Integer> workNos = new HashSet<>();
+    private boolean ledMk = false;
+    private boolean resetStatus = false;    // 澶嶄綅鐘舵��
 
     // 鏄剧ず鍣�
     private StringBuffer stringBuffer = new StringBuffer();
@@ -78,7 +87,10 @@
             sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
             if (!command.isEmptyMk()) {
                 for (MatDto matDto : command.getMatDtos()) {
-                    sb.append(matDto.getMatnr()).append("-").append(matDto.getBatch()).append("\n");
+                    sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
+                    sb.append("鍚嶇О锛�").append(matDto.getMaknx()).append("\n");
+                    sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+                    sb.append("瑙勬牸锛�").append(matDto.getSpecs()).append("\n");
                 }
             }
             sb.append("\n");
@@ -92,8 +104,8 @@
 
     private void reset() {
         commandList = null;
-
         stringBuffer.delete(0, stringBuffer.length());
+        errorMsg.delete(0, errorMsg.length());
     }
 
 

--
Gitblit v1.9.1