From 29af9f4ce47416f94d58ebffa7405dbeb8701244 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 16:45:20 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 23 +++++++++++
zy-asrs-flow/src/pages/map/drawer/lift/view.jsx | 12 ++++--
zy-asrs-flow/src/pages/map/utils.js | 2
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/LiftVo.java | 39 +++++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 7 +++
5 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/lift/view.jsx b/zy-asrs-flow/src/pages/map/drawer/lift/view.jsx
index d139563..a263ab6 100644
--- a/zy-asrs-flow/src/pages/map/drawer/lift/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/lift/view.jsx
@@ -33,14 +33,18 @@
const { data } = props;
const [loading, setLoading] = React.useState(false);
+ const [info, setInfo] = React.useState(null);
useEffect(() => {
setLoading(true);
-
- setTimeout(() => {
-
+ const fetchLiftInfo = async (liftNo) => {
+ const res = await Http.doGet('/api/map/lift/info', { liftNo: liftNo });
+ if (res?.data) {
+ setInfo(res.data);
+ }
setLoading(false);
- }, 300)
+ }
+ fetchLiftInfo(data.no);
}, [data]);
return (
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index d5d701a..380fd19 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -321,7 +321,7 @@
return
}
const { width, height } = sprite;
- const scale = sprite.scale.x;
+ const scale = sprite?.scale.x;
const sideLen = (Math.max(width, height) + 10) * scale;
const scaledWidth = sideLen * (1 / scale);
const scaledHeight = sideLen * (1 / scale);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index 3ecff80..6b9dd62 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -51,6 +51,13 @@
return R.ok().add(mapService.getShuttleInfo(shuttleNo));
}
+ // 鎻愬崌鏈� --------------------------------------------------------
+ @GetMapping("/lift/info")
+ public R liftInfo(@RequestParam String liftNo) {
+ return R.ok().add(mapService.getLiftInfo(liftNo));
+ }
+
+
// 杈撻�佺嚎 - 搴撲綅 --------------------------------------------------------
// @GetMapping("/conveyor/plc/list")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/LiftVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/LiftVo.java
new file mode 100644
index 0000000..bfc9aa8
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/LiftVo.java
@@ -0,0 +1,39 @@
+package com.zy.asrs.wcs.core.map.controller.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 3/29/2024
+ */
+@Data
+public class LiftVo {
+
+ private String liftNo = "-";
+
+ private String taskNo = "-";
+
+ private String status = "-";
+
+ private String originLocNo = "-";
+
+ private String destLocNo = "-";
+
+ private String currentCode = "-";
+
+ private String batteryPower = "-";
+
+ private String batteryVoltage = "-";
+
+ private String batteryTemp = "-";
+
+ private Boolean hasLift = false;
+
+ private Boolean hasPallet = false;
+
+ private Boolean hasCharge = false;
+
+ private String errorCode = "-";
+
+ private Boolean pakMk = false;
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
index da29ce0..309c69e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java
@@ -7,9 +7,11 @@
import com.zy.asrs.wcs.common.domain.enums.DictType;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
+import com.zy.asrs.wcs.core.map.controller.result.LiftVo;
import com.zy.asrs.wcs.core.map.controller.result.LocVo;
import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo;
import com.zy.asrs.wcs.core.utils.Utils;
+import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
@@ -114,6 +116,27 @@
return vo;
}
+ public LiftVo getLiftInfo(String liftNo) {
+ LiftVo vo = new LiftVo();
+ vo.setLiftNo(liftNo);
+ LiftProtocol protocol = new LiftProtocol();
+ // todo checkout protocol
+// vo.setTaskNo(String.valueOf(protocol.getTaskNo()));
+// vo.setStatus(protocol.getProtocolStatusType().desc);
+// vo.setOriginLocNo(protocol.getSourceLocNo());
+// vo.setDestLocNo(protocol.getLocNo());
+// vo.setCurrentCode(protocol.getCurrentCode());
+// vo.setBatteryPower(protocol.getBatteryPower());
+// vo.setErrorCode(protocol.getErrorCode());
+// vo.setBatteryTemp(protocol.getBatteryTemp());
+// vo.setHasLift(protocol.getHasLift());
+// vo.setHasPallet(protocol.getHasPallet());
+// vo.setHasCharge(protocol.getHasCharge());
+// vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
+// vo.setPakMk(protocol.getPakMk());
+ return vo;
+ }
+
private String getMapKey(Integer floor) {
if (null != floor) {
return "map-" + floor;
--
Gitblit v1.9.1