diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java index b40f096f..ee1c5449 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java @@ -153,7 +153,6 @@ public class QmsQcMaterialControllerService { QmsQcMaterial entity = new QmsQcMaterial() .setMaterialNo(request.getMaterialNo()) .setMaterialDesc(request.getMaterialDesc()) - .setMaterialDescIsUpgrade(request.getMaterialDescIsUpgrade() != null ? request.getMaterialDescIsUpgrade() : false) .setMaterialCategoryCode(request.getMaterialCategoryCode()) .setMaterialCategoryCodePathName(categoryPathName) .setDrawingNo(request.getDrawingNo()) @@ -161,11 +160,6 @@ public class QmsQcMaterialControllerService { .setMaterialName(request.getMaterialName()) .setMaterialTexture(request.getMaterialTexture()) .setMaterialSpecifications(request.getMaterialSpecifications()) - .setValidityPeriod(request.getValidityPeriod()) - .setIsStandardMaintained(request.getIsStandardMaintained() != null ? request.getIsStandardMaintained() : false) - .setInspectionCycle1(request.getInspectionCycle1()) - .setInspectionCycle2(request.getInspectionCycle2()) - .setInspectionCycle3(request.getInspectionCycle3()) .setCreatedType(0) .setCreateBy(userId) .setCreateByName(operator) @@ -238,9 +232,6 @@ public class QmsQcMaterialControllerService { if (request.getMaterialSpecifications() != null) { updateChain.set(QmsQcMaterial::getMaterialSpecifications, request.getMaterialSpecifications()); } - if (request.getValidityPeriod() != null) { - updateChain.set(QmsQcMaterial::getValidityPeriod, request.getValidityPeriod()); - } // 更新规则是否已维护 if (request.getIsStandardMaintained() != null) { updateChain.set(QmsQcMaterial::getIsStandardMaintained, request.getIsStandardMaintained()); @@ -370,7 +361,6 @@ public class QmsQcMaterialControllerService { .setMaterialName(dto.getMaterialName()) .setMaterialTexture(dto.getMaterialTexture()) .setMaterialSpecifications(dto.getMaterialSpecifications()) - .setValidityPeriod(dto.getValidityPeriod()) .setIsStandardMaintained(false) .setCreatedType(0) .setCreateBy(userId) @@ -391,7 +381,6 @@ public class QmsQcMaterialControllerService { .set(QmsQcMaterial::getMaterialName, dto.getMaterialName()) .set(QmsQcMaterial::getMaterialTexture, dto.getMaterialTexture()) .set(QmsQcMaterial::getMaterialSpecifications, dto.getMaterialSpecifications()) - .set(QmsQcMaterial::getValidityPeriod, dto.getValidityPeriod()) .set(QmsQcMaterial::getUpdateBy, userId) .set(QmsQcMaterial::getUpdateByName, operator) .set(QmsQcMaterial::getUpdateTime, now) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsQcMaterialExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsQcMaterialExportDTO.java index 3db74803..793807c2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsQcMaterialExportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsQcMaterialExportDTO.java @@ -66,10 +66,22 @@ public class QmsQcMaterialExportDTO { private String materialSpecifications; /** - * Validity period in months. + * 质检周期1（单位为月） */ - @ExcelColumn("有效周期(月)") - private Short validityPeriod; + @ExcelColumn("质检周期1") + private Integer inspectionCycle1; + + /** + * 质检周期2（单位为月） + */ + @ExcelColumn("质检周期2") + private Integer inspectionCycle2; + + /** + * 质检周期3（单位为月） + */ + @ExcelColumn("质检周期3") + private Integer inspectionCycle3; /** * 规则是否已维护 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java index 98b0a735..36e37db3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java @@ -11,6 +11,11 @@ public class PdiInspectionTaskCallbackQO { */ private String orderNo; + /** + * 物料编号 + */ + private String materialNo; + /** * 质检是否合格 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialAddQO.java index 5618bde8..7e1e753c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialAddQO.java @@ -21,11 +21,6 @@ public class QmsQcMaterialAddQO { */ private String materialDesc; - /** - * 描述是否变更：false=未变更，true=已变更 - */ - private Boolean materialDescIsUpgrade; - /** * 物料类别编码 */ @@ -56,32 +51,4 @@ public class QmsQcMaterialAddQO { * 物料规格 */ private String materialSpecifications; - - /** - * Validity period in months. - */ - private Short validityPeriod; - - /** - * 规则是否已维护：false=未维护，true=已维护 - */ - private Boolean isStandardMaintained; - - /** - * 质检周期1（单位为月） - */ - @NotNull(message = "质检周期1不能为空") - private Integer inspectionCycle1; - - /** - * 质检周期2（单位为月） - */ - @NotNull(message = "质检周期2不能为空") - private Integer inspectionCycle2; - - /** - * 质检周期3（单位为月） - */ - @NotNull(message = "质检周期3不能为空") - private Integer inspectionCycle3; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java index b0f1d51f..d0f66397 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQcMaterialSearchQO.java @@ -66,11 +66,6 @@ public class QmsQcMaterialSearchQO extends PageQO { */ private String materialSpecifications; - /** - * Validity period in months. - */ - private Short validityPeriod; - /** * 规则是否已维护（精确匹配）：false=未维护，true=已维护 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/MaterialInspectionCycleVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/MaterialInspectionCycleVO.java index 976fe444..eb009873 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/MaterialInspectionCycleVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/MaterialInspectionCycleVO.java @@ -3,7 +3,6 @@ package com.nflg.wms.common.pojo.vo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; @Data @AllArgsConstructor diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQcMaterial.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQcMaterial.java index 1b93244a..ec8221b0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQcMaterial.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQcMaterial.java @@ -81,11 +81,6 @@ public class QmsQcMaterial implements Serializable { */ private String materialSpecifications; - /** - * Validity period in months. - */ - private Short validityPeriod; - /** * 规则是否已维护：false=未维护，true=已维护 */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml index 35c43d8c..1eb3ca27 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsQcMaterialMapper.xml @@ -11,25 +11,7 @@ 、创建时间范围(createTimeStart/createTimeEnd)、修改人模糊(updateByName)、修改时间范围(updateTimeStart/updateTimeEnd) -->