From dcee04e577389842f31d6c8b114e046c837bb05e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 10:57:06 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/i18n/en.js | 10 +++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java | 2
zy-acs-flow/src/i18n/zh.js | 10 +++++
zy-acs-flow/src/page/travel/TravelList.jsx | 43 +++++++++++++++------
4 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 082291b..639c74a 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -493,6 +493,8 @@
currSeg: "curr seg",
taskContent: "tasks",
taskIds: "task list",
+ rollerWaiting: 'roller waiting',
+ rollerWaitingCode: 'waiting code',
state: "state",
},
segment: {
@@ -722,6 +724,14 @@
},
},
},
+ travel: {
+ enums: {
+ state: {
+ running: 'RUNNING',
+ finish: 'FINISH',
+ },
+ },
+ },
jam: {
enums: {
state: {
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 32006ac..8b63137 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -493,6 +493,8 @@
currSeg: "褰撳墠浣滀笟",
taskContent: "浠诲姟鍐呭",
taskIds: "浠诲姟鍒楄〃",
+ rollerWaiting: '婊氱瓛绾跨瓑寰�',
+ rollerWaitingCode: '绛夊緟浣嶅湴鐮�',
state: "鐘舵��",
},
segment: {
@@ -722,6 +724,14 @@
},
},
},
+ travel: {
+ enums: {
+ state: {
+ running: '姝ｅ湪杩愯',
+ finish: '宸插畬鎴�',
+ },
+ },
+ },
jam: {
enums: {
state: {
diff --git a/zy-acs-flow/src/page/travel/TravelList.jsx b/zy-acs-flow/src/page/travel/TravelList.jsx
index 3d49a3f..0c0651a 100644
--- a/zy-acs-flow/src/page/travel/TravelList.jsx
+++ b/zy-acs-flow/src/page/travel/TravelList.jsx
@@ -30,6 +30,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -57,23 +58,36 @@
},
}));
+const tabs = [
+ { id: 'RUNNING', name: 'page.travel.enums.state.running' },
+ { id: 'FINISH', name: 'page.travel.enums.state.finish' },
+];
+
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.travel.uuid" />,
<TextInput source="travelId" label="table.field.travel.travelId" />,
- <ReferenceInput source="agvId" label="table.field.travel.agvId" reference="agv">
+ <ReferenceInput source="agvId" label="table.field.travel.agvId" reference="agv" alwaysOn>
<AutocompleteInput label="table.field.travel.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
</ReferenceInput>,
- <ReferenceInput source="currSeg" label="table.field.travel.currSeg" reference="segment">
- <AutocompleteInput label="table.field.travel.currSeg" optionText="id" filterToQuery={(val) => ({ id: val })} />
+ <SelectInput
+ label="table.field.travel.rollerWaiting"
+ source="rollerWaiting"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ alwaysOn
+ />,
+ <ReferenceInput source="rollerWaitingCode" label="table.field.travel.rollerWaitingCode" reference="code">
+ <AutocompleteInput label="table.field.travel.rollerWaitingCode" optionText="data" filterToQuery={(val) => ({ uuid: val })} />
</ReferenceInput>,
- <TextInput source="taskContent" label="table.field.travel.taskContent" />,
- <TextInput source="taskIds" label="table.field.travel.taskIds" />,
+ // <ReferenceInput source="currSeg" label="table.field.travel.currSeg" reference="segment">
+ // <AutocompleteInput label="table.field.travel.currSeg" optionText="id" filterToQuery={(val) => ({ id: val })} />
+ // </ReferenceInput>,
<TextInput source="state" label="table.field.travel.state" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -109,7 +123,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='travel' />
<MyExportButton />
</TopToolbar>
@@ -122,7 +136,7 @@
rowClick={(id, resource, record) => false}
expand={() => <TravelPanel />}
expandSingle={true}
- omit={['id', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'currSeg', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.travel.uuid" />
@@ -134,8 +148,13 @@
<TextField source="id" />
</ReferenceField>
<TextField source="taskIds" label="table.field.travel.taskIds" />
- <TextField source="state" label="table.field.travel.state" />
-
+ <BooleanField source="rollerWaitingBool" label="table.field.travel.rollerWaiting" sortable={false} />
+ {/* <TextField source="state" label="table.field.travel.state" /> */}
+ <FunctionField label="table.field.travel.state" cellClassName="state" render={record => (
+ <>
+ {translate(tabs.find(item => item.id === record.state)?.name)}
+ </>
+ )} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -148,7 +167,7 @@
<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} />
+ {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
</WrapperField>
</StyledDatagrid>
</List>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
index 3c333fa..8d3db1d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
@@ -124,7 +124,7 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Boolean rollerWaitingBool(){
+ public Boolean getRollerWaitingBool(){
if (null == this.rollerWaiting){ return null; }
switch (this.rollerWaiting){
case 1:
--
Gitblit v1.9.1