From f2833c7f3e01c997e94a66bd5dd9be738b5c6cc7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 13:31:08 +0800
Subject: [PATCH] 波次任务下发功能优化
---
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index 6dc7a54..0439bed 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -33,19 +33,19 @@
DeleteButton,
useGetRecordId,
Button,
+ useRefresh,
} from 'react-admin';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
+import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
import { Box, Typography, Card, Stack } from '@mui/material';
+import ContentCreate from '@mui/icons-material/Create';
+import PageDrawer from "../../components/PageDrawer";
import { styled } from '@mui/material/styles';
import WaveItemCreate from "./WaveItemCreate";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
-import PageDrawer from "../../components/PageDrawer";
import WaveItemEdit from "./WaveItemEdit";
-import MyField from "../../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
-import ContentCreate from '@mui/icons-material/Create';
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -57,7 +57,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 140
},
}));
@@ -72,10 +72,7 @@
<TextInput source="matnrCode" label="table.field.waveItem.matnrCode" />,
<TextInput source="batch" label="table.field.waveItem.batch" />,
<TextInput source="splrBatch" label="table.field.waveItem.splrBatch" />,
- <TextInput source="orderCode" label="table.field.waveItem.orderCode" />,
- <NumberInput source="orderItemId" label="table.field.waveItem.orderItemId" />,
<TextInput source="unit" label="table.field.waveItem.unit" />,
- <TextInput source="trackCode" label="table.field.waveItem.trackCode" />,
<TextInput source="fieldsIndex" label="table.field.waveItem.fieldsIndex" />,
<NumberInput source="anfme" label="table.field.waveItem.anfme" />,
<NumberInput source="workQty" label="table.field.waveItem.workQty" />,
@@ -125,33 +122,38 @@
>
<StyledDatagrid
preferenceKey='waveItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={
+ <>
+ <BulkStartButton />
+ </>
+ }
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={false}
- omit={['id', 'createTime', 'matnrId', 'waveId', 'batch', 'orderItemId', 'batch', 'fieldsIndex', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'matnrId', 'waveId', 'batch', 'orderItemId', 'fieldsIndex', 'createBy', 'memo']}
>
<NumberField source="id" />
<NumberField source="waveId" label="table.field.waveItem.waveId" />
<TextField source="waveCode" label="table.field.waveItem.waveCode" />
<NumberField source="matnrId" label="table.field.waveItem.matnrId" />
- <TextField source="maktx" label="table.field.waveItem.matnrName" />
<TextField source="matnrCode" label="table.field.waveItem.matnrCode" />
+ <TextField source="maktx" label="table.field.waveItem.matnrName" />
<TextField source="batch" label="table.field.waveItem.batch" />
<TextField source="splrBatch" label="table.field.waveItem.splrBatch" />
- <TextField source="orderCode" label="table.field.waveItem.orderCode" />
- <NumberField source="orderItemId" label="table.field.waveItem.orderItemId" />
- <TextField source="unit" label="table.field.waveItem.unit" />
- <TextField source="trackCode" label="table.field.waveItem.trackCode" />
- <TextField source="fieldsIndex" label="table.field.waveItem.fieldsIndex" />
<NumberField source="anfme" label="table.field.waveItem.anfme" />
+ <TextField source="fieldsIndex" label="table.field.waveItem.fieldsIndex" />
<NumberField source="workQty" label="table.field.waveItem.workQty" />
+ <TextField source="unit" label="table.field.waveItem.unit" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<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} />
+ <TextField source="exceStatus$" label="table.field.waveItem.exceStatus" />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <PauseButton />
+ <ContinueButton />
+ </WrapperField>
</StyledDatagrid>
</List>
<WaveItemEdit
@@ -182,8 +184,64 @@
}
return (
- <Button label="ra.action.edit" onClick={editClick} startIcon={<ContentCreate />}/>
-
+ <Button label="ra.action.edit" onClick={editClick} startIcon={<ContentCreate />} />
)
-
}
+
+
+const BulkStartButton = () => {
+ const { data, selectedIds, onUnselectItems } = useListContext();
+ const waveId = useGetRecordId();
+ const notify = useNotify();
+ const refresh = useRefresh()
+ const startClick = async () => {
+ onUnselectItems();
+ const { data: { code, data, msg } } = await request.post('/wave/selects/task', { wave: waveId, waveItem: selectedIds });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ refresh()
+ }
+ return (
+ <Button label="toolbar.publicWorking" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
+ )
+}
+
+const PauseButton = () => {
+ const notify = useNotify()
+ const refresh = useRefresh();
+ const record = useRecordContext();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/pause/pub/' + record?.id);
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ refresh()
+ }
+ return (
+ record?.exceStatus == 1 ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<StopCircleOutlinedIcon />} /> : <></>
+ )
+}
+
+const ContinueButton = () => {
+ const notify = useNotify()
+ const refresh = useRefresh();
+ const record = useRecordContext();
+ const continueClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/waveItem/continue/pub/' + record?.id);
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ refresh()
+ }
+ return (
+ record?.exceStatus == 2 ? <Button label="toolbar.continuePub" onClick={continueClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1