From 9a37464e943154d3fcc5db659e2d5abb6db98909 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 16:34:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 3 +--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++++
src/main/webapp/views/shuttle.html | 25 ++++---------------------
src/main/java/com/zy/core/News.java | 2 +-
src/main/webapp/views/admin/wrkMast/wrkMast.html | 2 ++
5 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 30721f7..2c0f5bc 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -373,8 +373,7 @@
@ManagerAuth(memo = "淇敼鏁版嵁")
public R shuttleUpdate(@RequestParam Integer shuttleNo,
@RequestParam Integer workNo,
- @RequestParam String pakMk,
- @RequestParam Integer token) {
+ @RequestParam String pakMk) {
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
if (shuttleThread == null) {
return R.error("plc宸叉帀绾�");
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 a9887dd..ba01141 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2169,6 +2169,7 @@
wrkMast.setWrkSts(WrkStsType.MOVE_SITE.sts);//灏忚溅绉诲姩鍒版彁鍗囨満涓� 301.鐢熸垚灏忚溅绉诲簱浠诲姟 ==> 302.灏忚溅绉诲姩鑷崇珯鐐�
wrkMast.setModiTime(now);
wrkMast.setLiftNo(liftSta.getLiftNo());//鎻愬墠閿佸畾鎻愬崌鏈�
+ wrkMast.setSystemMsg("");//娓呯┖娑堟伅
// shuttleProtocol.setToken(wrkMast.getWrkNo());//鐙崰璇ュ皬杞︿护鐗�
if (wrkMastService.updateById(wrkMast)) {
//涓嬪彂浠诲姟
@@ -2235,6 +2236,7 @@
assignCommand.setTaskMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());
wrkMast.setWrkSts(WrkStsType.MOVE_LIFT_RUN.sts);//鎻愬崌鏈烘惉杩愪腑 303.灏忚溅绉诲姩鑷崇珯鐐瑰畬鎴� ==> 306.鎻愬崌鏈烘惉杩愪腑
+ wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
//涓嬪彂浠诲姟
@@ -2316,6 +2318,7 @@
}
if (commands == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}灏忚溅锛岃矾寰勮绠楀け璐�", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());
return false;//璺緞璁＄畻澶辫触
}
@@ -2337,6 +2340,7 @@
wrkMast.setWrkSts(WrkStsType.MOVE_SHUTTLE.sts);//灏忚溅绉诲姩鍒扮洰鏍囧簱浣嶄腑 309.灏忚溅杩佸嚭鎻愬崌鏈哄畬鎴� ==> 310.灏忚溅绉诲姩涓�
wrkMast.setLiftNo(null);//閲婃斁鎻愬崌鏈�
+ wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/java/com/zy/core/News.java b/src/main/java/com/zy/core/News.java
index 0934f55..956d860 100644
--- a/src/main/java/com/zy/core/News.java
+++ b/src/main/java/com/zy/core/News.java
@@ -168,7 +168,7 @@
return false;
}
String systemMsg = replace(msg, args);
- if (systemMsg.equals(wrkMast.getSystemMsg())) {
+ if (!systemMsg.equals(wrkMast.getSystemMsg())) {
wrkMast.setSystemMsg(systemMsg);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
diff --git a/src/main/webapp/views/admin/wrkMast/wrkMast.html b/src/main/webapp/views/admin/wrkMast/wrkMast.html
index 169f899..bbaa936 100644
--- a/src/main/webapp/views/admin/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/admin/wrkMast/wrkMast.html
@@ -55,6 +55,8 @@
</el-table-column>
<el-table-column property="shuttleNo" label="绌挎杞�">
</el-table-column>
+ <el-table-column property="systemMsg" label="绯荤粺娑堟伅">
+ </el-table-column>
<el-table-column label="鎿嶄綔" width="100">
<template slot-scope="scope">
<el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index b23cc49..09f102e 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -63,10 +63,7 @@
<th>宸ヤ綔鍙�</th>
<th>婧愬簱浣�</th>
<th>鐩爣搴撲綅</th>
- <th>鏈�楂樼數鑺數鍘�</th>
- <th>鏈�浣庣數鑺數鍘�</th>
<th>鐢垫睜鐢靛帇</th>
- <th>鍏呮斁鐢靛惊鐜鏁�</th>
<th>鍓╀綑鐢甸噺</th>
<th>鎬荤數閲�</th>
<th>浣滀笟鏍囪</th>
@@ -170,12 +167,6 @@
<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
</div>
</div>
- <div class="form-item">
- <label class="form-label">浠ょ墝:</label>
- <div class="form-input">
- <input id="token" name="token" type="text" class="layui-input" autocomplete="off">
- </div>
- </div>
<div class="form-item form-button-container">
<button class="form-button" id="save">淇濆瓨</button>
<button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
@@ -266,7 +257,6 @@
shuttleNo: $('#shuttleNo').val(),
workNo: $('#workNo').val(),
pakMk: $('#pakMk').val(),
- token: $('#token').val(),
}, function (res) {
layer.msg("淇敼鎴愬姛", {icon: 1,});
layer.close(layerDetl);
@@ -386,17 +376,10 @@
setVal(tr.children("td").eq(1), table[i-1].taskNo);
setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
setVal(tr.children("td").eq(3), table[i-1].locNo);
- setVal(tr.children("td").eq(4), maxCellVoltage);
- setVal(tr.children("td").eq(5), minCellVoltage);
- setVal(tr.children("td").eq(6), voltage);
- setVal(tr.children("td").eq(7), chargeCycleTimes);
- setVal(tr.children("td").eq(8), surplusQuantity);
- setVal(tr.children("td").eq(9), countQuantity);
- setVal(tr.children("td").eq(10), table[i-1].pakMk$);
- if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
- $("#runSpeedText").text(table[i-1].runSpeed)
- $("#chargeLineText").text(table[i-1].chargeLine + "%")
- }
+ setVal(tr.children("td").eq(4), voltage);
+ setVal(tr.children("td").eq(5), surplusQuantity);
+ setVal(tr.children("td").eq(6), countQuantity);
+ setVal(tr.children("td").eq(7), table[i-1].pakMk$);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1