From 335c389c2b302fe7fb33421ad67f5b4e55c8dd05 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 13:21:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 19 +++++++++
src/main/webapp/views/console.html | 7 ++-
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 56 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/domain/vo/LocLatestDataVo.java | 26 +++++++++++++
4 files changed, 105 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index dd56b27..8799a24 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -2,17 +2,20 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
+import com.zy.asrs.domain.enums.PackStatusType;
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.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
@@ -112,6 +115,22 @@
return R.ok().add(vos);
}
+ @PostMapping("/latest/data/loc")
+ @ManagerAuth(memo = "搴撲綅瀹炴椂鏁版嵁")
+ public R locLatestData(){
+ List<LocLatestDataVo> vos = new ArrayList<>();
+ List<LocMast> locMasts = locMastMapper.selectList(new EntityWrapper<LocMast>());
+ for(LocMast locMast : locMasts){
+ if(!locMast.equals("0100201")) continue;
+ LocLatestDataVo vo = new LocLatestDataVo();
+ vo.setLocNo(locMast.getLocNo());
+ vo.setLocSts(locMast.getLocSts());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
+ vos.add(vo);
+ }
+ return R.ok().add(vos);
+ }
+
@PostMapping("/latest/data/crn")
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
public R crnLatestData(){
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
new file mode 100644
index 0000000..73fee30
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -0,0 +1,56 @@
+package com.zy.asrs.domain.enums;
+
+
+/**
+ * 搴撲綅鐘舵�佹灇涓�
+ */
+public enum PackStatusType {
+
+ // 绌哄簱浣�
+ MACHINE_AUTO("绌哄簱浣�"),
+ // 鍦ㄥ簱寰呮祴
+ MACHINE_STOCK_MOVE("鍦ㄥ簱寰呮祴"),
+ // 鍦ㄥ簱娴嬭瘯涓�
+ MACHINE_SITE_MOVE("鍦ㄥ簱娴嬭瘯涓�"),
+ // 鍦ㄥ簱闈欑疆涓�
+ MACHINE_PAKOUT("鍦ㄥ簱闈欑疆涓�"),
+ // 闈欑疆瀹屾垚
+ MACHINE_PAKIN("闈欑疆瀹屾垚"),
+ // 寮傚父
+ MACHINE_ERROR("寮傚父鎶ヨ"),
+
+ // p to p
+ MACHINE_P_MOVE("PToP"),
+ // 闈炶嚜鍔�/鎵嬪姩
+ MACHINE_UN_AUTO("闈炶嚜鍔�"),
+ ;
+
+ private String desc;
+ PackStatusType(String desc){
+ this.desc = desc;
+ }
+
+ public String getDesc() { return desc; }
+
+ public void setDesc(String desc) { this.desc = desc; }
+
+ public static PackStatusType process(String locSts, Integer packStatus, Integer fireStatus){
+ if(fireStatus == 1){
+ return MACHINE_ERROR;
+ } else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
+ if (packStatus == 1){
+ return MACHINE_STOCK_MOVE;
+ } else if (packStatus == 2){
+ return MACHINE_SITE_MOVE;
+ } else if (packStatus == 3){
+ return MACHINE_PAKOUT;
+ } else if (packStatus == 4){
+ return MACHINE_PAKIN;
+ }
+ } else if (locSts.equals("O") || locSts.equals("S")){
+ return MACHINE_AUTO;
+ }
+ return null;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/LocLatestDataVo.java
new file mode 100644
index 0000000..3c9d5b9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/vo/LocLatestDataVo.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.domain.vo;
+
+import com.zy.asrs.domain.enums.PackStatusType;
+import lombok.Data;
+
+/**
+ * 搴撲綅鏈�鏂版暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-01
+ */
+@Data
+public class LocLatestDataVo {
+
+ // 搴撲綅鍙�
+ private String locNo;
+
+ // 搴撲綅鐘舵��
+ private String locSts;
+
+ // PACK鐘舵��
+ private PackStatusType packStatus;
+
+ public String getLocStatus() {
+ return packStatus.toString().toLowerCase().replaceAll("_", "-");
+ }
+
+}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 85d0c78..7ab2a30 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -193,7 +193,7 @@
<span class="site machine-site-move-flag" style="color:#FFFFFF; top:600px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span>
<span class="site machine-take-flag" style="color:#FFFFFF; top:600px; left:534px">鍦ㄥ簱闈欑疆涓�</span>
<span class="site machine-put-flag" style="color:#FFFFFF; top:600px; left:626px">闈欑疆瀹屾垚</span>
- <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:696px">寮傚父鎶ヨ</span>
+ <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:704px">寮傚父鎶ヨ</span>
</div>
<div id="body">
@@ -855,8 +855,9 @@
if (res.code === 200) {
var locs = res.data;
for (var i = 0; i < locs.length; i++) {
- var siteEl = $("#loc-" + locs[i].siteId);
- siteEl.attr("class", "site " + locs[i].siteStatus);
+ var siteEl = $("#loc-" + locs[i].locNo);
+ siteEl.attr("class", "site " + locs[i].packStatus);
+ debugger;
// if (locs[i].workNo != null && locs[i].workNo > 0) {
// siteEl.html(locs[i].siteId + "[" + locs[i].workNo + "]");
// } else {
--
Gitblit v1.9.1