From 0e1a3c460d3e9a4a31d8405fdd86ecdb52d36379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 20 Apr 2026 15:38:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor(qms):=20=E7=B2=BE=E7=AE=80=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=A0=87=E5=87=86=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 QmsInspectionStandardAddQO 中的图纸URL、包装方式ID和检验周期字段
- 注释掉 QmsInspectionStandardControllerService 中相关字段的赋值操作
- 修改 QmsInspectionStandardEditQO，去除继承关系，重新添加相关字段
- 在 QmsInspectionStandardEditQO 中添加物料ID字段，保证完整的检验标准编辑参数
---
 ...msInspectionStandardControllerService.java |  6 ++---
 .../pojo/qo/QmsInspectionStandardAddQO.java   | 15 -----------
 .../pojo/qo/QmsInspectionStandardEditQO.java  | 25 ++++++++++++++++---
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
index c24c0ba5..c529fb5f 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
@@ -259,10 +259,10 @@ public class QmsInspectionStandardControllerService {
 
         QmsInspectionStandard standard = new QmsInspectionStandard();
         standard.setMaterialId(qo.getMaterialId());
-        standard.setDrawingUrl(qo.getDrawingUrl());
+//        standard.setDrawingUrl(qo.getDrawingUrl());
 //        standard.setVersion(versionNo);
-        standard.setPackagingMethodId(qo.getPackagingMethodId());
-        standard.setInspectionCycle(qo.getInspectionCycle());
+//        standard.setPackagingMethodId(qo.getPackagingMethodId());
+//        standard.setInspectionCycle(qo.getInspectionCycle());
         // 默认值
         standard.setIsEnabled(true);
         standard.setPublishStatus((short) 0);
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardAddQO.java
index ff1b1c99..27834081 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardAddQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardAddQO.java
@@ -14,19 +14,4 @@ public class QmsInspectionStandardAddQO {
      */
     @NotNull(message = "物料ID不能为空")
     private Long materialId;
-
-    /**
-     * 图纸URL
-     */
-    private String drawingUrl;
-
-    /**
-     * 包装方式ID
-     */
-    private Long packagingMethodId;
-
-    /**
-     * 检验周期
-     */
-    private Integer inspectionCycle;
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java
index 5463dbf5..ff327b3f 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsInspectionStandardEditQO.java
@@ -3,14 +3,12 @@ package com.nflg.wms.common.pojo.qo;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * 检验标准编辑参数
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
+public class QmsInspectionStandardEditQO {
 
     /**
      * 检验标准ID
@@ -18,6 +16,12 @@ public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
     @NotNull(message = "检验标准ID不能为空")
     private Long id;
 
+    /**
+     * 物料ID
+     */
+    @NotNull(message = "物料ID不能为空")
+    private Long materialId;
+
     /**
      * 版本号
      */
@@ -29,4 +33,19 @@ public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
      */
     @NotNull
     private Boolean isEnabled;
+
+    /**
+     * 图纸URL
+     */
+    private String drawingUrl;
+
+    /**
+     * 包装方式ID
+     */
+    private Long packagingMethodId;
+
+    /**
+     * 检验周期
+     */
+    private Integer inspectionCycle;
 }