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; }