From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +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 |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
index 24dade3..54babf4 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
@@ -89,9 +89,8 @@
             setSelectedMatnr(mas);
             // onUnselectItems()
         }
-
         return (
-            <Button label="toolbar.confirm" size="medium" onClick={handleRowClick} />
+            record.exceStatus != 3 ? <><Button label="toolbar.confirm" size="medium" onClick={handleRowClick} /></> : <></>
         )
     };
 
@@ -428,21 +427,21 @@
     const submit = async () => {
         const items = gridRef.current?.getSortedRows();
         let selctRecord = items.filter(item => selectedIds.includes(item?.id));
+        //杩囨护锛屽皢搴撲綅娣诲姞鑷崇洏鐐瑰崟鏄庣粏涓�
         const records = rowSelectedIds.map(map =>{
             return {
                 ...map,
                 items: selctRecord.filter(item => item.matnrCode == map.matnrCode)
             }
         })
-        console.log(records);
         
-        // const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records);
-        // if (code == 200) {
-        //     refresh();
-        //     redirect("/task")
-        // } else {
-        //     notify(msg);
-        // }
+        const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records);
+        if (code == 200) {
+            refresh();
+            redirect("/task")
+        } else {
+            notify(msg);
+        }
     }
     return (
         <ConfirmButton

--
Gitblit v1.9.1