From a84a34374b9c9c1595a346519c59d142d8d75bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Jun 2026 18:54:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(qms):=20=E9=87=8D=E6=9E=84=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=B4=A8=E6=A3=80=E5=91=A8=E6=9C=9F=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 MaterialInspectionCycleVO 中的 Accessors 注解 - 在 PdiInspectionTaskCallbackQO 中新增物料编号字段 - 修改 QmsController 中的质检任务回调逻辑，按物料编号查询订单项 - 从 QmsQcMaterial 实体中移除有效期字段 validityPeriod - 从 QmsQcMaterialAddQO 中移除多个字段包括有效性期和质检周期相关字段 - 修改 QmsQcMaterialControllerService 中的实体创建和更新逻辑，移除无效字段设置 - 在 QmsQcMaterialExportDTO 中将有效期字段替换为质检周期1/2/3字段 - 更新 QmsQcMaterialMapper.xml 中的查询语句，移除有效期相关条件和排序 - 从 QmsQcMaterialSearchQO 中移除有效期字段 - 精简 QmsService 中的导入包，移除未使用的工具类和实体服务引用 --- .../QmsQcMaterialControllerService.java | 11 ------- .../pojo/dto/QmsQcMaterialExportDTO.java | 18 ++++++++-- .../pojo/qo/PdiInspectionTaskCallbackQO.java | 5 +++ .../common/pojo/qo/QmsQcMaterialAddQO.java | 33 ------------------- .../common/pojo/qo/QmsQcMaterialSearchQO.java | 5 --- .../pojo/vo/MaterialInspectionCycleVO.java | 1 - .../wms/repository/entity/QmsQcMaterial.java | 5 --- .../resources/mapper/QmsQcMaterialMapper.xml | 32 +++--------------- .../wms/scheduled/service/QmsService.java | 14 -------- .../srm/receive/controller/QmsController.java | 5 ++- 10 files changed, 28 insertions(+), 101 deletions(-) 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) -->