From 1e01cb4da6055dd19c720a7012301ec34bee982a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 六月 2025 16:41:04 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/wave/WaveList.jsx | 159 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 138 insertions(+), 21 deletions(-)
diff --git a/rsf-admin/src/page/orders/wave/WaveList.jsx b/rsf-admin/src/page/orders/wave/WaveList.jsx
index a0fb5a4..c0d43c4 100644
--- a/rsf-admin/src/page/orders/wave/WaveList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -8,35 +8,28 @@
SelectColumnsButton,
EditButton,
FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
WrapperField,
useRecordContext,
useTranslate,
useNotify,
useListContext,
- FunctionField,
TextField,
NumberField,
DateField,
BooleanField,
- ReferenceField,
TextInput,
- DateTimeInput,
DateInput,
SelectInput,
NumberInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- DeleteButton,
useRefresh,
useRedirect,
Button,
} from 'react-admin';
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_WAVE_AUTO_EXCE } from '@/config/setting';
+import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
+import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
+import StopCircleOutlinedIcon from '@mui/icons-material/StopCircleOutlined';
+import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
import ConfirmButton from "../../components/ConfirmButton";
import PageDrawer from "../../components/PageDrawer";
import PublicIcon from '@mui/icons-material/Public';
@@ -44,7 +37,7 @@
import { styled } from '@mui/material/styles';
import request from '@/utils/request';
import WaveCreate from "./WaveCreate";
-
+import WavePannel from "./WavePanel"
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -56,7 +49,7 @@
'& .column-name': {
},
'& .opt': {
- width: 260
+ width: 200
},
}));
@@ -97,13 +90,26 @@
const WaveList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
+ const [autoExce, setAutoExce] = useState(false);
const [detailDialog, setDetailDialog] = useState(false);
const [select, setSelectIds] = useState({});
const [drawerVal, setDrawerVal] = useState(false);
+ useEffect(() => {
+ getConfig()
+ }, [])
+
+ const getConfig = async () => {
+ const { data: { code, data, msg } } = await request.get('/config/flag/' + DEFAULT_WAVE_AUTO_EXCE);
+ if (code === 200) {
+ setAutoExce(JSON.parse(data?.val))
+ }
+ }
+
return (
<Box display="flex">
<List
+ queryOptions={{ refetchInterval: 5000 }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -118,6 +124,8 @@
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
+ <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce} />
+ <BulkAutoPauseButton autoExce={autoExce} setAutoExce={setAutoExce} />
<FilterButton />
<SelectColumnsButton preferenceKey='wave' />
</TopToolbar>
@@ -126,28 +134,34 @@
>
<StyledDatagrid
preferenceKey='wave'
- bulkActionButtons={false}
+ bulkActionButtons={
+ <>
+ <BulkStartButton />
+ </>
+ }
rowClick={(id, resource, record) => false}
- expand={false}
- expandSingle={false}
+ expand={<WavePannel />}
+ expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.wave.code" />
<TextField source="type$" label="table.field.wave.type" sortable={false} />
- <TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} />
<NumberField source="anfme" label="table.field.wave.anfme" />
<NumberField source="groupQty" label="table.field.wave.groupQty" />
- <NumberField source="qty" label="table.field.wave.qty" />
+ <NumberField source="workQty" label="table.field.wave.qty" />
<NumberField source="orderNum" label="table.field.wave.orderNum" />
+ <DateField source="createTime" label="common.field.createTime" showTime />
<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} />
+ <CustomProcess source="progress" />
+ <TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<PublicTaskButton setSelectIds={setSelectIds} setDetailDialog={setDetailDialog} />
+ <PauseButton />
+ <ContinueButton />
<EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} />
</WrapperField>
</StyledDatagrid>
@@ -173,6 +187,36 @@
export default WaveList;
+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', { ids: selectedIds });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ <Button label="toolbar.publicWorking" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} variant="outlined" />
+ )
+}
+
+const CustomProcess = () => {
+ const record = useRecordContext();
+ const progress = (record.workQty / record.anfme) * 100
+ return (
+ <>
+ <LinearProgress variant="determinate" value={progress} />
+ </>
+ )
+}
+
const PublicTaskButton = ({ setSelectIds, setDetailDialog }) => {
const record = useRecordContext();
const notify = useNotify();
@@ -186,4 +230,77 @@
return (
record?.exceStatus == 0 ? <ConfirmButton label={"toolbar.createTask"} startIcon={<PublicIcon />} onConfirm={pubClick} size='small' /> : <></>
);
+}
+
+const BulkAutoStartButton = ({ autoExce, setAutoExce }) => {
+ const { data, selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify();
+ const startClick = async () => {
+ onUnselectItems()
+ setAutoExce(true)
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: true, flag: 'WaveAutoExce' });
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ !autoExce ? <Button label="toolbar.start" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} /> : <></>
+ )
+}
+
+const BulkAutoPauseButton = ({ autoExce, setAutoExce }) => {
+ const notify = useNotify();
+ const { data, selectedIds, onUnselectItems } = useListContext();
+
+ const pauseClick = async () => {
+ onUnselectItems()
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: false, flag: 'WaveAutoExce' });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseCircleOutlineIcon />} /> : <></>
+ )
+}
+
+const PauseButton = () => {
+ const notify = useNotify()
+ const refresh = useRefresh();
+ const record = useRecordContext();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/wave/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('/wave/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