From 4f3150a0a2d6b3585c26df7afe1a6f5f57423b3c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 10:00:40 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionList.jsx | 8 --------
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 2 +-
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionList.jsx b/zy-acs-flow/src/page/mission/MissionList.jsx
index 6e74606..0273f92 100644
--- a/zy-acs-flow/src/page/mission/MissionList.jsx
+++ b/zy-acs-flow/src/page/mission/MissionList.jsx
@@ -78,14 +78,6 @@
return (
<>
<EmptyDataLoader>
- <Typography
- variant="body2"
- align="center"
- color="text.secondary"
- gutterBottom
- >
- sss
- </Typography>
<MissionShow open={!!matchShow} id={matchShow?.params.id} />
</EmptyDataLoader>
</>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index 7ac7160..7b50ca0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -26,7 +26,7 @@
@Override
public List<MissionVo> getList(Long agvId, String groupNo) {
List<MissionVo> result = new ArrayList<>();
- List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.WAITING, agvId, groupNo);
+ List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING, agvId, groupNo);
for (String runningGroupNo : runningGroupNos) {
MissionVo vo = generate(runningGroupNo);
if (null != vo) {
--
Gitblit v1.9.1