From d45379784ca569e72dce244ffa62ef8452062201 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 10:49:36 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java               |    3 +++
 zy-acs-flow/src/page/agv/AgvShow.jsx                                                  |   13 ++++++++++++-
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java |   12 ++++++++----
 zy-acs-flow/src/page/agv/show/AgvShowAside.jsx                                        |    2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/zy-acs-flow/src/page/agv/AgvShow.jsx b/zy-acs-flow/src/page/agv/AgvShow.jsx
index 0e0d751..8cf7851 100644
--- a/zy-acs-flow/src/page/agv/AgvShow.jsx
+++ b/zy-acs-flow/src/page/agv/AgvShow.jsx
@@ -58,7 +58,18 @@
                             }}>
                                 <CustomerTopToolBar />
                                 <Box mt={1}>
-                                    <Avatar sx={{ bgcolor: theme.palette.primary.main }}>{record.uuid}</Avatar>
+                                    <Stack direction='row'>
+                                        <Typography
+                                            variant="h6"
+                                            sx={{
+                                                mt: .5,
+                                                mr: 2
+                                            }}
+                                        >
+                                            {record.agvModelData.type}
+                                        </Typography>
+                                        <Avatar sx={{ bgcolor: theme.palette.primary.main }}>{record.uuid}</Avatar>
+                                    </Stack>
                                 </Box>
                             </Box>
 
diff --git a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
index 31fc068..adcc9d6 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
@@ -39,7 +39,7 @@
                     <Card>
                         <CardContent>
                             <Stack direction="row" spacing={1}>
-                                <EditButton label="Edit Company" />
+                                <EditButton />
                             </Stack>
                             <Stack direction="row" mt={1}>
                                 <DeleteButton mutationMode="optimistic" />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 9043935..3b1f858 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -14,10 +14,8 @@
 import com.zy.acs.manager.manager.controller.result.AgvResult;
 import com.zy.acs.manager.manager.entity.Agv;
 import com.zy.acs.manager.manager.entity.AgvDetail;
-import com.zy.acs.manager.manager.service.AgvDetailService;
-import com.zy.acs.manager.manager.service.AgvService;
-import com.zy.acs.manager.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.TaskService;
+import com.zy.acs.manager.manager.entity.AgvModel;
+import com.zy.acs.manager.manager.service.*;
 import com.zy.acs.manager.system.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,6 +33,8 @@
     private AgvService agvService;
     @Autowired
     private AgvDetailService agvDetailService;
+    @Autowired
+    private AgvModelService agvModelService;
     @Autowired
     private CodeService codeService;
     @Autowired
@@ -86,6 +86,10 @@
             if (null != agvDetail) {
                 agv.setAgvDetail(agvDetail);
             }
+            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+            if (null != agvModel) {
+                agv.setAgvModelData(agvModel);
+            }
         }
         return R.ok().add(agv);
     }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
index 6edb8ef..942bbb9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
@@ -79,6 +79,9 @@
     @TableField(exist = false)
     private AgvDetail agvDetail;
 
+    @TableField(exist = false)
+    private AgvModel agvModelData;
+
     public String getAgvSts$(){
         AgvStsService service = SpringUtils.getBean(AgvStsService.class);
         AgvSts agvSts = service.getById(this.agvSts);

--
Gitblit v1.9.1