From 83820ff6205f8a4502576f5cec48c911eb5f48a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 13:35:45 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java | 8 ++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/ShuttleVo.java | 13 +++++++++++++
zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx | 19 +++++++++++++++----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 6 ++++++
4 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
index efbcb78..f3c5508 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
@@ -27,20 +27,26 @@
}
})
+
+
const ShuttleView = (props) => {
const intl = useIntl();
const { styles } = useStyles();
const { data } = props;
const [loading, setLoading] = React.useState(false);
+ const [info, setInfo] = React.useState(null);
useEffect(() => {
setLoading(true);
-
- setTimeout(() => {
-
+ const fetchShuttleInfo = async (shuttleNo) => {
+ const res = await Http.doGet('/api/map/shuttle/info', { shuttleNo: shuttleNo });
+ if (res?.data) {
+ setInfo(res.data);
+ }
setLoading(false);
- }, 300)
+ }
+ fetchShuttleInfo(data.no);
}, [data]);
return (
@@ -60,6 +66,11 @@
[
{
key: '1',
+ label: intl.formatMessage({ id: 'map.conveyor.no', defaultMessage: '绌挎杞︾紪鍙�' }),
+ children: info?.shuttleNo,
+ },
+ {
+ key: '1',
label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }),
children: <Badge status="processing" text="Running" />,
},
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 f313881..3ecff80 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
@@ -45,6 +45,12 @@
return R.ok().add(mapService.getShelfLocNoList(locNo));
}
+ // 绌挎杞� --------------------------------------------------------
+ @GetMapping("/shuttle/info")
+ public R shuttleInfo(@RequestParam String shuttleNo) {
+ return R.ok().add(mapService.getShuttleInfo(shuttleNo));
+ }
+
// 杈撻�佺嚎 - 搴撲綅 --------------------------------------------------------
// @GetMapping("/conveyor/plc/list")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/ShuttleVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/ShuttleVo.java
new file mode 100644
index 0000000..34b80f4
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/ShuttleVo.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.wcs.core.map.controller.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 3/29/2024
+ */
+@Data
+public class ShuttleVo {
+
+ private String shuttleNo;
+
+}
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 16ea668..b7f0db8 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
@@ -8,6 +8,7 @@
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.LocVo;
+import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
@@ -91,6 +92,13 @@
return locVos;
}
+ public ShuttleVo getShuttleInfo(String shuttleNo) {
+ ShuttleVo vo = new ShuttleVo();
+ vo.setShuttleNo(shuttleNo);
+
+ return vo;
+ }
+
private String getMapKey(Integer floor) {
if (null != floor) {
return "map-" + floor;
--
Gitblit v1.9.1