From 54f1d5ed531f609cb3fdbba47cd3a88c0a50d4e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 22:23:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 25 ++++++++
src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java | 12 ++++
src/main/java/com/zy/asrs/controller/BasJarController.java | 21 +++++--
src/main/java/com/zy/common/model/enums/JarStatusType.java | 43 ++++++++++++++
src/main/webapp/views/deviceOperate/jarOperate.html | 71 ++++++++++++++++-------
5 files changed, 143 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index f55b15f..2d8aa66 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -1,21 +1,19 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJar;
-import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.vo.JarStateTableVo;
import com.zy.asrs.service.BasJarService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -125,9 +123,11 @@
return R.ok();
}
+
+
@PostMapping("/table/jar/state")
-// @ManagerAuth(memo = "JAR淇℃伅琛�")
- public R jarStateTable(){
+ @ManagerAuth(memo = "RGV淇℃伅琛�")
+ public R rgvStateTable(){
List<JarStateTableVo> list = new ArrayList<>();
List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
for (BasJar basJar : jars) {
@@ -135,8 +135,17 @@
JarStateTableVo vo = new JarStateTableVo();
vo.setJarNo(basJar.getJarNo()); // RGV鍙�
list.add(vo);
+
+ vo.setJarMode(basJar.getJarMode() == 1?"鑱旀満":"鑴辨満" ); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).desc); // 鐘舵��
+ vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
+ vo.setRegion(basJar.getRegion());
+ vo.setJarCode(basJar.getJarCode());
+ vo.setJarErr(basJar.getJarErr());
+
}
- return R.ok().add(jars);
+ return R.ok().add(list);
}
+
}
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 597b99f..bb8f517 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -7,11 +7,16 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasJarMast;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.vo.JarMastTableVo;
import com.zy.asrs.service.BasJarMastService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +28,26 @@
@Autowired
private BasJarMastService basJarMastService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+
+ @RequestMapping(value = "/basJarMast/JatId/auth")
+ @ManagerAuth
+ public R getJatIdList(@RequestParam Integer id){
+ List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id));
+ if (Cools.isEmpty(jarMasts)){
+ return R.error("鏈煡璇㈠埌淇℃伅");
+ }
+ ArrayList<JarMastTableVo> jarMastTableVos = new ArrayList<>();
+ jarMasts.forEach(jarMast -> {
+ JarMastTableVo jarMastTableVo = new JarMastTableVo();
+ wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", jarMast.getWrkNo()));
+ wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", jarMast.getWrkNo()));
+ });
+ return R.ok(jarMastTableVos);
+ }
@RequestMapping(value = "/basJarMast/{id}/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java
new file mode 100644
index 0000000..c98ec98
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/vo/JarMastTableVo.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class JarMastTableVo {
+ private Integer jarId;
+ private String jarWrkNo;
+ private Integer status;
+ private String matnr;
+ private String maktx;
+}
diff --git a/src/main/java/com/zy/common/model/enums/JarStatusType.java b/src/main/java/com/zy/common/model/enums/JarStatusType.java
new file mode 100644
index 0000000..9d22417
--- /dev/null
+++ b/src/main/java/com/zy/common/model/enums/JarStatusType.java
@@ -0,0 +1,43 @@
+package com.zy.common.model.enums;
+
+public enum JarStatusType {
+
+ IDLE(0, "绌洪棽"),
+ MOVING(1, "浣滀笟涓�"),
+ SOS(2, "鎶ヨ"),
+ WAITING(10, "绛夊緟纭"),
+ OFF_LINE(-1, "鏈煡"),
+ OTHER(100, "鍏跺畠"),
+ ;
+
+ public Integer id;
+ public String desc;
+ JarStatusType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static JarStatusType get(Integer id) {
+ if (null == id) {
+ return null;
+ }
+ for (JarStatusType type : JarStatusType.values()) {
+ if (type.id.equals(id)) {
+ return type;
+ }
+ }
+ return OFF_LINE;
+ }
+
+ public static JarStatusType get(JarStatusType type) {
+ if (null == type) {
+ return null;
+ }
+ for (JarStatusType jarStatusType : JarStatusType.values()) {
+ if (jarStatusType == type) {
+ return jarStatusType;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index c56105b..bdae65b 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -39,6 +39,25 @@
<div slot="header" class="clearfix">
<span>纭寲搴撲綅</span>
</div>
+ <div v-if="currentIndex == null">
+ <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-column>
+ <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="jarMode" label="妯″紡">
+ </el-table-column>
+ <el-table-column property="region" label="鍖哄煙">
+ </el-table-column>
+ <el-table-column property="jarCode" label="浠ｅ彿">
+ </el-table-column>
+ <el-table-column property="jarErr" label="寮傚父浠ｇ爜">
+ </el-table-column>
+ </el-table>
+ </div>
</el-card>
</div>
@@ -53,25 +72,15 @@
</div>
<div v-else>
<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
- <el-descriptions-item label="RGV">{{ tableData[currentIndex].rgvNo }}
- </el-descriptions-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo1 }}
+ <el-descriptions-item label="纭寲缃�">{{ tableData[currentIndex].jarNo }}
</el-descriptions-item>
<el-descriptions-item label="妯″紡">
- <el-tag>{{ tableData[currentIndex].statusType }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="浠诲姟鐘舵��">
-
- <el-tag>{{ tableData[currentIndex].status}}</el-tag>
-
+ <el-tag>{{ tableData[currentIndex].jarMode }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="璁惧鐘舵��">
- <el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
+ <el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
- </el-descriptions-item>
- <el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
+ <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
</el-descriptions-item>
<!-- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
<!-- </el-descriptions-item>-->
@@ -134,7 +143,8 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ item: []
},
created() {
this.init()
@@ -182,17 +192,32 @@
setInterval(() => {
this.getTableData()
- this.demoStatus()
+ // this.demoStatus()
}, 1000)
},
handleRowClick(row, col, event) {
- const index = this.tableData.indexOf(row)
- this.currentRow = row;
- this.currentIndex = index
- this.currentTitle = row.jarNo + "鍙风～鍖栫綈"
- this.formParam.rgvNo = row.rgvNo
- this.enableIn = row.inEnable == "Y" ? true : false
- this.enableOut = row.outEnable == "Y" ? true : false
+ var that = this
+ const index = that.tableData.indexOf(row)
+ that.currentRow = row;
+ that.currentIndex = index
+ that.currentTitle = row.jarNo + "鍙风～鍖栫綈"
+ that.formParam.rgvNo = row.rgvNo
+ that.enableIn = row.inEnable == "Y" ? true : false
+ that.enableOut = row.outEnable == "Y" ? true : false
+
+ $.ajax({
+ url: baseUrl + "/basJarMast/JatId/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ id: row.jarNo
+ },
+ success: function (res) {
+ that.item = res.data
+ console.log(that.item)
+ }
+ });
},
getTableData() {
let that = this;
--
Gitblit v1.9.1