From 5d063689e3f977c4f8cf4ac76173023e5db026a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 23 七月 2025 12:43:56 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/CheckOrderPub.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
index e9d4ded..1a0c75a 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
@@ -73,7 +73,11 @@
const getLocs = async (ids) => {
const { data: { code, data, msg } } = await request.post('/check/locs/' + ids);
if (code === 200) {
+ console.log('----->');
+ console.log(data);
setRows(data)
+ const matnrs = selectedMatnr.filter(item => data.some(bigData => bigData.matnrCode === item));
+ // setSelectedMatnr(matnrs)
} else {
notify(msg);
}
@@ -87,7 +91,7 @@
const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode);
//璁剧疆搴撲綅淇℃伅绛涢�夋潯浠�
setSelectedMatnr(mas);
- // onUnselectItems()
+ onUnselectItems()
}
return (
record.exceStatus != 3 ? <><Button label="toolbar.confirm" size="medium" onClick={handleRowClick} /></> : <></>
@@ -222,7 +226,7 @@
</Box>
<Box sx={{ textAlign: 'center' }}>
<CloseButton setOpen={setOpen} />
- <SubmitButton selectedIds={selectedIds} setSelectedIds={setSelectedIds} rowSelectedIds={rowSelectedIds} gridRef={gridRef} record={record} />
+ <SubmitButton selectedIds={selectedIds} setOpen={setOpen} setSelectedIds={setSelectedIds} selectedMatnr={selectedMatnr} rowSelectedIds={rowSelectedIds} gridRef={gridRef} record={record} />
</Box>
</Card>
</Grid>
@@ -420,7 +424,7 @@
//鎻愪氦鎸夐挳
-const SubmitButton = ({ selectedIds, setSelectedIds, rowSelectedIds, gridRef, record }) => {
+const SubmitButton = ({ selectedIds, setSelectedIds, rowSelectedIds, gridRef, record, setOpen, selectedMatnr }) => {
const notify = useNotify();
const refresh = useRefresh();
const translate = useTranslate();
@@ -441,9 +445,12 @@
}
})
- const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records);
+ let params = records.filter(record => record?.items.length > 0);
+
+ const { data: { code, data, msg } } = await request.post('/check/generate/tasks', params);
if (code == 200) {
refresh();
+ setOpen(false)
} else {
notify(msg);
}
--
Gitblit v1.9.1