From 67ab31a722e788e748befb37024c0879159a660a Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 24 六月 2024 16:17:58 +0800
Subject: [PATCH] # 捷众二期开发

---
 src/main/java/com/zy/core/thread/LedThread.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 10ad6b5..966b3ae 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,8 +1,5 @@
 package com.zy.core.thread;
 
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.zy.common.entity.Parameter;
 import com.zy.common.model.MatDto;
 import com.zy.common.utils.News;
 import com.zy.core.Slave;
@@ -117,8 +114,6 @@
         TextBxPage page = new TextBxPage();
         for (LedCommand command : list) {
             page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
-            page.newLine("搴撲綅锛�"+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
-            page.newLine("鐩爣绔欙細"+command.getStaNo());
             if (!command.isEmptyMk()) {
                 for (MatDto matDto : command.getMatDtos()) {
                     //鍘绘帀灏忔暟鐐�
@@ -127,7 +122,11 @@
                     if(idx >= 0){
                         strQty.substring(0,idx);
                     }
-                    page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+                    page.newLine(matDto.getBatch() + "[鏁伴噺" + strQty +"]");
+
+                    page.newLine(matDto.getMatnr());
+                    page.newLine(matDto.getMaknx());
+//                    page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
 //                    page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
                 }
             }

--
Gitblit v1.9.1