From 152b73f374348909a0dc4748c4937978314c5820 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 16:52:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/BasJarMastController.java    |    3 +++
 src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java           |    1 +
 src/main/java/com/zy/asrs/controller/BasJarController.java        |    1 +
 src/main/java/com/zy/asrs/controller/BasJarMastLogController.java |    2 ++
 src/main/webapp/views/deviceOperate/jarOperate.html               |   18 +++++++++---------
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 65e1136..33b26f3 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -154,6 +154,7 @@
         List<JarStateTableVo> list = new ArrayList<>();
         List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
         for (BasJar basJar : jars) {
+            if (basJar.getJarCode()>2) continue;
             // 琛ㄦ牸琛�
             JarStateTableVo vo = new JarStateTableVo();
             vo.setJarNo(basJar.getJarNo());   //  RGV鍙�
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 6576d7e..5a15058 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -41,6 +41,7 @@
             return R.error("鏈煡璇㈠埌淇℃伅");
         }
         ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+        int idSign = 0;
         for (BasJarMast jarMast : jarMasts) {
             JarMastTableVo jarMastTableVo = new JarMastTableVo();
             WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
@@ -52,6 +53,8 @@
             if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                 return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
             }
+
+            jarMastTableVo.setId(++idSign);
             jarMastTableVo.setJarId(jarMast.getJarId());
             jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
             jarMastTableVo.setStatus(jarMast.getStatus());
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
index 466adaf..cba3e67 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastLogController.java
@@ -41,6 +41,7 @@
             return R.error("鏈煡璇㈠埌淇℃伅");
         }
         ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+        int idSign = 0;
         for (BasJarMastLog jarMast : jarMasts) {
             JarMastTableVo jarMastTableVo = new JarMastTableVo();
             WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()).eq("io_time",jarMast.getIoTime()));
@@ -69,6 +70,7 @@
             if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
                 return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
             }
+            jarMastTableVo.setId(++idSign);
             jarMastTableVo.setJarId(jarMast.getJarId());
             jarMastTableVo.setJarWrkNo(jarMast.getWrkNo().toString());
             jarMastTableVo.setStatus(jarMast.getStatus());
diff --git a/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java
index 4b182ee..5064cb4 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java
@@ -4,6 +4,7 @@
 
 @Data
 public class JarMastTableVo {
+    private Integer id;
     private Integer jarId;
     private String jarWrkNo;
     private Integer status;
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 9507a03..b70c037 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -79,7 +79,7 @@
 	<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
 		<div style="width: 100%;">
 			<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
-				max-height="420" style="width: 100%">
+				max-height="350" style="width: 100%">
 				<el-table-column property="jarNo" label="纭寲缃�">
 				</el-table-column>
 <!--				<el-table-column property="workNo" label="宸ヤ綔鍙�">-->
@@ -106,7 +106,7 @@
 								@cancel="cancelEvent"
 						>
 							<template #reference>
-								<el-button>淇敼</el-button>
+								<el-button>淇敼鏈�澶у偍閲�</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -146,8 +146,8 @@
 						<el-empty description="璇烽�夋嫨璁惧"></el-empty>
 					</div>
 					<div v-else>
-						<el-table border :data="item" highlight-current-row max-height="350" style="width: 100%">
-							<el-table-column property="jarId" label="纭寲缃�">
+						<el-table border :data="itemMast" highlight-current-row max-height="400" style="width: 100%">
+							<el-table-column property="id" label="搴忓彿">
 							</el-table-column>
 							<el-table-column property="jarWrkNo" label="宸ヤ綔鍙�">
 							</el-table-column>
@@ -294,7 +294,7 @@
 				],
 				demo: 'X',
 				rgvMode: 0,
-				item: []
+				itemMast: []
 			},
 			created() {
 				this.init()
@@ -322,8 +322,8 @@
 								id: that.tableData[that.currentIndex].jarNo
 							},
 							success: function (res) {
-								that.item = res.data
-								console.log(that.item)
+								that.itemMast = res.data
+								// console.log(that.itemMast)
 							}
 						});
 					}
@@ -438,8 +438,8 @@
 							id: row.jarNo
 						},
 						success: function (res) {
-							that.item = res.data
-							console.log(that.item)
+							that.itemMast = res.data
+							// console.log(that.itemMast)
 						}
 					});
 				},

--
Gitblit v1.9.1