From ca80b815af361410553222af680dde3b8e091c71 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 22 十二月 2020 16:14:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +--
src/main/java/com/zy/asrs/controller/CrnController.java | 17 +++++++++--------
src/main/java/com/zy/core/enums/CrnModeType.java | 12 +++++++-----
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 75e0789..86d7e68 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -110,14 +110,15 @@
continue;
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
- }
- } else {
- vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
- }
+// if (crnProtocol.getTaskNo()>0) {
+// WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+// if (wrkMast != null) {
+// vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
+// }
+// } else {
+//
+// }
+ vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a417f4a..1079319 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -736,8 +736,7 @@
if (crnProtocol == null) {
continue;
}
- // 鍙湪杩炵嚎妯″紡涓嬭褰�
- if (crnProtocol.getModeType() == CrnModeType.AUTO) {
+ if (crnProtocol.getModeType() != CrnModeType.STOP) {
// 鏈変换鍔�
if (crnProtocol.getTaskNo() != 0) {
BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
index 4925f47..a520095 100644
--- a/src/main/java/com/zy/core/enums/CrnModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -2,15 +2,17 @@
public enum CrnModeType {
- STOP(0), // 鍋滄満鐘舵��
- HAND(1), // 鎵嬪姩妯″紡涓�
- HALF_AUTO(2), // 鍗婅嚜鍔ㄦā寮忎腑
- AUTO(3), // 鐢佃剳妯″紡涓�/鑷姩妯″紡
+ STOP(0, "鍋滄満鐘舵��"), // 鍋滄満鐘舵��
+ HAND(1, "鎵嬪姩妯″紡"), // 鎵嬪姩妯″紡涓�
+ HALF_AUTO(2, "鍗婅嚜鍔ㄦā寮�"), // 鍗婅嚜鍔ㄦā寮忎腑
+ AUTO(3, "鐢佃剳妯″紡"), // 鐢佃剳妯″紡涓�/鑷姩妯″紡
;
public Integer id;
- CrnModeType(Integer id) {
+ public String desc;
+ CrnModeType(Integer id, String desc) {
this.id = id;
+ this.desc = desc;
}
public static CrnModeType get(Short id) {
--
Gitblit v1.9.1