diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java index eab8da2b..3ab99639 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java @@ -42,11 +42,11 @@ public class QmsInspectionStandardSaveQO { */ private String drawingUrl; - /** - * 包装方式ID - */ - @NotNull - private Long packagingMethodId; +// /** +// * 包装方式ID +// */ +// @NotNull +// private Long packagingMethodId; /** * 检验周期 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 5da1ed31..2e765b93 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 @@ -639,7 +639,7 @@ public class QmsInspectionStandardControllerService { // 3. 更新字段(不修改版本号) standard.setMaterialId(qo.getMaterialId()); standard.setDrawingUrl(qo.getDrawingUrl()); - standard.setPackagingMethodId(qo.getPackagingMethodId()); +// standard.setPackagingMethodId(qo.getPackagingMethodId()); standard.setInspectionCycle(qo.getInspectionCycle()); standard.setVersion(qo.getVersion()); standard.setIsEnabled(qo.getIsEnabled()); @@ -702,7 +702,7 @@ public class QmsInspectionStandardControllerService { QmsInspectionStandard newStandard = new QmsInspectionStandard(); newStandard.setMaterialId(qo.getMaterialId()); newStandard.setDrawingUrl(qo.getDrawingUrl()); - newStandard.setPackagingMethodId(qo.getPackagingMethodId()); +// newStandard.setPackagingMethodId(qo.getPackagingMethodId()); newStandard.setInspectionCycle(qo.getInspectionCycle()); newStandard.setVersion(qo.getVersion()); newStandard.setIsEnabled(qo.getIsEnabled());