From 45638cc0028dd89a90767be7e1d2648baf813b87 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 14:01:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    2 +-
 src/main/webapp/views/console.html                          |    1 +
 src/main/java/com/zy/asrs/domain/enums/PackStatusType.java  |   29 ++++++++++++-----------------
 src/main/webapp/static/css/render.css                       |   12 ++++++------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 8799a24..45e755f 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -20,6 +20,7 @@
 import com.zy.asrs.mapper.BasCrnErrorMapper;
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.common.CodeRes;
 import com.zy.core.CrnThread;
@@ -121,7 +122,6 @@
         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());
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
index 73fee30..3b7b9ed 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -7,22 +7,17 @@
 public enum PackStatusType {
 
     // 绌哄簱浣�
-    MACHINE_AUTO("绌哄簱浣�"),
+    LOC_EMPTY("绌哄簱浣�"),
     // 鍦ㄥ簱寰呮祴
-    MACHINE_STOCK_MOVE("鍦ㄥ簱寰呮祴"),
+    LOC_WAIT_TESTINT("鍦ㄥ簱寰呮祴"),
     // 鍦ㄥ簱娴嬭瘯涓�
-    MACHINE_SITE_MOVE("鍦ㄥ簱娴嬭瘯涓�"),
+    LOC_TESTING("鍦ㄥ簱娴嬭瘯涓�"),
     // 鍦ㄥ簱闈欑疆涓�
-    MACHINE_PAKOUT("鍦ㄥ簱闈欑疆涓�"),
+    LOC_STAY("鍦ㄥ簱闈欑疆涓�"),
     // 闈欑疆瀹屾垚
-    MACHINE_PAKIN("闈欑疆瀹屾垚"),
+    LOC_STAY_OVER("闈欑疆瀹屾垚"),
     // 寮傚父
-    MACHINE_ERROR("寮傚父鎶ヨ"),
-
-    // p to p
-    MACHINE_P_MOVE("PToP"),
-    // 闈炶嚜鍔�/鎵嬪姩
-    MACHINE_UN_AUTO("闈炶嚜鍔�"),
+    LOC_ERROR("寮傚父鎶ヨ"),
     ;
 
     private String desc;
@@ -36,19 +31,19 @@
 
     public static PackStatusType process(String locSts, Integer packStatus, Integer fireStatus){
         if(fireStatus == 1){
-            return MACHINE_ERROR;
+            return LOC_ERROR;
         } else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
             if (packStatus == 1){
-                return MACHINE_STOCK_MOVE;
+                return LOC_WAIT_TESTINT;
             } else if (packStatus == 2){
-                return MACHINE_SITE_MOVE;
+                return LOC_TESTING;
             } else if (packStatus == 3){
-                return MACHINE_PAKOUT;
+                return LOC_STAY;
             } else if (packStatus == 4){
-                return MACHINE_PAKIN;
+                return LOC_STAY_OVER;
             }
         } else if (locSts.equals("O") || locSts.equals("S")){
-            return MACHINE_AUTO;
+            return LOC_EMPTY;
         }
         return null;
     }
diff --git a/src/main/webapp/static/css/render.css b/src/main/webapp/static/css/render.css
index deab3e7..5ec4890 100644
--- a/src/main/webapp/static/css/render.css
+++ b/src/main/webapp/static/css/render.css
@@ -362,27 +362,27 @@
 
 
 /* 闈欑疆瀹屾垚 */
-.loc-empty {
+.LOC_STAY_OVER {
     background-color: rgb(163,214,242);
 }
 /* 鍦ㄥ簱闈欑疆涓�*/
-.loc-wait {
+.LOC_STAY {
     background-color: rgb(151,180,0);
 }
 /* 鍦ㄥ簱寰呮祴 */
-.loc-in-wait {
+.LOC_WAIT_TESTINT {
     background-color: rgb(58,77,249);
 }
 /* 鍦ㄥ簱娴嬭瘯涓� */
-.loc-testing {
+.LOC_TESTING {
     background-color: rgb(240,140,10);
 }
 /* 寮傚父 */
-.loc-error {
+.LOC_ERROR {
     background-color: rgb(252,48,48);
 }
 /* 绌哄簱浣� */
-.loc-empty {
+.LOC_EMPTY {
     background-color: rgb(132,255,115);
 }
 
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index fcf16bb..64f0a3d 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -861,6 +861,7 @@
                     for (var i = 0; i < locs.length; i++) {
                         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