From c1c9f02d25ea862802f727a1f329be6c6f02f637 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期日, 03 十一月 2024 15:32:18 +0800
Subject: [PATCH] *

---
 src/main/webapp/views/index.html                            |   20 ++++++++++----------
 src/main/java/com/zy/asrs/entity/param/WcsRgvListParam.java |    2 +-
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/WcsRgvListParam.java b/src/main/java/com/zy/asrs/entity/param/WcsRgvListParam.java
index 4edf992..52eb1b8 100644
--- a/src/main/java/com/zy/asrs/entity/param/WcsRgvListParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WcsRgvListParam.java
@@ -12,7 +12,7 @@
 public class WcsRgvListParam {
     private String taskNo;       //  鏄�	瀛楃涓� 浣滀笟灏忚溅缂栧彿
     private String rgvNo;       //  鏄�	瀛楃涓� 浣滀笟灏忚溅缂栧彿
-    private String status;     //  鏄�	瀛楃涓� 浠诲姟鐘舵��  1锛氬垵濮�  2锛氫綔涓氫腑  3锛氬畬鎴�
+    private Integer status;     //  鏄�	瀛楃涓� 浠诲姟鐘舵��  1锛氬垵濮�  2锛氫綔涓氫腑  3锛氬畬鎴�
     private String currSta = "";    //  鏄�	瀛楃涓� 缁撴潫鏃堕棿锛堟牸寮忥細yyyy--MM-dd HH:mm:ss)
     private List<String> error = new ArrayList<>();       //  鏄�	瀛楃涓� 寮傚父淇℃伅锛堝鏃犲紓甯稿垯涓虹┖鏁扮粍锛�
 
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 25570fb..9223e1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -96,7 +96,7 @@
                 WcsRgvListParam wcsRgvListParam = new WcsRgvListParam();
                 wcsRgvListParam.setRgvNo(rgv.getId().toString());
                 wcsRgvListParam.setTaskNo(Cools.isEmpty(rgvProtocol.getTaskNo1()) ? null:rgvProtocol.getTaskNo1().toString());
-                wcsRgvListParam.setStatus(rgvProtocol.statusType.desc);
+                wcsRgvListParam.setStatus(rgvProtocol.statusType.id);
                 wcsRgvListParam.setCurrSta(SortTheExecutionOfTheCarUtil.LatelyAndLessThanWcs(basDevpPositions,rgvProtocol.getRgvPos(),perimeter).toString());
                 List<String> arrayList = new ArrayList<>();
                 if (rgvProtocol.getAlarm()!=0){
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 6aa0b11..9bdc716 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -213,11 +213,11 @@
                             prop="rgvSts"
                             label="RGV鐘舵��">
                     </el-table-column>
-                    <el-table-column
-                            prop=""
-                            label="鎿嶄綔">
-                        <el-button type="primary" icon="el-icon-edit" circle></el-button>
-                    </el-table-column>
+<!--                    <el-table-column-->
+<!--                            prop=""-->
+<!--                            label="鎿嶄綔">-->
+<!--                        <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
+<!--                    </el-table-column>-->
                 </el-table>
             </div>
         </div>
@@ -257,11 +257,11 @@
                             prop="status$"
                             label="鐘舵��">
                     </el-table-column>
-                    <el-table-column
-                            prop=""
-                            label="鎿嶄綔">
-                        <el-button type="primary" icon="el-icon-edit" circle></el-button>
-                    </el-table-column>
+<!--                    <el-table-column-->
+<!--                            prop=""-->
+<!--                            label="鎿嶄綔">-->
+<!--                        <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
+<!--                    </el-table-column>-->
                 </el-table>
             </div>
         </div>

--
Gitblit v1.9.1