From 7b0d620dcacaeb5b1ee6c945fe7159c9b75432b0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 14:18:49 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionCard.jsx | 3 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 11 +++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 4 ++--
zy-acs-flow/src/page/mission/MissionShow.jsx | 1 -
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 8 ++++++--
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionCard.jsx b/zy-acs-flow/src/page/mission/MissionCard.jsx
index 1af463c..dc0d9ab 100644
--- a/zy-acs-flow/src/page/mission/MissionCard.jsx
+++ b/zy-acs-flow/src/page/mission/MissionCard.jsx
@@ -26,6 +26,9 @@
});
};
+ console.log(mission);
+
+
return (
<Box
sx={{ marginBottom: 1, cursor: 'pointer' }}
diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx
index 203abbd..7c4d545 100644
--- a/zy-acs-flow/src/page/mission/MissionShow.jsx
+++ b/zy-acs-flow/src/page/mission/MissionShow.jsx
@@ -4,7 +4,6 @@
return (
<>
- show
</>
)
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
index 773130e..439cb8f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
@@ -2,6 +2,9 @@
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Created by vincent on 9/27/2024
*/
@@ -14,4 +17,12 @@
private String posType;
+ private String agv;
+
+ private List<String> taskNos = new ArrayList<>();
+
+ private Integer backpack;
+
+ private String destCode;
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
index 4a47d07..2264979 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
@@ -213,7 +213,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.startNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
@@ -222,7 +222,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.endNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
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 d6ef3a6..14c59a0 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
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 9/27/2024
@@ -37,7 +38,7 @@
}
public MissionVo generate(String groupNo) {
- List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo));
+ List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupNo).orderByAsc(Segment::getSerial));
if (Cools.isEmpty(list)) {
return null;
}
@@ -47,7 +48,10 @@
vo.setGroupNo(groupNo);
vo.setId(segment.getId());
vo.setPosType(segment.getPosType());
-
+ vo.setAgv(segment.getAgvId$());
+ vo.setTaskNos(list.stream().map(Segment::getTaskId$).collect(Collectors.toList()));
+ vo.setBackpack(segment.getBackpack());
+ vo.setDestCode(segment.getEndNode$());
return vo;
}
--
Gitblit v1.9.1