From d305580602cce0bef8a0f548578b5f26f97da826 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 24 九月 2024 10:30:07 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/bus/BusList.jsx | 10 ++++++---- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java | 2 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx index f0284c5..1669223 100644 --- a/zy-acs-flow/src/page/bus/BusList.jsx +++ b/zy-acs-flow/src/page/bus/BusList.jsx @@ -33,7 +33,7 @@ FunctionField, Pagination, } from 'react-admin'; -import { Box, Typography, Card, Chip } from '@mui/material'; +import { Box, Typography, Button, Chip } from '@mui/material'; import { styled } from '@mui/material/styles'; import BusCreate from "./BusCreate"; import BusPanel from "./BusPanel"; @@ -46,6 +46,7 @@ import * as Common from '@/utils/common'; import BusListAside from "./BusListAside"; import { getBusStsColor } from '@/utils/color-util'; +import CancelIcon from '@mui/icons-material/Cancel'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -67,7 +68,7 @@ whiteSpace: 'nowrap', }, '& .opt': { - width: 80 + width: 120 }, })); @@ -164,8 +165,9 @@ {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */} <TextField source="memo" label="common.field.memo" sortable={false} emptyText="-" /> <FunctionField label="common.field.opt" cellClassName="opt" render={record => ( - (record.busSts === 15) && ( - <DeleteButton label="" sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> + (record.busSts === 15 || true) && ( + // <DeleteButton label="" sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> + <Button size="small" color="error" startIcon={<CancelIcon />} sx={{ padding: '1px', fontSize: '.75rem' }}>cancel</Button> ) )} /> </StyledDatagrid> diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java index e4fe27a..e99c90e 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java @@ -35,7 +35,7 @@ @Autowired private TaskService taskService; - public synchronized Agv execute1(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) { + public synchronized Agv execute(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) { String oriLocNo = task.getOriLoc$(); int oriLocRow = LocUtils.getRow(oriLocNo); String destLocNo = task.getDestLoc$(); @@ -79,7 +79,7 @@ return hit; } - public synchronized Agv execute(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) { + public synchronized Agv execute1(Task task, Map<String, List<Long>> taskAllot, List<Long> taskIds) { String oriLocNo = task.getOriLoc$(); int oriLocRow = LocUtils.getRow(oriLocNo); String destLocNo = task.getDestLoc$(); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java index 2296504..9ef7231 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java @@ -37,7 +37,7 @@ @Override public List<String> getDataFieldSort() { - return Arrays.stream(BusStsType.values()) + return Arrays.stream(TaskStsType.values()) .sorted((e1, e2) -> Integer.compare(e1.dataSort, e2.dataSort)) .map(Enum::name) .collect(Collectors.toList()); -- Gitblit v1.9.1