From 5b17b77e1eec4980eeb06d6b3bdbde4d1ce190ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 10:54:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 4 +-
src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java | 6 ++
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 26 ++++++------
src/main/webapp/views/console.html | 2 +
src/main/webapp/static/css/console.css | 35 +++++++++++++++++
src/main/java/com/zy/asrs/controller/CrnController.java | 4 +-
6 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index a0473e0..835f7be 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -126,10 +126,10 @@
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
- vo.setCrnStatusType(CrnStatusType.process(wrkMast.getIoType()));
+ vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
}
} else {
- vo.setCrnStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO: CrnStatusType.UN_AUTO);
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
}
vos.add(vo);
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 28e4358..b5fa460 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -99,7 +99,7 @@
vo.setStatusType(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
}
} else {
- vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatusType(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
vo.setWarn(""); // 鎶ヨ todo
@@ -141,7 +141,7 @@
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
} else {
- vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.AUTO.getDesc(): CrnStatusType.UN_AUTO.getDesc()); // 妯″紡鐘舵��
+ vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
list.add(vo);
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index d3d54fd..138f91b 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -6,21 +6,21 @@
public enum CrnStatusType {
// 鍏ュ簱
- PUT("鍏ュ簱"),
+ MACHINE_PAKIN("鍏ュ簱"),
// 鍑哄簱
- TAKE("鍑哄簱"),
+ MACHINE_PAKOUT("鍑哄簱"),
// 搴撳埌搴�
- STOCK_MOVE("搴撳埌搴�"),
+ MACHINE_STOCK_MOVE("搴撳埌搴�"),
// 绔欏埌绔�
- SITE_MOVE("绔欏埌绔�"),
+ MACHINE_SITE_MOVE("绔欏埌绔�"),
// p to p
- P_MOVE("PToP"),
+ MACHINE_P_MOVE("PToP"),
// 寮傚父
- ERROR("寮傚父"),
+ MACHINE_ERROR("寮傚父"),
// 鑷姩
- AUTO("鑷姩"),
+ MACHINE_AUTO("鑷姩"),
// 闈炶嚜鍔�/鎵嬪姩
- UN_AUTO("闈炶嚜鍔�"),
+ MACHINE_UN_AUTO("闈炶嚜鍔�"),
;
private String desc;
@@ -38,15 +38,15 @@
public static CrnStatusType process(Integer ioType){
if (ioType>100) {
- return TAKE;
+ return MACHINE_PAKIN;
} else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
- return PUT;
+ return MACHINE_PAKOUT;
} else if (ioType == 3) {
- return SITE_MOVE;
+ return MACHINE_SITE_MOVE;
} else if (ioType == 11) {
- return STOCK_MOVE;
+ return MACHINE_STOCK_MOVE;
} else {
- return ERROR;
+ return MACHINE_ERROR;
}
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
index b75dd52..34030fb 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -16,6 +16,10 @@
// 鍋忕Щ閲�
private Double offset;
- private CrnStatusType crnStatusType;
+ private CrnStatusType crnStatus;
+
+ public String getCrnStatus(){
+ return crnStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
}
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 5ece826..9282861 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -231,6 +231,41 @@
}
/* 鍏ュ簱 */
+.machine-pakin {
+ background-image: url("../image/Crane_store.png");
+}
+/* 鍑哄簱 */
+.machine-pakout {
+ background-image: url("../image/Crane_retrieve.png");
+}
+/* 搴撳埌搴� */
+.machine-stock-move {
+ background-image: url("../image/Crane_loctoloc.png");
+}
+/* 绔欏埌绔� */
+.machine-site-move {
+ background-image: url("../image/Crane_stntostn.png");
+}
+/* p to p */
+.machine-p-move {
+ background-image: url("../image/Crane_hptoohp.png");
+}
+/* 寮傚父 */
+.machine-error {
+ background-image: url("../image/Crane_error.png");
+}
+/* 鑷姩 */
+.machine-auto {
+ background-image: url("../image/Crane_auto.png");
+}
+/* 闈炶嚜鍔�/鏀跺埌 */
+.machine-un-auto {
+ background-image: url("../image/Crane_manual.png");
+}
+
+
+
+/* 鍏ュ簱 */
.machine-put {
background-color: #90d0f3;
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 5514d63..78362d5 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -522,6 +522,8 @@
if (res.code === 200){
var crns = res.data;
for (var i = 0; i < crns.length; i++){
+ var crnEl = $("#crn-"+crns[i].crnId);
+ crnEl.attr("class", "machine " + crns[i].crnStatus);
crnAnimate(crns[i].crnId, crns[i].offset);
}
} else if (res.code === 403){
--
Gitblit v1.9.1