From 89a13e90cac6f9b40bfb755742aec21f524dc31f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 11:08:44 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/SegmentController.java | 2 +-
zy-acs-flow/src/page/segment/SegmentList.jsx | 25 +++++++++++++------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index eca6837..2fcb395 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -58,23 +58,24 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ // <SearchInput source="condition" alwaysOn />,
+ <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv" alwaysOn>
+ <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
+ </ReferenceInput>,
+ <ReferenceInput source="taskId" label="table.field.segment.taskId" reference="task" alwaysOn>
+ <AutocompleteInput label="table.field.segment.taskId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
+ </ReferenceInput>,
+ <TextInput source="posType" label="table.field.segment.posType" alwaysOn resettable />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="uuid" label="table.field.segment.uuid" />,
<TextInput source="groupId" label="table.field.segment.groupId" />,
<NumberInput source="travelId" label="table.field.segment.travelId" />,
- <ReferenceInput source="taskId" label="table.field.segment.taskId" reference="task">
- <AutocompleteInput label="table.field.segment.taskId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
- </ReferenceInput>,
- <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv">
- <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
- </ReferenceInput>,
<ReferenceInput source="endNode" label="table.field.segment.endNode" reference="code">
<AutocompleteInput label="table.field.segment.endNode" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
- <TextInput source="posType" label="table.field.segment.posType" />,
+
<NumberInput source="backpack" label="table.field.segment.backpack" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -107,7 +108,7 @@
title={"menu.segment"}
empty={<EmptyData />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "update_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -217,8 +218,8 @@
<ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
<TextField source="seqNum" />
</ReferenceField>
- <TextField source="posType" label="table.field.segment.posType" />
- <NumberField source="backpack" label="table.field.segment.backpack" />
+ <TextField source="posType" label="table.field.segment.posType" sortable={false} />
+ <NumberField source="backpack" label="table.field.segment.backpack" sortable={false} />
<ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
@@ -227,7 +228,7 @@
{translate(tabs.find(item => item.id === record.state)?.name)}
</>
)} />
- <NumberField source="serial" label="table.field.segment.serial" />
+ <NumberField source="serial" label="table.field.segment.serial" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/SegmentController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/SegmentController.java
index 4511575..81fac72 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/SegmentController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/SegmentController.java
@@ -31,7 +31,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Segment, BaseParam> pageParam = new PageParam<>(baseParam, Segment.class);
- return R.ok().add(segmentService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(segmentService.page(pageParam, pageParam.buildWrapper(true, "update_time")));
}
@PreAuthorize("hasAuthority('manager:segment:list')")
--
Gitblit v1.9.1