From f884d266dce2295e75462e931f7fb60eb2c23c80 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期日, 30 六月 2024 10:25:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzwcs' into sxjzwcs
---
src/main/java/com/zy/core/thread/LedThread.java | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 75a0f53..259ef47 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -113,25 +113,31 @@
// 鍒涘缓涓�涓暟鎹〉
TextBxPage page = new TextBxPage();
for (LedCommand command : list) {
- page.newLine(command.getTitle() +"锛�"+command.getWorkNo()+")");
- if (!command.isEmptyMk()) {
- for (MatDto matDto : command.getMatDtos()) {
- //鍘绘帀灏忔暟鐐�
- String strQty = matDto.getCount().toString();
- int idx = strQty.lastIndexOf(".");
- if(idx >= 0){
- strQty = strQty.substring(0,idx);
- }
- page.newLine(matDto.getMatnr());
- page.newLine(matDto.getMaknx());
- page.newLine("[鏁伴噺锛�" + strQty + "/" + matDto.getTotal().intValue()+"]");
+ if (command.getIoType() < 100) {
+ page.newLine(command.getTitle());
+ page.newLine("浠诲姟鍙凤細" + command.getWorkNo());
+ page.newLine("搴撲綅鍙凤細" + command.getLocNo());
+ page.newLine("鏉＄爜锛�" + command.getBarcode());
+ } else {
+ page.newLine(command.getTitle() + "(" + command.getWorkNo() + ")");
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ //鍘绘帀灏忔暟鐐�
+ String strQty = matDto.getCount().toString();
+ int idx = strQty.lastIndexOf(".");
+ if (idx >= 0) {
+ strQty = strQty.substring(0, idx);
+ }
+ 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() +"銆�");
+ }
}
+ page.newLine("\n");
}
- page.newLine("\n");
}
-
// 璁剧疆瀛椾綋
page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
// 璁剧疆鏂囨湰棰滆壊
@@ -179,7 +185,7 @@
// page.newLine("鑷姩鍖栫珛浣撲粨搴�");
// page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
// }
- page.newLine("鍔涙簮鏅鸿兘浠撳偍");
+ page.newLine("鎹蜂紬鏅鸿兘浠撳偍");
// 璁剧疆瀛椾綋
page.setFont(new Font("瀹嬩綋",Font.PLAIN,13));
@@ -232,9 +238,41 @@
}
- private void error(String msg) {
- errorMsg.delete(0, errorMsg.length());
- errorMsg.append(msg);
+ private void error(String msg) throws Bx5GException {
+ if (slave.getId() <= 2) {
+ if (!connect()) {
+ return;
+ }
+ pf = new ProgramBxFile( 0, screen.getProfile());
+ pf.setFrameShow(false);
+ // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
+ area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
+ // 鍒涘缓涓�涓暟鎹〉
+ TextBxPage page = new TextBxPage();
+
+ page.newLine(msg);
+
+ // 璁剧疆瀛椾綋
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
+ // 璁剧疆鏂囨湰棰滆壊
+ page.setForeground(Color.red);
+ // 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
+ page.setDisplayStyle(styles[6]);
+ area.clearPages();
+ area.addPage(page);
+ pf.addArea(area);
+ if (pf.validate() != null) {
+ News.info("Led"+" - 2"+" - pf out of range");
+ } else {
+ // 鏇存柊鑺傜洰
+ screen.writeProgram(pf);
+// resetStatus = false;
+ }
+ close();
+ } else {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
+ }
}
public void errorReset() {
--
Gitblit v1.9.1