From cef5e42e6ea7ad0ecccabca319bd137b27b5c25b Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 16 三月 2022 17:52:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 13 ++++++++++++-
src/main/java/com/zy/core/thread/LedThread.java | 18 ++++++++++++++++--
src/main/webapp/views/crn.html | 8 ++++----
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 5 +++++
4 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 034bbdf..168562a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -9,8 +9,10 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
+import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
@@ -54,6 +56,8 @@
private BasDevpService basDevpService;
@Autowired
private LocMastMapper locMastMapper;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -130,7 +134,7 @@
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
- if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) {
+ if (crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
@@ -246,6 +250,13 @@
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
+ }
+
if (crnProtocol.getTaskNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 197b219..3305f41 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -100,14 +100,21 @@
page.newLine("鐩爣绔欙細"+command.getStaNo());
if (!command.isEmptyMk()) {
for (MatDto matDto : command.getMatDtos()) {
- page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
+ //鍘绘帀灏忔暟鐐�
+ String strQty = matDto.getCount().toString();
+ int idx = strQty.lastIndexOf(".");
+ if(idx >= 0){
+ strQty.substring(0,idx);
+ }
+ page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
}
page.newLine("\n");
}
// 璁剧疆瀛椾綋
- page.setFont(new Font("瀹嬩綋",Font.PLAIN,12));
+ page.setFont(new Font("瀹嬩綋",Font.PLAIN,10));
// 璁剧疆鏂囨湰棰滆壊
page.setForeground(Color.red);
// 璁剧疆鏄剧ず鐗规妧涓哄揩閫熸墦鍑�
@@ -198,6 +205,13 @@
public static void main(String[] args) throws Exception {
+ String strQty = "1234";
+ int index = strQty.lastIndexOf(".");
+ if(index>=0) {
+ strQty=strQty.substring(0, index);
+ }
+ System.out.println("2==>>"+strQty);
+
Bx5GEnv.initial(3000);
Bx5GScreenClient screen = new Bx5GScreenClient("my");
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index ce0f98d..1680a88 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -243,6 +243,11 @@
array[9] = command.getCommand();
OperateResult result = melsecMcNet.Write("D0", array);
+ try {
+ Thread.sleep(200);
+ }catch (Exception e){
+ }
+
if (command.getAckFinish() == 0) {
short commandFinish = 1;
result = melsecMcNet.Write("D9", commandFinish);
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index cf44fb9..3999603 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -122,10 +122,10 @@
<th>璧拌閫熷害锛坢/min)</th>
<th>鍗囬檷閫熷害锛坢/min)</th>
<th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(m)</th>
- <th>鍗囬檷璺濈(m)</th>
- <th>璧拌鏃堕暱(s)</th>
- <th>鍗囬檷鏃堕暱(s)</th>
+ <th>璧拌璺濈(Km)</th>
+ <th>鍗囬檷璺濈(Km)</th>
+ <th>璧拌鏃堕暱(H)</th>
+ <th>鍗囬檷鏃堕暱(H)</th>
</tr>
</thead>
<tbody>
--
Gitblit v1.9.1