From f2c0949f0c7006c6db7cc9fbcd8501f91711e661 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期六, 21 十一月 2020 16:15:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 2 +-
src/main/java/com/zy/core/thread/LedThread.java | 8 ++++----
src/main/java/com/zy/asrs/controller/MonitorController.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 5d411e6..27c8c85 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -80,10 +80,10 @@
forkPos = 1;
break;
case 1:
- forkPos = 0;
+ forkPos = 2;
break;
case 2:
- forkPos = 2;
+ forkPos = 0;
break;
default:
forkPos = 1;
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 6555d84..e6b8669 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -46,7 +46,7 @@
Thread.sleep(100);
} catch (SocketTimeoutException ignore) {
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 4640025..16bf99a 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -136,12 +136,12 @@
StringBuilder sb = new StringBuilder();
for (LedCommand command : list) {
- sb.append(command.getTitle() +"锛�"+command.getWorkNo()+")");
- sb.append("婧愬簱浣嶏細"+command.getSourceLocNo());
- sb.append("鐩爣绔欙細"+command.getStaNo());
+ sb.append(command.getTitle() +"锛�"+command.getWorkNo()+")").append("\n");
+ sb.append("婧愬簱浣嶏細"+command.getSourceLocNo()).append("\n");
+ sb.append("鐩爣绔欙細"+command.getStaNo()).append("\n");
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
- sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ sb.append(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�").append("\n");
}
}
sb.append("\n");
--
Gitblit v1.9.1