From 4c036f937336085fb5071aabfe433c7f45f84cab Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 二月 2026 10:34:02 +0800
Subject: [PATCH] 入库明细查询id冲突修复
---
rsf-admin/src/page/task/TaskList.jsx | 189 ++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 67 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index d0bdae8..eeed97a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -7,7 +7,7 @@
DatagridConfigurable,
SearchInput,
TopToolbar,
- SelectColumnsButton,
+ ColumnsButton,
FilterButton,
BulkDeleteButton,
WrapperField,
@@ -37,31 +37,33 @@
import TaskPanel from "./TaskPanel";
import MyField from "../components/MyField";
import ConfirmButton from "../components/ConfirmButton";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, AUTO_RUN_CHECK_ORDERS } from '@/config/setting';
+import PlayArrowOutlinedIcon from '@mui/icons-material/PlayArrowOutlined';
+import PauseIcon from '@mui/icons-material/Pause';
+import PauseCircleOutlineIcon from '@mui/icons-material/PauseCircleOutline';
import * as Common from '@/utils/common';
import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';
import GradingOutlinedIcon from '@mui/icons-material/GradingOutlined';
-
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
- '& .css-1vooibu-MuiSvgIcon-root': {
- height: '.9em'
- },
- '& .RaDatagrid-row': {
- cursor: 'auto'
- },
- '& .column-name': {
- },
- '& .opt': {
- width: 248
- },
-}));
-
+import StickyDataTable from "@/page/components/StickyDataTable";
+import useTableLayout from '@/utils/useTableLayout';
const TaskList = (props) => {
const translate = useTranslate();
const refresh = useRefresh();
const [drawerVal, setDrawerVal] = useState(false);
+ const [autoExce, setAutoExce] = useState(false);
const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];
+
+ useEffect(() => {
+ getConfig()
+ }, [])
+
+ const getConfig = async () => {
+ const { data: { code, data, msg } } = await request.get('/config/flag/' + AUTO_RUN_CHECK_ORDERS);
+ if (code === 200) {
+ setAutoExce(JSON.parse(data?.val))
+ }
+ }
// useEffect(() => {
// const interval = setInterval(() => {
@@ -103,10 +105,10 @@
/>,
]
-
-
return (
- <Box display="flex">
+ <Box display="flex" sx={{
+
+ }}>
<List
queryOptions={{ refetchInterval: 5000 }}
sx={{
@@ -116,6 +118,9 @@
duration: theme.transitions.duration.enteringScreen,
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ },
}}
title={"menu.task"}
empty={false}
@@ -123,56 +128,15 @@
sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
+ <BulkAutoStartButton autoExce={autoExce} setAutoExce={setAutoExce} />
+ <BulkAutoPauseButton autoExce={autoExce} setAutoExce={setAutoExce} />
<FilterButton />
- <SelectColumnsButton preferenceKey='task' />
+ <ColumnsButton storeKey='task' />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='task'
- bulkActionButtons={false
- // <>
- // <BulkResortButton />
- // <BulkCancelButton />
- // <BulkDeleteButton mutationMode={OPERATE_MODE} />
- // </>
- }
- rowClick={false}
- expand={<TaskPanel />}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
- >
- <NumberField source="id" />
- <TextField source="taskCode" label="table.field.task.taskCode" />
- <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
- <NumberField source="taskType$" label="table.field.task.taskType" />
- <NumberField source="warehType$" label="table.field.task.warehType" />
- <TextField source="orgLoc" label="table.field.task.orgLoc" />
- <TextField source="orgSite" label="table.field.task.orgSite" />
- <TextField source="targLoc" label="table.field.task.targLoc" />
- <TextField source="targSite" label="table.field.task.targSite" />
- <TextField source="barcode" label="table.field.task.barcode" />
- <TextField source="robotCode" label="table.field.task.robotCode" />
- <NumberField source="exceStatus" label="table.field.task.exceStatus" />
- <TextField source="expDesc" label="table.field.task.expDesc" />
- <NumberField source="sort" label="table.field.task.sort" />
- <TextField source="expCode" label="table.field.task.expCode" />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <TextField source="createBy$" label="common.field.createBy" />
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <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" onClick={(e) => e.stopPropagation()} >
- <EditButton label="toolbar.detail" />
- <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
- <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- <CheckButton />
- <PickButton />
- <SetTopButton />
- </WrapperField>
- </StyledDatagrid>
+ <TableItems drawerVal={drawerVal} />
</List>
<PageDrawer
title='Task Detail'
@@ -185,6 +149,64 @@
}
export default TaskList;
+
+
+const TableItems = ({ drawerVal }) => {
+ const omittedFields = ['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'warehType$', 'orderType', 'order_type', 'orderType$'];
+ const { boxMaxWidth, boxMaxHeight } = useTableLayout(drawerVal);
+ return (
+ <Box sx={{
+ position: 'relative',
+ maxHeight: boxMaxHeight,
+ maxWidth: boxMaxWidth,
+ overflowX: 'auto',
+ overflowY: 'auto',
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ }
+ }}>
+ <StickyDataTable
+ stickyRight={['opt']}
+ storeKey='task'
+ bulkActionButtons={false}
+ rowClick={false}
+ hiddenColumns={omittedFields}
+ expand={<TaskPanel />}
+ expandSingle={true}
+ >
+ <NumberField source="id" />
+ <TextField source="taskCode" label="table.field.task.taskCode" />
+ <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
+ <NumberField source="taskType$" label="table.field.task.taskType" />
+ <NumberField source="warehType$" label="table.field.task.warehType" />
+ <TextField source="orgLoc" label="table.field.task.orgLoc" />
+ <TextField source="orgSite$" label="table.field.task.orgSite" />
+ <TextField source="targLoc" label="table.field.task.targLoc" />
+ <TextField source="targSite$" label="table.field.task.targSite" />
+ <TextField source="barcode" label="table.field.task.barcode" />
+ <TextField source="robotCode" label="table.field.task.robotCode" />
+ <NumberField source="exceStatus" label="table.field.task.exceStatus" />
+ <TextField source="expDesc" label="table.field.task.expDesc" />
+ <NumberField source="sort" label="table.field.task.sort" />
+ <TextField source="expCode" label="table.field.task.expCode" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField source="opt" cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
+ <EditButton label="toolbar.detail" />
+ <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
+ <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <CheckButton />
+ <PickButton />
+ <SetTopButton />
+ </WrapperField>
+ </StickyDataTable>
+ </Box>
+ )
+}
+
/**
* 鐩樼偣
@@ -207,6 +229,40 @@
return (record?.taskStatus == 199 && record?.taskType == 107 ? <ConfirmButton label={"toolbar.check"} startIcon={<GradingOutlinedIcon />} onConfirm={checkClick} /> : <></>)
}
+
+/**鑷姩涓嬪彂浠诲姟**/
+const BulkAutoStartButton = ({ autoExce, setAutoExce }) => {
+ const notify = useNotify();
+ const startClick = async () => {
+ setAutoExce(true)
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: true, flag: 'AUTO_RUN_CHECK_ORDERS' });
+ if (code === 200) {
+ notify(msg);
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ !autoExce ? <Button label="toolbar.autoStartLocs" onClick={startClick} startIcon={<PlayArrowOutlinedIcon />} /> : <></>
+ )
+}
+
+const BulkAutoPauseButton = ({ autoExce, setAutoExce }) => {
+ const notify = useNotify();
+ const pauseClick = async () => {
+ const { data: { code, data, msg } } = await request.post('/config/byFlag', { val: false, flag: 'AUTO_RUN_CHECK_ORDERS' });
+ if (code === 200) {
+ notify(msg);
+ setAutoExce(false)
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ autoExce ? <Button label="toolbar.pause" onClick={pauseClick} startIcon={<PauseIcon />} /> : <></>
+ )
+}
+
/**
* 鎷ｆ枡鍑哄簱
@@ -272,7 +328,6 @@
};
//鍙栨秷浠诲姟
const cancleTask = async (row) => {
- console.log(row);
const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
if (code === 200) {
notify(msg);
@@ -282,7 +337,7 @@
}
}
return (
- (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
<ConfirmButton
onConfirm={clickCancel}
startIcon={<CancelIcon />}
--
Gitblit v1.9.1