From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化

---
 rsf-admin/src/page/orders/outStock/OutStockPublic.jsx |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
index ce732be..0dc8ff5 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx
@@ -37,6 +37,7 @@
     Form,
     useRefresh,
     useRedirect,
+    useRecordSelection,
 } from 'react-admin';
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE, DEFAULT_TYPE } from '@/config/setting';
 import { styled } from '@mui/material/styles';
@@ -67,7 +68,7 @@
 }));
 
 const OutStockPublic = (props) => {
-    const { record, open, setOpen } = props;
+    const { record, open, setOpen, setManualDialog } = props;
     const notify = useNotify();
     const gridRef = useGridApiRef();
     const [rows, setRows] = useState([]);
@@ -91,8 +92,12 @@
 
 
     const ComfirmButton = () => {
-        const { selectedIds, data } = useListContext();
+        const { data } = useListContext();
+        const [selectedIds, selectionModifiers] = useRecordSelection();
+
         const handleRowClick = () => {
+            console.log(selectedIds);
+            
             const ids = data.filter(item => selectedIds.includes(item.id)).map(item => item.id);
             setRowSelectedIds(ids);
             const mas = data.filter(item => selectedIds.includes(item.id)).map(item => item.matnrCode);
@@ -103,7 +108,6 @@
         return (
             <Button label="toolbar.confirm" size="medium" onClick={handleRowClick} />
         )
-
     };
 
     const handleClickOpen = () => {
@@ -133,10 +137,8 @@
     };
 
     useEffect(() => {
-        if (open) {
-            getWaveRule()
-        }
-    }, [open, formData])
+        getWaveRule()
+    }, [open])
 
     const getWaveRule = async () => {
         if (formData.waveId == null && formData.waveId == undefined) {
@@ -144,7 +146,7 @@
         }
         const { data: { code, data, msg } } = await request.post('/outStock/order/getOutTaskItems', { ...formData });
         if (code === 200) {
-            setRows(data)
+            // setRows(data)
             setFetchRows(data)
         } else {
             notify(msg);
@@ -191,7 +193,7 @@
                                 }}
                                 title={"menu.outStockItem"}
                                 empty={false}
-                                filter={{ asnId: record?.id, deleted: 0 }}
+                                filter={{ orderId: record?.id, deleted: 0 }}
                                 sort={{ field: "create_time", order: "desc" }}
                                 actions={false}
                                 pagination={false}
@@ -209,7 +211,7 @@
                                     omit={['id', 'splrName', 'qty', 'poCode',]}
                                 >
                                     <NumberField source="id" />
-                                    <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
+                                    <TextField source="asnCode" label="table.field.outStockItem.orderCode" />
                                     <TextField source="poCode" label="table.field.outStockItem.poCode" />
                                     <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
                                     <TextField source="maktx" label="table.field.outStockItem.maktx" />

--
Gitblit v1.9.1