From 95acbc65a8f55ac54a631a149f50192b085d5ad9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 12:49:12 +0800
Subject: [PATCH] 控制台四向穿梭车增加库位号和层高，提升机参数输出设置
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 28 +++++++--
src/main/java/com/zy/core/enums/LiftNotReadyType.java | 56 ++++++++++++++++++
src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java | 10 +++
src/main/java/com/zy/asrs/controller/ShuttleController.java | 2
src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java | 5 +
src/main/java/com/zy/asrs/service/BasDevpService.java | 2
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 2
src/main/webapp/views/shuttle.html | 4 +
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 5 +
src/main/resources/mapper/BasDevpMapper.xml | 7 ++
src/main/webapp/views/lift.html | 6 +-
11 files changed, 118 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 369efd4..acff75b 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -163,6 +163,8 @@
vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() == null ? "" : shuttleProtocol.getCurrentLiftServoLoad() + "%");//褰撳墠鐨勫崌闄嶄己鏈嶈礋杞界巼
vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N"); // 浣滀笟鏍囪
+ vo.setLocNo(shuttleProtocol.getLocNo());//鍥涘悜绌挎杞﹀綋鍓嶅簱浣嶅彿
+ vo.setLev(Utils.getLev(shuttleProtocol.getLocNo()));//鍥涘悜绌挎杞﹀綋鍓嶅眰楂�
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
index 3a43152..4212c8a 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java
@@ -1,5 +1,6 @@
package com.zy.asrs.domain.vo;
+import com.zy.core.enums.LiftNotReadyType;
import com.zy.core.enums.LiftProtocolStatusType;
import lombok.Data;
@@ -168,6 +169,10 @@
return this.ready ? "Y" : "N";
}
+ public String getNotReady$() {
+ return LiftNotReadyType.get((int) this.notReady).desc;
+ }
+
public String getRunning$() {
return this.running ? "Y" : "N";
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
index c09001b..99f28e4 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java
@@ -66,4 +66,14 @@
*/
private String currentMoveServoLoad;
+ /**
+ * 鍥涘悜绌挎杞﹀簱浣嶅彿
+ */
+ private String locNo;
+
+ /**
+ * 鍥涘悜绌挎杞﹀綋鍓嶆墍鍦ㄦゼ灞�
+ */
+ private Integer lev;
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index eb1b674..44bca88 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -19,4 +19,6 @@
BasDevp selectByWrkNo(Integer wrkNo);
BasDevp queryByLocNo(String locNo);
+
+ BasDevp queryByQrCode(String qrCodeValue);
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 31c63cf..2057c6a 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -48,4 +48,6 @@
BasDevp queryByLocNo(String locNo);
+ BasDevp queryByQrCode(String qrCodeValue);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 8732852..f382395 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -74,4 +74,9 @@
public BasDevp queryByLocNo(String locNo) {
return this.baseMapper.queryByLocNo(locNo);
}
+
+ @Override
+ public BasDevp queryByQrCode(String qrCodeValue) {
+ return this.baseMapper.queryByQrCode(qrCodeValue);
+ }
}
diff --git a/src/main/java/com/zy/core/enums/LiftNotReadyType.java b/src/main/java/com/zy/core/enums/LiftNotReadyType.java
new file mode 100644
index 0000000..8ccdc91
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/LiftNotReadyType.java
@@ -0,0 +1,56 @@
+package com.zy.core.enums;
+
+public enum LiftNotReadyType {
+ STATUS_0(0, "N"),
+ NOT_LEV(1, "涓嶅湪鎸囧畾灞�"),
+ NOT_SYNC(2, "鍥涜酱涓嶅悓姝�"),
+ STATUS_3(3, "骞冲彴鍓嶉檺鍏夌數琚尅鍒帮紙闈犺繎璐ф灦锛�"),
+ STATUS_4(4, "骞冲彴鍚庨檺鍏夌數琚尅鍒帮紙杩滅璐ф灦锛�"),
+ STATUS_5(5, "骞冲彴涓婇檺浣嶆姤璀�"),
+ STATUS_6(6, "骞冲彴涓嬮檺浣嶆姤璀�"),
+ STATUS_7(7, "鐢垫煖鎬ュ仠鎶ヨ"),
+ STATUS_8(8, "杈撻�佺嚎鍓嶉檺浣嶈鎸″埌锛堥潬杩戣揣鏋讹級"),
+ STATUS_9(9, "杈撻�佺嚎鍚庨檺浣嶈鎸″埌锛堣繙绂昏揣鏋讹級"),
+ STATUS_10(10, "瑙︽懜灞忕揣鎬ュ仠姝㈣鎸変笅"),
+ STATUS_11(11, "鍥涜酱鍔ㄥ姏绾挎柇绾�"),
+ STATUS_12(12, "鍗曟満妯″紡"),
+ STATUS_13(13, "鍥涜酱鎶ヨ"),
+ STATUS_14(14, "浣嶇疆鍋忓樊杩囧ぇ"),
+ STATUS_15(15, "鎵煩鍋忓樊杩囧ぇ"),
+ STATUS_16(16, "杈撻�佺嚎杩囪浇"),
+ STATUS_17(17, "杩涙彁鍗囨満鍗℃墭鐩�"),
+ STATUS_18(18, "鍑烘彁鍗囨満鍗℃墭鐩�"),
+ ;
+
+ public Integer id;
+ public String desc;
+
+ LiftNotReadyType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static LiftNotReadyType get(Integer id) {
+ if (null == id) {
+ return null;
+ }
+ for (LiftNotReadyType type : LiftNotReadyType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static LiftNotReadyType get(LiftNotReadyType type) {
+ if (null == type) {
+ return null;
+ }
+ for (LiftNotReadyType type2 : LiftNotReadyType.values()) {
+ if (type2 == type) {
+ return type2;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 43f7994..cebf771 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -1,8 +1,10 @@
package com.zy.core.model.protocol;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasShuttleErr;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasShuttleErrService;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
@@ -40,12 +42,6 @@
* 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
*/
private Integer protocolStatus;
-
-// /**
-// * 灏忚溅褰撳墠鏄惁鏈夎揣
-// * true:鏈夎揣锛宖alse锛氭棤璐�
-// */
-// private Boolean loading = false;
/**
* 褰撳墠灏忚溅鐘舵�佹灇涓�
@@ -323,4 +319,24 @@
return basShuttleErr.getErrName();
}
+ public void setCurrentCode(Short currentCode) {
+ this.currentCode = currentCode;
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ if (locMastService != null) {
+ LocMast locMast = locMastService.queryByQrCode(currentCode.toString());
+ if (locMast == null) {
+ //鏌ヤ笉鍒板簱浣嶅彿锛屾煡璇㈡槸鍚︿负绔欑偣
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (basDevpService != null) {
+ BasDevp basDevp = basDevpService.queryByLocNo(currentCode.toString());
+ if (basDevp != null) {
+ this.locNo = basDevp.getLocNo();
+ }
+ }
+ }else{
+ this.locNo = locMast.getLocNo();
+ }
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 6b2e3c8..bae80e5 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -81,4 +81,11 @@
where 1=1
and loc_no = #{locNo}
</select>
+
+ <select id="queryByQrCode" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_bas_devp
+ where 1=1
+ and qr_code_value = #{qrCodeValue}
+ </select>
</mapper>
diff --git a/src/main/webapp/views/lift.html b/src/main/webapp/views/lift.html
index 43e400e..32a14ba 100644
--- a/src/main/webapp/views/lift.html
+++ b/src/main/webapp/views/lift.html
@@ -20,9 +20,9 @@
<div style="padding: 10px;height: 100%">
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
- <div class="command-log" id="commandLogId">
+ <div class="command-log" id="commandLogId" style="width: 10%;">
</div>
- <div class="lift-state">
+ <div class="lift-state" style="width: 90%;">
<table id="lift-state-table">
<thead>
<tr>
@@ -311,7 +311,7 @@
setVal(tr.children("td").eq(1), table[i-1].taskNo);
setVal(tr.children("td").eq(2), table[i-1].protocolStatus);
setVal(tr.children("td").eq(3), table[i-1].liftLock$);
- setVal(tr.children("td").eq(4), table[i-1].positionArrivalFeedback$);
+ setVal(tr.children("td").eq(4), table[i-1].positionArrivalFeedback);
setVal(tr.children("td").eq(5), table[i-1].ready$);
setVal(tr.children("td").eq(6), table[i-1].running$);
setVal(tr.children("td").eq(7), table[i-1].mode$);
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index a9a6be3..616bbb7 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -72,6 +72,8 @@
<th>鍗囬檷浼烘湇璐熻浇</th>
<th>琛岃蛋浼烘湇璐熻浇</th>
<th>浣滀笟鏍囪</th>
+ <th>搴撲綅鍙�</th>
+ <th>褰撳墠妤煎眰</th>
</tr>
</thead>
<tbody>
@@ -649,6 +651,8 @@
setVal(tr.children("td").eq(7), table[i-1].currentLiftServoLoad);
setVal(tr.children("td").eq(8), table[i-1].currentMoveServoLoad);
setVal(tr.children("td").eq(9), table[i-1].pakMk);
+ setVal(tr.children("td").eq(10), table[i-1].locNo);
+ setVal(tr.children("td").eq(11), table[i-1].lev);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1