From e4b641e65e49c7854ed11e7822316431f5e0ce1b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 27 六月 2025 08:36:03 +0800
Subject: [PATCH] 出库单生成波次功能优化
---
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 178 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 106 insertions(+), 72 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index dfff8b0..a74ca93 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -5,6 +5,7 @@
DatagridConfigurable,
SearchInput,
TopToolbar,
+ Toolbar,
SelectColumnsButton,
EditButton,
FilterButton,
@@ -36,27 +37,30 @@
Button,
useRedirect,
useUnselectAll,
+ useRecordSelection,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import AsnOrderModal from "./AsnOrderModal";
-import EmptyData from "../../components/EmptyData";
-import MyCreateButton from "../../components/MyCreateButton";
-import MyExportButton from '../../components/MyExportButton';
-import BillStatusField from '../../components/BillStatusField';
-import ConfirmButton from '../../components/ConfirmButton';
-import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import ConstructionIcon from "@mui/icons-material/Construction";
-import EditIcon from '@mui/icons-material/Edit';
-import TaskIcon from '@mui/icons-material/Task';
-import CloseIcon from '@mui/icons-material/Close';
-import request from '@/utils/request';
+import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
+import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import DictionarySelect from "../../components/DictionarySelect";
-import ExitToAppIcon from '@mui/icons-material/ExitToApp';
+import BillStatusField from '../../components/BillStatusField';
+import MyCreateButton from "../../components/MyCreateButton";
+import PageEditDrawer from "../../components/PageEditDrawer";
+import ConfirmButton from '../../components/ConfirmButton';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
-import CancelIcon from '@mui/icons-material/Cancel';
+import AddTaskIcon from '@mui/icons-material/AddTask';
+import PublicIcon from '@mui/icons-material/Public';
+import SelectMatnrModal from "./SelectMatnrModal";
+import EditIcon from '@mui/icons-material/Edit';
+import OutOrderPreview from "./OutOrderPreview";
+import AddIcon from '@mui/icons-material/Add';
+import OutStockPublic from "./OutStockPublic";
+import OutOrderModal from "./OutOrderModal";
+import request from '@/utils/request';
+import OutStockWaveDialog from "./OutStockWaveDialog";
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
height: '.9em'
@@ -82,10 +86,10 @@
<TextInput source="code" label="table.field.outStock.code" alwaysOn />,
<TextInput source="poCode" label="table.field.outStock.poCode" />,
<NumberInput source="poId" label="table.field.outStock.poId" />,
- <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.type" alwaysOn>
+ <ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '2' }} label="table.field.outStock.type" alwaysOn>
<AutocompleteInput label="table.field.outStock.type" optionValue="value" />
</ReferenceInput>,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type' }} label="table.field.outStock.wkType" alwaysOn>
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_business_type', group: '2' }} label="table.field.outStock.wkType" alwaysOn>
<AutocompleteInput label="table.field.outStock.wkType" optionValue="value" />
</ReferenceInput>,
<NumberInput source="anfme" label="table.field.outStock.anfme" />,
@@ -106,42 +110,59 @@
dictTypeCode="sys_asn_exce_status"
alwaysOn
/>,
-
]
const OutOrderList = (props) => {
const translate = useTranslate();
+ const refresh = useRefresh();
+ const notify = useNotify();
+
const [createDialog, setCreateDialog] = useState(false);
+ const [manualDialog, setManualDialog] = useState(false);
+ const [selectIds, setSelectIds] = useState([]);
+ const [preview, setPreview] = useState(false);
+ const [waveRule, setWaveRule] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [modalType, setmodalType] = useState(0);
const [select, setSelect] = useState(0);
const billReload = useRef();
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+
+ //鑾峰彇娉㈡瑙勫垯
+ const closeDialog = async (value) => {
+ setWaveRule(false)
+ const res = await request.post(`/outStock/generate/wave`, { ids: selectIds, waveRuleId: value.id });
+ if (res?.data?.code === 200) {
+ notify(res.data.msg);
+ } else {
+ notify(res.data.msg);
+ }
+ refresh()
+ }
+
return (
<Box display="flex">
<List
resource="outStock"
- storeKey='outStock'
sx={{
flexGrow: 1,
transition: (theme) =>
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.outStock"}
- empty={<EmptyData onClick={() => { setCreateDialog(true); setmodalType(0) }} />}
+ empty={false}
filters={filters}
filter={{ deleted: 0, type: 'out' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true); setmodalType(0) }} />
+ <CreateByOrderButton setCreateDialog={setCreateDialog} />
+ <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='outStock' />
- <ImportButton value={'asnOrderItem'} />
- <MyExportButton />
+ <ImportButton value={'outStockItem'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -149,24 +170,18 @@
<StyledDatagrid
sx={{ width: '100%' }}
preferenceKey='outStock'
- bulkActionButtons={
- <>
- <MyExportButton />
- {/* <BtnBulkExport></BtnBulkExport> */}
- <BulkDeleteButton mutationMode={OPERATE_MODE}
- />
- </>}
+ bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.outStock.code" />
<TextField source="poCode" label="table.field.outStock.poCode" />
- <NumberField source="poId" label="table.field.outStock.poId" />
<TextField source="type$" label="table.field.outStock.type" />
<TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
<NumberField source="anfme" label="table.field.outStock.anfme" />
+ <NumberField source="workQty" label="table.field.outStock.workQty" />
<NumberField source="qty" label="table.field.outStock.qty" />
<TextField source="logisNo" label="table.field.outStock.logisNo" />
<TextField source="rleStatus$" label="table.field.outStock.rleStatus" sortable={false} />
@@ -177,29 +192,64 @@
<BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" >
+ <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
<EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
- <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
- <CancelButton></CancelButton>
- {/* <CompleteButton /> */}
+ <CancelButton />
+ <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
</WrapperField>
</StyledDatagrid>
</List>
- <AsnOrderModal
- open={createDialog}
- setOpen={setCreateDialog}
+ {/* <OutOrderCreate
+ open={manualDialog}
+ setOpen={setManualDialog}
+ /> */}
+ <SelectMatnrModal
asnId={modalType}
billReload={billReload}
+ open={manualDialog}
+ setOpen={setManualDialog}
/>
- <PageDrawer
- title='AsnOrder Detail'
+ <OutOrderModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ preview={preview}
+ setPreview={setPreview}
+ />
+ <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
+ <OutOrderPreview open={preview} setOpen={setPreview} />
+ <PageEditDrawer
+ title={"toolbar.publicWorking"}
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- </PageDrawer>
+ <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
+ </PageEditDrawer>
</Box >
)
}
export default OutOrderList;
+
+
+const PublicTaskButton = ({ setWaveRule, setSelectIds }) => {
+ const record = useRecordContext();
+ const { selectedIds, onUnselectItems } = useListContext();
+ const notify = useNotify();
+ const redirect = useRedirect();
+
+ const pubClick = async () => {
+ onUnselectItems();
+ setWaveRule(true);
+ setSelectIds(selectedIds)
+ }
+
+ return (
+ <Button
+ onClick={pubClick}
+ label={"toolbar.createWave"}
+ startIcon={<PublicIcon />}
+ />
+ );
+}
const MyButton = ({ setCreateDialog, setmodalType }) => {
const record = useRecordContext();
@@ -208,7 +258,6 @@
const id = record.id;
setmodalType(id);
setCreateDialog(true);
-
};
return (
<Button
@@ -222,26 +271,17 @@
)
}
-const CompleteButton = () => {
+const CreateByOrderButton = ({ setCreateDialog }) => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const requestComplete = async () => {
- const { data: { code, data, msg } } = await request.post(`/asnOrder/complete/${record.id}`);
-
- if (code === 200) {
- notify(msg);
- refresh()
- } else {
- notify(msg);
- }
+ const createByOrder = async (event) => {
+ event.stopPropagation();
+ setCreateDialog(true);
}
return (
- record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="success">
- <TaskIcon />
- </Button> : <ConfirmButton label={"toolbar.complete"} color="success" data={'褰撳墠鏀惰揣鏁伴噺灏忎簬璁″垝鏁伴噺锛屾槸鍚︾‘璁ゅ畬鎴�'} startIcon={<TaskIcon />} onConfirm={requestComplete} />)
-
+ <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
)
}
@@ -249,9 +289,8 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
-
const cancelOrder = async () => {
- const { data: { code, data, msg } } = await request.post(`/outStock/cancel/${record.id}`);
+ const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
@@ -261,26 +300,21 @@
}
return (
- <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelIcon />} onConfirm={cancelOrder} />
+ record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
)
}
-const CloseButton = () => {
+//涓嬪彂鎵ц
+const PublicButton = ({ setDrawerVal, setSelect }) => {
const record = useRecordContext();
- const notify = useNotify();
const refresh = useRefresh();
- const requestClose = async () => {
- const { data: { code, data, msg } } = await request.post(`/outStock/close/${record.id}`);
-
- if (code === 200) {
- notify(msg);
- refresh()
- } else {
- notify(msg);
- }
+ const taskEvent = () => {
+ setDrawerVal(true)
+ setSelect(record)
+ refresh();
}
return (
- <ConfirmButton label={"toolbar.close"} color="error" data={'纭鏄惁鍏抽棴锛�'} startIcon={<CloseIcon />} onConfirm={requestClose} />
+ record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></>
)
}
--
Gitblit v1.9.1