From ee61fb373b313111d525139d67f61801c7d1f669 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 29 九月 2022 17:10:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LedThread.java |   99 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 3305f41..b263a9e 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -40,8 +40,14 @@
     TextCaptionBxArea area;
     DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
     private Set<Integer> workNos = new HashSet<>();
-    private boolean ledMk = true;
+    private boolean ledMk = false;
     private boolean resetStatus = false;    // 澶嶄綅鐘舵��
+
+    // 鏄剧ず鍣�
+    private StringBuffer stringBuffer = new StringBuffer();
+    private List<LedCommand> commandList;
+
+    private StringBuffer errorMsg = new StringBuffer();
 
     public LedThread(Slave slave) {
         this.slave = slave;
@@ -72,6 +78,20 @@
                         case 2:
                             reset();
                             break;
+                        // 鍐欐暟鎹� 娑叉櫠
+                        case 3:
+                            write7((List<LedCommand>)task.getData());
+                            break;
+                        // 澶嶄綅 娑叉櫠
+                        case 4:
+                            reset7();
+                            break;
+                        case 5:
+                            error((String) task.getData());
+                            break;
+                        case 6:
+                            errorReset();
+                            break;
                         default:
                             break;
                     }
@@ -96,7 +116,7 @@
         TextBxPage page = new TextBxPage();
         for (LedCommand command : list) {
             page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
-            page.newLine("婧愬簱浣嶏細"+command.getSourceLocNo());
+            page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
             page.newLine("鐩爣绔欙細"+command.getStaNo());
             if (!command.isEmptyMk()) {
                 for (MatDto matDto : command.getMatDtos()) {
@@ -114,7 +134,7 @@
         }
 
         // 璁剧疆瀛椾綋
-        page.setFont(new Font("瀹嬩綋",Font.PLAIN,10));
+        page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
         // 璁剧疆鏂囨湰棰滆壊
         page.setForeground(Color.red);
         // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
@@ -133,9 +153,9 @@
     }
 
     private void reset() throws Bx5GException {
-//        if (!connect()) {
-//            return;
-//        }
+        if (!connect()) {
+            return;
+        }
 //        if (resetStatus) {
 //            return;
 //        }
@@ -146,20 +166,21 @@
         // 鍒涘缓涓�涓暟鎹〉
         TextBxPage page = new TextBxPage();
 
-        List<String> list = null;
-        try {
-            String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
-            list = JSON.parseArray(ledDefaultMsg, String.class);
-        } catch (Exception ignore) {
-        }
-        if (!Cools.isEmpty(list)) {
-            for (String str : list) {
-                page.newLine(str);
-            }
-        } else {
-            page.newLine("鑷姩鍖栫珛浣撲粨搴�");
-            page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
-        }
+//        List<String> list = null;
+//        try {
+//            String ledDefaultMsg = Parameter.get().getLedDefaultMsg();
+//            list = JSON.parseArray(ledDefaultMsg, String.class);
+//        } catch (Exception ignore) {
+//        }
+//        if (!Cools.isEmpty(list)) {
+//            for (String str : list) {
+//                page.newLine(str);
+//            }
+//        } else {
+//            page.newLine("鑷姩鍖栫珛浣撲粨搴�");
+//            page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
+//        }
+        page.newLine("鍔涙簮鏅鸿兘浠撳偍");
 
         // 璁剧疆瀛椾綋
         page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
@@ -180,6 +201,44 @@
         }
         close();
     }
+    private void write7(List<LedCommand> list) {
+        commandList = list;
+
+        StringBuilder sb = new StringBuilder();
+        for (LedCommand command : list) {
+            sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n");
+            sb.append("婧愬簱浣嶏細").append(command.getSourceLocNo()).append("\n");
+            sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
+            if (!command.isEmptyMk()) {
+                for (MatDto matDto : command.getMatDtos()) {
+                    sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
+                    sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+                }
+            }
+            sb.append("\n");
+        }
+        stringBuffer.delete(0, stringBuffer.length());
+        stringBuffer.append(sb.toString());
+
+        errorReset();
+    }
+
+
+    private void reset7() {
+        commandList = null;
+
+        stringBuffer.delete(0, stringBuffer.length());
+    }
+
+
+    private void error(String msg) {
+        errorMsg.delete(0, errorMsg.length());
+        errorMsg.append(msg);
+    }
+
+    public void errorReset() {
+        this.errorMsg.delete(0, errorMsg.length());
+    }
 
     @Override
     public boolean connect() {

--
Gitblit v1.9.1