From 209626ba2b4797f7d1c003a2876026ffcd39928a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 24 十月 2025 16:56:35 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 21 ++++++----
src/main/java/com/zy/asrs/controller/RgvController.java | 19 +++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 -
src/main/webapp/views/index.html | 38 +++++++++++++++++++
4 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 62e85d8..81e6b8c 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -574,4 +574,23 @@
return R.ok();
}
+ @PostMapping("/disable/task/delete1")
+// @ManagerAuth(memo = "鍒濆鍖栦换鍔�")
+ public R taskDisabledelete1(@RequestParam Long wrkNo){
+ Date now = new Date();
+ log.info("/disable/task/delete1===銆嬪垵濮嬪寲浠诲姟锛侊紒锛亀rkNo:{},data:{}",wrkNo,new Date());
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Cools.isEmpty(wrkMast)){
+ return R.error().add("鏈壘鍒版浠诲姟锛屽紓甯革紒锛侊紒");
+ }
+ wrkMast.setWrkSts(1L);
+ wrkMast.setRgvNo(0);
+ wrkMast.setAppeTime(now);
+ wrkMast.setLogErrTime(now);
+ if (wrkMastService.updateById(wrkMast)){
+ return R.ok();
+ }
+ return R.error("鍒濆鍖栧け璐ワ紒锛侊紒");
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index dd643fe..dc51931 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -636,10 +636,9 @@
Date now = new Date();
wrkMast.setWrkSts(1L);
- wrkMast.setRgvNo(null);
+ wrkMast.setRgvNo(0);
wrkMast.setAppeTime(now);
wrkMast.setLogErrTime(now);
- wrkMast.setRgvNo(null);
wrkMast.setLogErrMemo("RGV鐢宠鍙栨秷浠诲姟锛孯GV鍙�={"+rgvProtocol.getRgvNo()+"}锛屽彇娑堟椂闂达細"+now);
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index bc3d44d..ce27b3f 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -5,11 +5,14 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasCircularShuttle;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.entity.BasRgvOpt;
+import com.zy.asrs.service.BasCircularShuttleService;
import com.zy.asrs.service.BasRgvErrLogService;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
@@ -63,14 +66,6 @@
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
connectRgv = this.connect();
- while(!connectRgv){
- try {
- connectRgv = this.connect();
- Thread.sleep(100);
- } catch (Exception e){
-
- }
- }
// 鍚姩绾跨▼鑷姩閲嶈繛
new Thread(this::rgvConnect).start();
@@ -159,6 +154,16 @@
Thread.sleep(1000);
if(!connectRgv){
try {
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCircularShuttleService basCircularShuttleService = SpringUtils.getBean(BasCircularShuttleService.class);
+ BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no", slave.getId()));
+ if (basCircularShuttle.getStatus() != 0){
+ continue;
+ }
+ } catch (Exception ignore) {
+
+ }
+ try {
connectRgv = this.connect();
Thread.sleep(100);
} catch (Exception e){
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index f98cbf7..5fd0a72 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -152,6 +152,18 @@
</el-button>
</template>
</el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ type="template">
+ <template slot-scope="scope">
+ <el-button
+ type="danger"
+ size="small"
+ @click="taskDelete1(scope.row)">
+ 鍒濆鍖�
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
@@ -505,6 +517,32 @@
});
});
},
+ taskDelete1(row) {
+ let that = this;
+ that.$confirm('纭瑕佸垵濮嬪寲璇ヤ换鍔″悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/task/delete1",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ wrkNo: row.wrkNo
+ },
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message.success('鍒濆鍖栨垚鍔�');
+ // 鍒犻櫎褰撳墠琛�
+ // that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
+ } else {
+ that.$message.error('鍒濆鍖栧け璐�');
+ }
+ }
+ });
+ });
+ },
toggleStatus(index, row) {
let that = this;
const currentStatus = row.status;
--
Gitblit v1.9.1