Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-04-30 d97d7346ec794ffa34077160bb13424f2f84bc57

 rsf-admin/src/page/orders/wave/ItemToTaskModal.jsx

@@ -150,7 +150,7 @@
                </DialogContent>
                <DialogActions>
                    <Toolbar sx={{ width: '100%', justifyContent: 'end' }} >
                        <GenerateTaskButton record={record?.id} dataSource={data} />
                        <GenerateTaskButton record={record?.id} dataSource={data} setOpen={setOpen}/>
                    </Toolbar>
                </DialogActions>
            </Dialog>
@@ -160,16 +160,25 @@

export default ItemToTaskModal;

const GenerateTaskButton = (record, dataSource) => {
const GenerateTaskButton = (record) => {
    const refresh = useRefresh();
    const notify = useNotify();
    const redirect = useRedirect();
    const translate = useTranslate();
    const { locs, setLocs } = useState([]);
    const generateTask = async () => {
        const params = {wave: record, waveItem: dataSource}
        console.log('---------->');
        console.log(record);
        record?.dataSource.map(item => {
            const loc = JSON.parse(item.stockLocs);
            if (loc != undefined && loc.length > 0) {
                setLocs(...loc)
            }
        })
        if (locs == undefined || locs.length < 1) {
            notify(translate('request.error.stock'))
        } else {
        const res = await request.post(`/wave/public/task`, { wave: record?.record, waveItem: record?.dataSource });
        if (res?.data?.code === 200) {
                record.setOpen(false)
            notify(res.data.msg);
            redirect("/task")
        } else {
@@ -177,6 +186,7 @@
        }
        refresh();
    }
    }
    return (<Button variant="contained" label={"ra.action.save"} onClick={generateTask}></Button>)
}