From 8d663e98fe09703daf9ac09950d405faf735585d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 15 四月 2025 16:02:09 +0800
Subject: [PATCH] #修复:只进行了一次质检操作,质检状态自动变化为"质检完成"

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java |    2 +-
 rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx                                                 |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 2d14bcd..fe32356 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -281,6 +281,23 @@
                         </CustomTabPanel>
                         <CustomTabPanel value={value} index={1}>
                             <Grid container rowSpacing={2} columnSpacing={2}>
+                            <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.matnr.name"
+                                        source="name"
+                                        parse={v => v}
+                                        required
+                                        autoFocus
+                                    />
+                                </Grid>
+                                <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.matnr.code"
+                                        source="code"
+                                        required
+                                        parse={v => v}
+                                    />
+                                </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <NumberInput
                                         label="table.field.matnr.safeQty"
@@ -331,6 +348,23 @@
                         </CustomTabPanel>
                         <CustomTabPanel value={value} index={2}>
                             <Grid container rowSpacing={2} columnSpacing={2}>
+                            <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.matnr.name"
+                                        source="name"
+                                        parse={v => v}
+                                        required
+                                        autoFocus
+                                    />
+                                </Grid>
+                                <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.matnr.code"
+                                        source="code"
+                                        required
+                                        parse={v => v}
+                                    />
+                                </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <ReferenceInput
                                         source="rglar_id"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index 89a0a16..4fbb4bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -86,7 +86,7 @@
                 inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_SECTION.val);
             }
             if (Double.compare(safeQty, inspect.getDlyQty()) == 0) {
-                inspect.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
+//                inspect.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_DONE.val);
                 inspect.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
             }
             if (!qlyInspectService.updateById(inspect)) {

--
Gitblit v1.9.1