From 5b99140180e440593acb9dc074915e7f405024fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 25 九月 2024 16:24:11 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/action/ActionList.jsx | 70 ++++++++++++++++++-----------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 4 ++
2 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/zy-acs-flow/src/page/action/ActionList.jsx b/zy-acs-flow/src/page/action/ActionList.jsx
index 7da699e..da7ee0b 100644
--- a/zy-acs-flow/src/page/action/ActionList.jsx
+++ b/zy-acs-flow/src/page/action/ActionList.jsx
@@ -30,6 +30,8 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
+ Pagination,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -62,21 +64,23 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
- <TextInput source="uuid" label="table.field.action.uuid" />,
- <TextInput source="groupId" label="table.field.action.groupId" />,
- <ReferenceInput source="busId" label="table.field.action.busId" reference="bus">
- <AutocompleteInput label="table.field.action.busId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
+ // <SearchInput source="condition" alwaysOn />,
+ <ReferenceInput source="agvId" label="table.field.action.agvId" reference="agv" alwaysOn>
+ <AutocompleteInput label="table.field.action.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
</ReferenceInput>,
- <ReferenceInput source="taskId" label="table.field.action.taskId" reference="task">
+ <TextInput source="groupId" label="table.field.action.groupId" alwaysOn />,
+ <ReferenceInput source="busId" label="table.field.action.busId" reference="bus">
+ <AutocompleteInput label="table.field.action.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
+ </ReferenceInput>,
+ <ReferenceInput source="taskId" label="table.field.action.taskId" reference="task" alwaysOn>
<AutocompleteInput label="table.field.action.taskId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
</ReferenceInput>,
- <TextInput source="seqNum" label="table.field.action.seqNum" />,
- <NumberInput source="priority" label="table.field.action.priority" />,
- <TextInput source="name" label="table.field.action.name" />,
+ <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+ <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+ <TextInput source="uuid" label="table.field.action.uuid" />,
+ // <TextInput source="seqNum" label="table.field.action.seqNum" />,
+ // <NumberInput source="priority" label="table.field.action.priority" />,
+ // <TextInput source="name" label="table.field.action.name" />,
<NumberInput source="val" label="table.field.action.val" />,
<TextInput source="code" label="table.field.action.code" />,
<TextInput source="params" label="table.field.action.params" />,
@@ -86,13 +90,10 @@
<ReferenceInput source="actionSts" label="table.field.action.actionSts" reference="actionSts">
<AutocompleteInput label="table.field.action.actionSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <ReferenceInput source="agvId" label="table.field.action.agvId" reference="agv">
- <AutocompleteInput label="table.field.action.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
- </ReferenceInput>,
- <DateInput source="ioTime" label="table.field.action.ioTime" />,
- <DateInput source="startTime" label="table.field.action.startTime" />,
- <DateInput source="endTime" label="table.field.action.endTime" />,
- <DateInput source="errTime" label="table.field.action.errTime" />,
+ // <DateInput source="ioTime" label="table.field.action.ioTime" />,
+ // <DateInput source="startTime" label="table.field.action.startTime" />,
+ // <DateInput source="endTime" label="table.field.action.endTime" />,
+ // <DateInput source="errTime" label="table.field.action.errTime" />,
<TextInput source="errDesc" label="table.field.action.errDesc" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -130,12 +131,13 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='action' />
<MyExportButton />
</TopToolbar>
)}
- perPage={DEFAULT_PAGE_SIZE}
+ pagination={<Pagination rowsPerPageOptions={[10, 20, 50, 100]} />}
+ perPage={50}
>
<StyledDatagrid
preferenceKey='action'
@@ -143,13 +145,16 @@
rowClick={(id, resource, record) => false}
expand={() => <ActionPanel />}
expandSingle={true}
- omit={['id', 'uuid', 'errTime', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'busId', 'startTime', 'endTime', 'errTime', 'errDesc', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.action.uuid" />
<TextField source="groupId" label="table.field.action.groupId" />
+ <ReferenceField source="agvId" label="table.field.action.agvId" reference="agv" link={false} sortable={false}>
+ <TextField source="uuid" />
+ </ReferenceField>
<ReferenceField source="busId" label="table.field.action.busId" reference="bus" link={false} sortable={false}>
- <TextField source="seqNum" />
+ <TextField source="busNo" />
</ReferenceField>
<ReferenceField source="taskId" label="table.field.action.taskId" reference="task" link={false} sortable={false}>
<TextField source="seqNum" />
@@ -157,20 +162,17 @@
{/* <TextField source="seqNum" label="table.field.action.seqNum" /> */}
<NumberField source="priority" label="table.field.action.priority" />
{/* <TextField source="name" label="table.field.action.name" /> */}
- <NumberField source="val" label="table.field.action.val" />
- <TextField source="code" label="table.field.action.code" />
- <TextField source="params" label="table.field.action.params" />
<ReferenceField source="actionType" label="table.field.action.actionType" reference="actionType" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
+ <TextField source="code" label="table.field.action.code" />
+ <NumberField source="val" label="table.field.action.val" />
+ <TextField source="params" label="table.field.action.params" />
<ReferenceField source="actionSts" label="table.field.action.actionSts" reference="actionSts" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
- <ReferenceField source="agvId" label="table.field.action.agvId" reference="agv" link={false} sortable={false}>
- <TextField source="uuid" />
- </ReferenceField>
<DateField source="ioTime" label="table.field.action.ioTime" showTime />
- {/* <DateField source="startTime" label="table.field.action.startTime" showTime /> */}
+ <DateField source="startTime" label="table.field.action.startTime" showTime />
<DateField source="endTime" label="table.field.action.endTime" showTime />
<DateField source="errTime" label="table.field.action.errTime" showTime />
<TextField source="errDesc" label="table.field.action.errDesc" />
@@ -185,10 +187,10 @@
<DateField source="createTime" label="common.field.createTime" showTime />
{/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
+ {/* <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
+ <>
+ </>
+ )} /> */}
</StyledDatagrid>
</List>
<ActionCreate
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 434718d..9337548 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -999,6 +999,7 @@
}
for (Action action : actionList) {
action.setActionSts(ActionStsType.ISSUED.val());
+ action.setStartTime(now);
action.setUpdateTime(now);
if (!actionService.updateById(action)) {
throw new BusinessException(action.getPriority() + " - " + action.getName() + "鍔ㄤ綔鏇存柊澶辫触");
@@ -1148,6 +1149,7 @@
if (null != action) {
action.setActionSts(ActionStsType.FINISH.val());
+ action.setEndTime(now);
action.setUpdateTime(now);
if (!actionService.updateById(action)) {
log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
@@ -1180,6 +1182,7 @@
);
if (null != action) {
action.setActionSts(ActionStsType.FINISH.val());
+ action.setEndTime(now);
action.setUpdateTime(now);
if (!actionService.updateById(action)) {
log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
@@ -1254,6 +1257,7 @@
);
for (Action action : actionList) {
action.setActionSts(ActionStsType.FINISH.val());
+ action.setEndTime(now);
action.setUpdateTime(now);
if (!actionService.updateById(action)) {
log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
--
Gitblit v1.9.1