From b31f78c8303a482430a37a462429625ea828da0b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 27 Mar 2026 19:28:21 +0800 Subject: [PATCH] ✨ feat(mes): 更新质检标志字段，优化相关逻辑 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java | 29 +++++++++++++++++------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java | 16 ++++++++-------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 14 ++++++++------ yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml | 22 ++++++++++++---------- yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java | 18 +++++++++--------- yudao-module-mes/src/test/resources/sql/create_tables.sql | 6 +++--- 21 files changed, 72 insertions(+), 63 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java index b78f99b..e8ad969 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineRespVO.java @@ -47,7 +47,7 @@ public class MesWmOutsourceReceiptLineRespVO { private String lotNumber; @Schema(description = "是否需要质检") - private Boolean iqcCheck; + private Boolean iqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java index 254f360..01a25d8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/vo/line/MesWmOutsourceReceiptLineSaveReqVO.java @@ -42,7 +42,7 @@ public class MesWmOutsourceReceiptLineSaveReqVO { private String lotNumber; @Schema(description = "是否需要质检") - private Boolean iqcCheck; + private Boolean iqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java index 660c520..19eff65 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java @@ -41,7 +41,7 @@ public class MesWmProductSalesLineRespVO { private String batchCode; @Schema(description = "是否出厂检验", example = "true") - private Boolean oqcCheck; + private Boolean oqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java index 6c09059..8144ce3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java @@ -38,7 +38,7 @@ public class MesWmReturnIssueLineRespVO { private Long batchId; @Schema(description = "是否需要质检", example = "false") - private Boolean qcFlag; + private Boolean rqcCheckFlag; @Schema(description = "质量状态", example = "0") private Integer qualityStatus; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java index 93e7cbd..b634b86 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java @@ -32,7 +32,7 @@ public class MesWmReturnIssueLineSaveReqVO { @Schema(description = "是否需要质检", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @NotNull(message = "是否需要质检不能为空") - private Boolean qcFlag; + private Boolean rqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java index 2d056bf..cb07a44 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineRespVO.java @@ -46,7 +46,7 @@ public class MesWmReturnSalesLineRespVO { private Long rqcId; @Schema(description = "是否需要质检", example = "true") - private Boolean qcFlag; + private Boolean rqcCheckFlag; @Schema(description = "批次号", example = "B001") private String batchCode; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java index 7af1c2c..7184248 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java @@ -36,7 +36,7 @@ public class MesWmReturnSalesLineSaveReqVO { private Long batchId; @Schema(description = "是否需要质检", example = "true") - private Boolean qcFlag; + private Boolean rqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java index a6b483b..be8b280 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineRespVO.java @@ -41,7 +41,7 @@ public class MesWmSalesNoticeLineRespVO { private BigDecimal quantity; @Schema(description = "是否检验", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean oqcCheck; + private Boolean oqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java index 94faa68..d6ba341 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java @@ -35,7 +35,7 @@ public class MesWmSalesNoticeLineSaveReqVO { @Schema(description = "是否检验", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") @NotNull(message = "是否检验不能为空") - private Boolean oqcCheck; + private Boolean oqcCheckFlag; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java index 32a3afe..e52eb13 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java @@ -76,7 +76,7 @@ public class MesWmOutsourceReceiptLineDO extends BaseDO { /** * 是否需要质检 */ - private Boolean iqcCheck; + private Boolean iqcCheckFlag; /** * 质量状态 * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java index b0aaa26..50c6e0f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java @@ -56,7 +56,7 @@ public class MesWmProductSalesLineDO extends BaseDO { /** * 是否出厂检验 */ - private Boolean oqcCheck; + private Boolean oqcCheckFlag; /** * 出厂检验单 ID * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java index d04dedf..efbacae 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java @@ -58,7 +58,7 @@ public class MesWmReturnIssueLineDO extends BaseDO { /** * 是否需要质检 */ - private Boolean qcFlag; + private Boolean rqcCheckFlag; /** * 质量状态 * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java index b17b741..6354092 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java @@ -56,7 +56,7 @@ public class MesWmReturnSalesLineDO extends BaseDO { /** * 是否需要质检 */ - private Boolean qcFlag; + private Boolean rqcCheckFlag; /** * 质量状态 * diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java index 6ff5950..f56b0b6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeLineDO.java @@ -54,7 +54,7 @@ public class MesWmSalesNoticeLineDO extends BaseDO { /** * 是否检验 */ - private Boolean oqcCheck; + private Boolean oqcCheckFlag; /** * 备注 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java index d60aaf0..3e792de 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java @@ -37,12 +37,8 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei // 插入 MesWmOutsourceReceiptLineDO line = BeanUtils.toBean(createReqVO, MesWmOutsourceReceiptLineDO.class); - // 根据 iqcCheck 字段，设置 qualityStatus - if (line.getIqcCheck() != null && line.getIqcCheck()) { - line.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()); - } else { - line.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus()); - } + // 质量状态自动赋值 + line.setQualityStatus(calculateQualityStatus(line.getIqcCheckFlag())); lineMapper.insert(line); return line.getId(); } @@ -56,12 +52,8 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei // 更新 MesWmOutsourceReceiptLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmOutsourceReceiptLineDO.class); - // 根据 iqcCheck 字段，设置 qualityStatus - if (updateObj.getIqcCheck() != null && updateObj.getIqcCheck()) { - updateObj.setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()); - } else { - updateObj.setQualityStatus(MesWmQualityStatusEnum.PASS.getStatus()); - } + // 质量状态自动赋值 + updateObj.setQualityStatus(calculateQualityStatus(updateObj.getIqcCheckFlag())); lineMapper.updateById(updateObj); } @@ -109,4 +101,17 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei lineMapper.insert(line); } + /** + * 根据 iqcCheckFlag，计算质量状态 + * + * @param iqcCheckFlag 是否需要质检 + * @return 质量状态 + */ + private Integer calculateQualityStatus(Boolean iqcCheckFlag) { + if (Boolean.TRUE.equals(iqcCheckFlag)) { + return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检 + } + return MesWmQualityStatusEnum.PASS.getStatus(); // 不需检验，默认合格 + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java index 9395fd1..ac14e19 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java @@ -123,7 +123,7 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe Long salesId = currentLine.getSalesId(); List allLines = productSalesLineMapper.selectListBySalesId(salesId); boolean hasNg = CollectionUtils.anyMatch(allLines, - line -> Boolean.TRUE.equals(line.getOqcCheck()) + line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus())); if (hasNg) { log.info("[updateProductSalesLineWhenOqcFinish][销售出库单({}) 存在质检不合格行，取消出库单]", salesId); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java index 6b2fe57..ed228cd 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java @@ -51,7 +51,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ // 插入 MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class); // 质量状态自动赋值 - line.setQualityStatus(calculateQualityStatus(line.getQcFlag(), issue.getType())); + line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag(), issue.getType())); issueLineMapper.insert(line); return line.getId(); } @@ -68,7 +68,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ // 更新 MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class); // 质量状态自动赋值 - updateObj.setQualityStatus(calculateQualityStatus(updateObj.getQcFlag(), issue.getType())); + updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag(), issue.getType())); issueLineMapper.updateById(updateObj); } @@ -113,7 +113,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ public void updateReturnIssueQualityStatusByIssueId(Long issueId, Integer issueType) { List lines = issueLineMapper.selectListByIssueId(issueId); for (MesWmReturnIssueLineDO line : lines) { - Integer newStatus = calculateQualityStatus(line.getQcFlag(), issueType); + Integer newStatus = calculateQualityStatus(line.getRqcCheckFlag(), issueType); if (ObjUtil.notEqual(newStatus, line.getQualityStatus())) { issueLineMapper.updateById(new MesWmReturnIssueLineDO() .setId(line.getId()).setQualityStatus(newStatus)); @@ -122,14 +122,14 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ } /** - * 根据 qcFlag 和退料类型，计算质量状态 + * 根据 rqcCheckFlag 和退料类型，计算质量状态 * - * @param qcFlag 是否需要质检 + * @param rqcCheckFlag 是否需要质检 * @param issueType 退料类型 * @return 质量状态 */ - private Integer calculateQualityStatus(Boolean qcFlag, Integer issueType) { - if (Boolean.TRUE.equals(qcFlag)) { + private Integer calculateQualityStatus(Boolean rqcCheckFlag, Integer issueType) { + if (Boolean.TRUE.equals(rqcCheckFlag)) { return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检 } if (MesWmReturnIssueTypeEnum.REMAINDER.getType().equals(issueType)) { @@ -164,7 +164,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ .setQuantity(unqualifiedQuantity) .setBatchId(sourceLine.getBatchId()) .setRqcId(sourceLine.getRqcId()) - .setQcFlag(sourceLine.getQcFlag()) + .setRqcCheckFlag(sourceLine.getRqcCheckFlag()) .setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus()) .setRemark(sourceLine.getRemark()); issueLineMapper.insert(unqualifiedLine); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java index eee9b6d..95bda8d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java @@ -52,7 +52,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ // 插入 MesWmReturnSalesLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnSalesLineDO.class); - line.setQualityStatus(calculateQualityStatus(line.getQcFlag())); + // 质量状态自动赋值 + line.setQualityStatus(calculateQualityStatus(line.getRqcCheckFlag())); returnSalesLineMapper.insert(line); return line.getId(); } @@ -68,7 +69,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ // 更新 MesWmReturnSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnSalesLineDO.class); - updateObj.setQualityStatus(calculateQualityStatus(updateObj.getQcFlag())); + // 质量状态自动赋值 + updateObj.setQualityStatus(calculateQualityStatus(updateObj.getRqcCheckFlag())); returnSalesLineMapper.updateById(updateObj); } @@ -113,7 +115,7 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ public void updateQualityStatusByReturnId(Long returnId, Integer qualityStatus) { List lines = returnSalesLineMapper.selectListByReturnId(returnId); for (MesWmReturnSalesLineDO line : lines) { - Integer newStatus = calculateQualityStatus(line.getQcFlag()); + Integer newStatus = calculateQualityStatus(line.getRqcCheckFlag()); if (ObjUtil.notEqual(newStatus, line.getQualityStatus())) { returnSalesLineMapper.updateById(new MesWmReturnSalesLineDO() .setId(line.getId()).setQualityStatus(newStatus)); @@ -121,8 +123,8 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ } } - private Integer calculateQualityStatus(Boolean qcFlag) { - if (Boolean.TRUE.equals(qcFlag)) { + private Integer calculateQualityStatus(Boolean rqcCheckFlag) { + if (Boolean.TRUE.equals(rqcCheckFlag)) { return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检 } return MesWmQualityStatusEnum.PASS.getStatus(); // 不需检验，默认合格 @@ -167,7 +169,7 @@ public class MesWmReturnSalesLineServiceImpl implements MesWmReturnSalesLineServ .setQuantity(unqualifiedQuantity) .setBatchId(sourceLine.getBatchId()) .setRqcId(sourceLine.getRqcId()) - .setQcFlag(sourceLine.getQcFlag()) + .setRqcCheckFlag(sourceLine.getRqcCheckFlag()) .setQualityStatus(MesWmQualityStatusEnum.FAIL.getStatus()) .setRemark(sourceLine.getRemark()); returnSalesLineMapper.insert(unqualifiedLine); diff --git a/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml b/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml index cb01f7e..d03e4ff 100644 --- a/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml +++ b/yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml @@ -5,11 +5,11 @@