From 669072c5f71421f937cd46a1cc8f4b838953e895 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 10:36:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 4114430..2a7d658 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -196,7 +196,7 @@
                     <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
                     <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
                     <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
-                    <NumberField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" />,
+                    <BooleanField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" sortable={false} />,
                     <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
                     </ReferenceField>,
@@ -242,6 +242,8 @@
                     preferenceKey='matnr'
                     bulkActionButtons={<>
                         <BatchGroupButton />
+                        <BatchWarnButton />
+                        <BatchFlagButton />
                         <BatchStatusButton />
                         <BatchLevelButton />
                         <BindButton />
@@ -388,6 +390,54 @@
     )
 }
 
+const BatchWarnButton = () => {
+    const record = useRecordContext();
+    const notify = useNotify();
+    const refresh = useRefresh();
+
+
+    const [createDialog, setCreateDialog] = useState(false);
+
+    return (
+        <>
+            <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchValidWarn"}>
+                <EditIcon />
+            </Button>
+
+            <BatchModal
+                open={createDialog}
+                setOpen={setCreateDialog}
+                fieldType={'validWarn'}
+            />
+        </>
+
+    )
+}
+
+const BatchFlagButton = () => {
+    const record = useRecordContext();
+    const notify = useNotify();
+    const refresh = useRefresh();
+
+
+    const [createDialog, setCreateDialog] = useState(false);
+
+    return (
+        <>
+            <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchFlagCheck"}>
+                <EditIcon />
+            </Button>
+
+            <BatchModal
+                open={createDialog}
+                setOpen={setCreateDialog}
+                fieldType={'flagCheck'}
+            />
+        </>
+
+    )
+}
+
 const BatchGroupButton = () => {
     const record = useRecordContext();
     const notify = useNotify();

--
Gitblit v1.9.1