From 16ad96d54cae5455436cda8673a4e8ee33149233 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 六月 2024 16:55:19 +0800
Subject: [PATCH] # led显示
---
src/main/java/com/zy/core/thread/LedThread.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9a2ba4f..75a0f53 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;
@@ -53,11 +50,11 @@
public LedThread(Slave slave) {
this.slave = slave;
try {
-// Bx5GEnv.initial(3000);
-// screen = new Bx5GScreenClient("my");
+ Bx5GEnv.initial(3000);
+ screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
- News.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
@@ -117,17 +114,18 @@
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()) {
//鍘绘帀灏忔暟鐐�
String strQty = matDto.getCount().toString();
int idx = strQty.lastIndexOf(".");
if(idx >= 0){
- strQty.substring(0,idx);
+ strQty = strQty.substring(0,idx);
}
- page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+ page.newLine(matDto.getMatnr());
+ page.newLine(matDto.getMaknx());
+ page.newLine("[鏁伴噺锛�" + strQty + "/" + matDto.getTotal().intValue()+"]");
+// page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
}
@@ -144,7 +142,7 @@
area.addPage(page);
pf.addArea(area);
if (pf.validate() != null) {
- News.info("pf out of range");
+ News.info("Led"+" - 2"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -194,7 +192,7 @@
pf.addArea(area);
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
- News.info("pf out of range");
+ News.info("Led"+" - 3"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -215,6 +213,7 @@
for (MatDto matDto : command.getMatDtos()) {
sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatnr()).append("\n");
sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append("瑙勬牸锛�").append(matDto.getSpecs()).append("\n");
}
}
sb.append("\n");
@@ -251,9 +250,9 @@
} catch (Exception ignore) {
}
if (connRes) {
- News.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info("Led"+" - 4"+" - led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("Led"+" - 5"+" - led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
return connRes;
}
@@ -310,7 +309,7 @@
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
System.out.println("pf out of range");
- News.info("pf out of range");
+ News.info("Led"+" - 6"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
--
Gitblit v1.9.1