From 2983114f73d6cdf542667a302920033e65989d9e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 23 Feb 2026 17:23:16 +0800 Subject: [PATCH] ♻️ refactor(mes): 重命名质量管理相关包路径 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defectrecord/MesQcDefectRecordDO.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicatorresult/MesQcIndicatorResultDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcDO.java | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcLineDO.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcDO.java | 207 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcLineDO.java | 110 -------------------------------------------------------------------------------------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcLineMapper.java | 35 +++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java | 36 ++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcLineMapper.java | 35 ----------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcMapper.java | 36 ------------------------------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java | 4 ++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineService.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineService.java | 73 ------------------------------------------------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineServiceImpl.java | 113 ----------------------------------------------------------------------------------------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcService.java | 90 ------------------------------------------------------------------------------------------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcServiceImpl.java | 253 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 22 files changed, 926 insertions(+), 926 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcLineDO.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcDO.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcLineDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcLineMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcLineMapper.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineService.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineServiceImpl.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcService.java delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defectrecord/MesQcDefectRecordDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defectrecord/MesQcDefectRecordDO.java index 3a5fcb5..7426151 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defectrecord/MesQcDefectRecordDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defectrecord/MesQcDefectRecordDO.java @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcLineDO; import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicatorresult/MesQcIndicatorResultDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicatorresult/MesQcIndicatorResultDO.java index 010ce21..7feb5a6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicatorresult/MesQcIndicatorResultDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/indicatorresult/MesQcIndicatorResultDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcDO.java new file mode 100644 index 0000000..2ff9dda --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcDO.java @@ -0,0 +1,207 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcSourceDocTypeEnum; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * MES 来料检验单（IQC, Incoming Quality Control） DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_iqc") +@KeySequence("mes_qc_iqc_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcIqcDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 检验单编号 + */ + private String code; + /** + * 检验单名称 + */ + private String name; + /** + * 检验模板 ID + * + * 关联 {@link MesQcTemplateDO#getId()} + */ + private Long templateId; + + // ========== 来源单据 ========== + + /** + * 来源单据类型 + * + * 枚举 {@link MesQcSourceDocTypeEnum} + */ + private Integer sourceDocType; + /** + * 来源单据 ID + * + * 关联：根据 {@link #sourceDocType} 不同： + * 1. {@link MesQcSourceDocTypeEnum#ARRIVAL_NOTICE} 时，关联 {@link MesWmArrivalNoticeDO#getId()} + */ + private Long sourceDocId; + /** + * 来源单据行 ID + * + * 关联：根据 {@link #sourceDocType} 不同： + * 1. {@link MesQcSourceDocTypeEnum#ARRIVAL_NOTICE} 时，关联 {@link MesWmArrivalNoticeLineDO#getId()} + */ + private Long sourceLineId; + + // ========== 供应商 ========== + + /** + * 供应商 ID + * + * 关联 {@link MesMdVendorDO#getId()} + */ + private Long vendorId; + /** + * 供应商批次号 + */ + private String vendorBatch; + + // ========== 物料 ========== + + /** + * 产品物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + + // ========== 数量 ========== + + /** + * 最低检测数 + */ + private Integer minCheckQuantity; + /** + * 最大不合格数 + */ + private Integer maxUnqualifiedQuantity; + /** + * 本次接收数量 + */ + private BigDecimal receivedQuantity; + /** + * 本次检测数量 + */ + private BigDecimal checkQuantity; + /** + * 合格品数量 + */ + private BigDecimal qualifiedQuantity; + /** + * 不合格品数量 + */ + private BigDecimal unqualifiedQuantity; + + // ========== 缺陷统计 ========== + + /** + * 致命缺陷率（%） + */ + private BigDecimal criticalRate; + /** + * 严重缺陷率（%） + */ + private BigDecimal majorRate; + /** + * 轻微缺陷率（%） + */ + private BigDecimal minorRate; + /** + * 致命缺陷数量 + */ + private Integer criticalQuantity; + /** + * 严重缺陷数量 + */ + private Integer majorQuantity; + /** + * 轻微缺陷数量 + */ + private Integer minorQuantity; + + // ========== 检验 ========== + + /** + * 检测结果 + * + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum} + */ + private Integer checkResult; + /** + * 来料日期 + */ + private LocalDateTime receiveDate; + /** + * 检测日期 + */ + private LocalDateTime inspectDate; + /** + * 检测人员 + */ + /** + * 检测人员用户 ID + * + * 关联 AdminUserDO 的 id + */ + private Long inspectorUserId; + /** + * 状态 + * + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcIqcStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + + // ========== 预留字段 ========== + + /** + * 预留字段 1 + */ + private String attribute1; + /** + * 预留字段 2 + */ + private String attribute2; + /** + * 预留字段 3 + */ + private Integer attribute3; + /** + * 预留字段 4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcLineDO.java new file mode 100644 index 0000000..abc3736 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/iqc/MesQcIqcLineDO.java @@ -0,0 +1,110 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; + +/** + * MES 来料检验单行 DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_iqc_line") +@KeySequence("mes_qc_iqc_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcIqcLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 来料检验单 ID + * + * 关联 {@link MesQcIqcDO#getId()} + */ + private Long iqcId; + /** + * 检测指标 ID + * + * 关联 {@link MesQcIndicatorDO#getId()} + */ + private Long indicatorId; + /** + * 检测工具 ID + * + * 关联 {@link MesTmToolDO#getId()} + */ + private Long toolId; + /** + * 检测方法 + */ + private String checkMethod; + /** + * 标准值 + */ + private BigDecimal standardValue; + /** + * 计量单位 ID + * + * 关联 {@link MesMdUnitMeasureDO#getId()} + */ + private Long unitMeasureId; + /** + * 误差上限 + */ + private BigDecimal maxThreshold; + /** + * 误差下限 + */ + private BigDecimal minThreshold; + /** + * 致命缺陷数量 + */ + private Integer criticalQuantity; + /** + * 严重缺陷数量 + */ + private Integer majorQuantity; + /** + * 轻微缺陷数量 + */ + private Integer minorQuantity; + /** + * 备注 + */ + private String remark; + + // ========== 预留字段 ========== + + /** + * 预留字段 1 + */ + private String attribute1; + /** + * 预留字段 2 + */ + private String attribute2; + /** + * 预留字段 3 + */ + private Integer attribute3; + /** + * 预留字段 4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcDO.java deleted file mode 100644 index 2dd4372..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcDO.java +++ /dev/null @@ -1,207 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO; -import cn.iocoder.yudao.module.mes.enums.qc.MesQcSourceDocTypeEnum; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * MES 来料检验单（IQC, Incoming Quality Control） DO - * - * @author 芋道源码 - */ -@TableName("mes_qc_iqc") -@KeySequence("mes_qc_iqc_seq") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MesQcIqcDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 检验单编号 - */ - private String code; - /** - * 检验单名称 - */ - private String name; - /** - * 检验模板 ID - * - * 关联 {@link MesQcTemplateDO#getId()} - */ - private Long templateId; - - // ========== 来源单据 ========== - - /** - * 来源单据类型 - * - * 枚举 {@link MesQcSourceDocTypeEnum} - */ - private Integer sourceDocType; - /** - * 来源单据 ID - * - * 关联：根据 {@link #sourceDocType} 不同： - * 1. {@link MesQcSourceDocTypeEnum#ARRIVAL_NOTICE} 时，关联 {@link MesWmArrivalNoticeDO#getId()} - */ - private Long sourceDocId; - /** - * 来源单据行 ID - * - * 关联：根据 {@link #sourceDocType} 不同： - * 1. {@link MesQcSourceDocTypeEnum#ARRIVAL_NOTICE} 时，关联 {@link MesWmArrivalNoticeLineDO#getId()} - */ - private Long sourceLineId; - - // ========== 供应商 ========== - - /** - * 供应商 ID - * - * 关联 {@link MesMdVendorDO#getId()} - */ - private Long vendorId; - /** - * 供应商批次号 - */ - private String vendorBatch; - - // ========== 物料 ========== - - /** - * 产品物料 ID - * - * 关联 {@link MesMdItemDO#getId()} - */ - private Long itemId; - - // ========== 数量 ========== - - /** - * 最低检测数 - */ - private Integer minCheckQuantity; - /** - * 最大不合格数 - */ - private Integer maxUnqualifiedQuantity; - /** - * 本次接收数量 - */ - private BigDecimal receivedQuantity; - /** - * 本次检测数量 - */ - private BigDecimal checkQuantity; - /** - * 合格品数量 - */ - private BigDecimal qualifiedQuantity; - /** - * 不合格品数量 - */ - private BigDecimal unqualifiedQuantity; - - // ========== 缺陷统计 ========== - - /** - * 致命缺陷率（%） - */ - private BigDecimal criticalRate; - /** - * 严重缺陷率（%） - */ - private BigDecimal majorRate; - /** - * 轻微缺陷率（%） - */ - private BigDecimal minorRate; - /** - * 致命缺陷数量 - */ - private Integer criticalQuantity; - /** - * 严重缺陷数量 - */ - private Integer majorQuantity; - /** - * 轻微缺陷数量 - */ - private Integer minorQuantity; - - // ========== 检验 ========== - - /** - * 检测结果 - * - * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum} - */ - private Integer checkResult; - /** - * 来料日期 - */ - private LocalDateTime receiveDate; - /** - * 检测日期 - */ - private LocalDateTime inspectDate; - /** - * 检测人员 - */ - /** - * 检测人员用户 ID - * - * 关联 AdminUserDO 的 id - */ - private Long inspectorUserId; - /** - * 状态 - * - * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcIqcStatusEnum} - */ - private Integer status; - /** - * 备注 - */ - private String remark; - - // ========== 预留字段 ========== - - /** - * 预留字段 1 - */ - private String attribute1; - /** - * 预留字段 2 - */ - private String attribute2; - /** - * 预留字段 3 - */ - private Integer attribute3; - /** - * 预留字段 4 - */ - private Integer attribute4; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcLineDO.java deleted file mode 100644 index 1fd6c9b..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/lqc/MesQcIqcLineDO.java +++ /dev/null @@ -1,110 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc; - -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -import java.math.BigDecimal; - -/** - * MES 来料检验单行 DO - * - * @author 芋道源码 - */ -@TableName("mes_qc_iqc_line") -@KeySequence("mes_qc_iqc_line_seq") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MesQcIqcLineDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 来料检验单 ID - * - * 关联 {@link MesQcIqcDO#getId()} - */ - private Long iqcId; - /** - * 检测指标 ID - * - * 关联 {@link MesQcIndicatorDO#getId()} - */ - private Long indicatorId; - /** - * 检测工具 ID - * - * 关联 {@link MesTmToolDO#getId()} - */ - private Long toolId; - /** - * 检测方法 - */ - private String checkMethod; - /** - * 标准值 - */ - private BigDecimal standardValue; - /** - * 计量单位 ID - * - * 关联 {@link MesMdUnitMeasureDO#getId()} - */ - private Long unitMeasureId; - /** - * 误差上限 - */ - private BigDecimal maxThreshold; - /** - * 误差下限 - */ - private BigDecimal minThreshold; - /** - * 致命缺陷数量 - */ - private Integer criticalQuantity; - /** - * 严重缺陷数量 - */ - private Integer majorQuantity; - /** - * 轻微缺陷数量 - */ - private Integer minorQuantity; - /** - * 备注 - */ - private String remark; - - // ========== 预留字段 ========== - - /** - * 预留字段 1 - */ - private String attribute1; - /** - * 预留字段 2 - */ - private String attribute2; - /** - * 预留字段 3 - */ - private Integer attribute3; - /** - * 预留字段 4 - */ - private Integer attribute4; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java index 75ec525..607d0b8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/arrivalnotice/MesWmArrivalNoticeLineDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java index 26b4ddf..900a9bb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/itemreceipt/MesWmItemReceiptDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcLineMapper.java new file mode 100644 index 0000000..d238845 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcLineMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.iqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 来料检验单行 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcIqcLineMapper extends BaseMapperX { + + default PageResult selectPage(MesQcIqcLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesQcIqcLineDO::getIqcId, reqVO.getIqcId()) + .orderByAsc(MesQcIqcLineDO::getId)); + } + + default List selectListByIqcId(Long iqcId) { + return selectList(MesQcIqcLineDO::getIqcId, iqcId); + } + + default void deleteByIqcId(Long iqcId) { + delete(new LambdaQueryWrapperX() + .eq(MesQcIqcLineDO::getIqcId, iqcId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java new file mode 100644 index 0000000..c8c7753 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/iqc/MesQcIqcMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.iqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 来料检验单（IQC） Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcIqcMapper extends BaseMapperX { + + default PageResult selectPage(MesQcIqcPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesQcIqcDO::getCode, reqVO.getCode()) + .eqIfPresent(MesQcIqcDO::getVendorId, reqVO.getVendorId()) + .likeIfPresent(MesQcIqcDO::getVendorBatch, reqVO.getVendorBatch()) + .eqIfPresent(MesQcIqcDO::getItemId, reqVO.getItemId()) + .eqIfPresent(MesQcIqcDO::getCheckResult, reqVO.getCheckResult()) + .eqIfPresent(MesQcIqcDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesQcIqcDO::getReceiveDate, reqVO.getReceiveDate()) + .betweenIfPresent(MesQcIqcDO::getInspectDate, reqVO.getInspectDate()) + .eqIfPresent(MesQcIqcDO::getInspectorUserId, reqVO.getInspectorUserId()) + .orderByDesc(MesQcIqcDO::getId)); + } + + default MesQcIqcDO selectByCode(String code) { + return selectOne(MesQcIqcDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcLineMapper.java deleted file mode 100644 index 70a2618..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcLineMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.qc.lqc; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcLineDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * MES 来料检验单行 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface MesQcIqcLineMapper extends BaseMapperX { - - default PageResult selectPage(MesQcIqcLinePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesQcIqcLineDO::getIqcId, reqVO.getIqcId()) - .orderByAsc(MesQcIqcLineDO::getId)); - } - - default List selectListByIqcId(Long iqcId) { - return selectList(MesQcIqcLineDO::getIqcId, iqcId); - } - - default void deleteByIqcId(Long iqcId) { - delete(new LambdaQueryWrapperX() - .eq(MesQcIqcLineDO::getIqcId, iqcId)); - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcMapper.java deleted file mode 100644 index 384f088..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/lqc/MesQcIqcMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.mes.dal.mysql.qc.lqc; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * MES 来料检验单（IQC） Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface MesQcIqcMapper extends BaseMapperX { - - default PageResult selectPage(MesQcIqcPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MesQcIqcDO::getCode, reqVO.getCode()) - .eqIfPresent(MesQcIqcDO::getVendorId, reqVO.getVendorId()) - .likeIfPresent(MesQcIqcDO::getVendorBatch, reqVO.getVendorBatch()) - .eqIfPresent(MesQcIqcDO::getItemId, reqVO.getItemId()) - .eqIfPresent(MesQcIqcDO::getCheckResult, reqVO.getCheckResult()) - .eqIfPresent(MesQcIqcDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MesQcIqcDO::getReceiveDate, reqVO.getReceiveDate()) - .betweenIfPresent(MesQcIqcDO::getInspectDate, reqVO.getInspectDate()) - .eqIfPresent(MesQcIqcDO::getInspectorUserId, reqVO.getInspectorUserId()) - .orderByDesc(MesQcIqcDO::getId)); - } - - default MesQcIqcDO selectByCode(String code) { - return selectOne(MesQcIqcDO::getCode, code); - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java index 268e4fb..2deeeef 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java @@ -9,8 +9,8 @@ import cn.iocoder.yudao.module.mes.dal.mysql.qc.defectrecord.MesQcDefectRecordMa import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcLineService; import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService; -import cn.iocoder.yudao.module.mes.service.qc.lqc.MesQcIqcLineService; -import cn.iocoder.yudao.module.mes.service.qc.lqc.MesQcIqcService; +import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcLineService; +import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService; import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcLineService; import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService; import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcLineService; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java index 98b3cf1..f6c3c1d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcIndicatorResultServiceImpl.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.qc.indicatorresult.vo.MesQcIndicatorResultPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.qc.indicatorresult.vo.MesQcIndicatorResultSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDetailDO; import cn.iocoder.yudao.module.mes.dal.mysql.qc.indicatorresult.MesQcIndicatorResultDetailMapper; @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO; import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO; import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService; -import cn.iocoder.yudao.module.mes.service.qc.lqc.MesQcIqcService; +import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService; import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService; import cn.iocoder.yudao.module.mes.service.qc.rqc.MesQcRqcService; import jakarta.annotation.Resource; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineService.java new file mode 100644 index 0000000..c1c5aa3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineService.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.service.qc.iqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcLineDO; + +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; + +import java.util.List; + +/** + * MES 来料检验单行 Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcIqcLineService { + + /** + * 校验来料检验行存在 + * + * @param id 编号 + * @return 来料检验行 + */ + MesQcIqcLineDO validateIqcLineExists(Long id); + + /** + * 获得来料检验行 + * + * @param id 编号 + * @return 来料检验行 + */ + MesQcIqcLineDO getIqcLine(Long id); + + /** + * 获得来料检验行分页 + * + * @param pageReqVO 分页查询 + * @return 来料检验行分页 + */ + PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO); + + /** + * 从模板指标自动生成检验行 + * + * @param iqcId 来料检验单 ID + * @param templateId 模板 ID + */ + void createLinesFromTemplate(Long iqcId, Long templateId); + + /** + * 根据缺陷记录重新计算各行的缺陷统计数量 + * + * @param iqcId 来料检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateLineDefectStats(Long iqcId, List records); + + /** + * 根据来料检验单 ID 获取所有行 + * + * @param iqcId 来料检验单 ID + * @return 行列表 + */ + List getIqcLineListByIqcId(Long iqcId); + + /** + * 根据来料检验单 ID 级联删除所有行 + * + * @param iqcId 来料检验单 ID + */ + void deleteByIqcId(Long iqcId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java new file mode 100644 index 0000000..597dbaa --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcLineServiceImpl.java @@ -0,0 +1,113 @@ +package cn.iocoder.yudao.module.mes.service.qc.iqc; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.iqc.MesQcIqcLineMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.template.MesQcTemplateIndicatorMapper; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 来料检验单行 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcIqcLineServiceImpl implements MesQcIqcLineService { + + @Resource + private MesQcIqcLineMapper iqcLineMapper; + @Resource + private MesQcTemplateIndicatorMapper templateIndicatorMapper; + + @Override + public MesQcIqcLineDO validateIqcLineExists(Long id) { + MesQcIqcLineDO line = iqcLineMapper.selectById(id); + if (line == null) { + throw exception(QC_IQC_LINE_NOT_EXISTS); + } + return line; + } + + @Override + public MesQcIqcLineDO getIqcLine(Long id) { + return iqcLineMapper.selectById(id); + } + + @Override + public PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO) { + return iqcLineMapper.selectPage(pageReqVO); + } + + @Override + public void createLinesFromTemplate(Long iqcId, Long templateId) { + List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); + List lines = convertList(indicators, indicator -> new MesQcIqcLineDO() + .setIqcId(iqcId).setIndicatorId(indicator.getIndicatorId()) + .setToolId(null) // TODO @芋艿：模板指标暂无 toolId，后续可扩展 + .setCheckMethod(indicator.getCheckMethod()) + .setStandardValue(indicator.getStandardValue()).setUnitMeasureId(indicator.getUnitMeasureId()) + .setMaxThreshold(indicator.getThresholdMax()).setMinThreshold(indicator.getThresholdMin()) + .setCriticalQuantity(0).setMajorQuantity(0).setMinorQuantity(0)); + iqcLineMapper.insertBatch(lines); + } + + @Override + public void recalculateLineDefectStats(Long iqcId, List records) { + List lines = iqcLineMapper.selectListByIqcId(iqcId); + if (CollUtil.isEmpty(lines)) { + return; + } + List updateLines = new ArrayList<>(lines.size()); + for (MesQcIqcLineDO line : lines) { + int critical = 0, major = 0, minor = 0; + for (MesQcDefectRecordDO record : records) { + if (ObjUtil.notEqual(record.getLineId(), line.getId())) { + continue; + } + int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1); + if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) { + critical += quantity; + } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MAJOR.getType())) { + major += quantity; + } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MINOR.getType())) { + minor += quantity; + } else { + throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN); + } + } + updateLines.add(new MesQcIqcLineDO().setId(line.getId()) + .setCriticalQuantity(critical).setMajorQuantity(major).setMinorQuantity(minor)); + } + for (MesQcIqcLineDO updateLine : updateLines) { + iqcLineMapper.updateById(updateLine); + } + } + + @Override + public List getIqcLineListByIqcId(Long iqcId) { + return iqcLineMapper.selectListByIqcId(iqcId); + } + + @Override + public void deleteByIqcId(Long iqcId) { + iqcLineMapper.deleteByIqcId(iqcId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java new file mode 100644 index 0000000..d2619d4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcService.java @@ -0,0 +1,90 @@ +package cn.iocoder.yudao.module.mes.service.qc.iqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; +import jakarta.validation.Valid; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * MES 来料检验单（IQC） Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcIqcService { + + /** + * 创建来料检验单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIqc(@Valid MesQcIqcSaveReqVO createReqVO); + + /** + * 更新来料检验单 + * + * @param updateReqVO 更新信息 + */ + void updateIqc(@Valid MesQcIqcSaveReqVO updateReqVO); + + /** + * 完成来料检验单 + * + * @param id 编号 + */ + void completeIqc(Long id); + + /** + * 删除来料检验单 + * + * @param id 编号 + */ + void deleteIqc(Long id); + + /** + * 校验来料检验单存在 + * + * @param id 编号 + * @return 来料检验单 + */ + MesQcIqcDO validateIqcExists(Long id); + + /** + * 获得来料检验单 + * + * @param id 编号 + * @return 来料检验单 + */ + MesQcIqcDO getIqc(Long id); + + /** + * 获得来料检验单分页 + * + * @param pageReqVO 分页查询 + * @return 来料检验单分页 + */ + PageResult getIqcPage(MesQcIqcPageReqVO pageReqVO); + + /** + * 根据缺陷记录重新计算主表的缺陷统计（含行级下沉） + * + * @param iqcId 来料检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateDefectStats(Long iqcId, List records); + + /** + * 批量获取来料检验单 Map + * + * @param ids 编号集合 + * @return 来料检验单 Map + */ + Map getIqcMap(Collection ids); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java new file mode 100644 index 0000000..108cbd7 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java @@ -0,0 +1,253 @@ +package cn.iocoder.yudao.module.mes.service.qc.iqc; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.iqc.MesQcIqcMapper; +import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcIqcStatusEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; +import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; +import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService; +import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.*; + +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 来料检验单（IQC） Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcIqcServiceImpl implements MesQcIqcService { + + @Resource + private MesQcIqcMapper iqcMapper; + @Resource + private MesQcTemplateService templateService; + + @Resource + private MesQcIqcLineService iqcLineService; + @Resource + private MesQcDefectRecordService defectRecordService; + @Resource + private MesWmArrivalNoticeService arrivalNoticeService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createIqc(MesQcIqcSaveReqVO createReqVO) { + // 1.1 校验编号唯一 + validateIqcCodeUnique(null, createReqVO.getCode()); + // 1.2 查找物料关联的 IQC 检测模板 + Long templateId = createReqVO.getTemplateId(); + MesQcTemplateDO template = templateService.validateTemplateExists(templateId); + if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.IQC.getType())) { + throw exception(QC_IQC_NO_TEMPLATE); + } + + // 3.1 从模板的产品关联中获取检测参数（min_check_quantity、max_unqualified_quantity） + MesQcTemplateItemDO templateItem = templateService.getTemplateItemByTemplateIdAndItemId( + templateId, createReqVO.getItemId()); + if (templateItem != null) { + if (createReqVO.getMinCheckQuantity() == null) { + createReqVO.setMinCheckQuantity(templateItem.getQuantityCheck()); + } + if (createReqVO.getMaxUnqualifiedQuantity() == null) { + createReqVO.setMaxUnqualifiedQuantity(templateItem.getQuantityUnqualified()); + } + } + // 3.2 插入主表 + MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class); + iqc.setStatus(MesQcIqcStatusEnum.PREPARE.getType()); + iqcMapper.insert(iqc); + + // 4. 从模板指标自动生成检验行 + iqcLineService.createLinesFromTemplate(iqc.getId(), templateId); + return iqc.getId(); + } + + @Override + public void updateIqc(MesQcIqcSaveReqVO updateReqVO) { + // 1.1 校验存在 + 草稿状态 + validateIqcStatusPrepare(updateReqVO.getId()); + // 1.2 校验编号唯一 + validateIqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 2. 更新 + MesQcIqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIqcDO.class); + iqcMapper.updateById(updateObj); + } + + @Override + public void completeIqc(Long id) { + // 1.1 校验存在 + 草稿状态 + MesQcIqcDO iqc = validateIqcStatusPrepare(id); + // 1.2 校验合格品 + 不合格品 = 检测数量 + if (iqc.getCheckQuantity() != null && iqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { + BigDecimal total = ObjUtil.defaultIfNull(iqc.getQualifiedQuantity(), BigDecimal.ZERO) + .add(ObjUtil.defaultIfNull(iqc.getUnqualifiedQuantity(), BigDecimal.ZERO)); + if (total.compareTo(iqc.getCheckQuantity()) != 0) { + throw exception(QC_IQC_QUANTITY_MISMATCH); + } + } + + // 2. 更新状态为已完成 + MesQcIqcDO updateObj = new MesQcIqcDO() + .setId(id).setStatus(MesQcIqcStatusEnum.FINISHED.getType()); + iqcMapper.updateById(updateObj); + + // 3. 回写来源单据 + writeBackSourceDoc(iqc); + } + + /** + * 回写来源单据（IQC 完成后） + * + * @param iqc 来料检验单 + */ + private void writeBackSourceDoc(MesQcIqcDO iqc) { + // 校验：sourceDocType 非空时，lineId 和 docId 必须非空，否则为脏数据 + if (iqc.getSourceDocType() == null) { + return; + } + if (iqc.getSourceLineId() == null || iqc.getSourceDocId() == null) { + throw new IllegalArgumentException( + "IQC 单[" + iqc.getId() + "] sourceDocType 非空但 sourceLineId 或 sourceDocId 为空"); + } + + // 根据不同的来源单据类型，回写不同的单据 + if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_ARRIVAL_NOTICE)) { + arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(iqc.getSourceDocId(), iqc.getSourceLineId(), + iqc.getId(), iqc.getQualifiedQuantity()); + } + // TODO 外协入库单：未实现，占位 + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteIqc(Long id) { + // 1. 校验存在 + 草稿状态 + validateIqcStatusPrepare(id); + + // 2.1 删除主表 + iqcMapper.deleteById(id); + // 2.2 级联删除行 + iqcLineService.deleteByIqcId(id); + // 2.3 级联删除缺陷记录 + defectRecordService.deleteByQcTypeAndQcId(MesQcTypeEnum.IQC.getType(), id); + } + + @Override + public MesQcIqcDO validateIqcExists(Long id) { + MesQcIqcDO iqc = iqcMapper.selectById(id); + if (iqc == null) { + throw exception(QC_IQC_NOT_EXISTS); + } + return iqc; + } + + /** + * 校验来料检验单存在且为草稿状态 + * + * @param id 来料检验单 ID + * @return 来料检验单 + */ + private MesQcIqcDO validateIqcStatusPrepare(Long id) { + MesQcIqcDO iqc = validateIqcExists(id); + if (ObjUtil.notEqual(iqc.getStatus(), MesQcIqcStatusEnum.PREPARE.getType())) { + throw exception(QC_IQC_NOT_PREPARE); + } + return iqc; + } + + private void validateIqcCodeUnique(Long id, String code) { + MesQcIqcDO iqc = iqcMapper.selectByCode(code); + if (iqc == null) { + return; + } + if (ObjUtil.notEqual(iqc.getId(), id)) { + throw exception(QC_IQC_CODE_DUPLICATE); + } + } + + @Override + public MesQcIqcDO getIqc(Long id) { + return iqcMapper.selectById(id); + } + + @Override + public PageResult getIqcPage(MesQcIqcPageReqVO pageReqVO) { + return iqcMapper.selectPage(pageReqVO); + } + + @Override + public void recalculateDefectStats(Long iqcId, List records) { + // 1. 行级缺陷统计 + iqcLineService.recalculateLineDefectStats(iqcId, records); + + // 2.1 汇总主表的缺陷数量 + int totalCritical = 0, totalMajor = 0, totalMinor = 0; + for (MesQcDefectRecordDO record : records) { + int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1); + if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) { + totalCritical += quantity; + } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MAJOR.getType())) { + totalMajor += quantity; + } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MINOR.getType())) { + totalMinor += quantity; + } else { + throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN); + } + } + // 2.2 计算缺陷率 + MesQcIqcDO iqc = validateIqcExists(iqcId); + BigDecimal criticalRate = BigDecimal.ZERO; + BigDecimal majorRate = BigDecimal.ZERO; + BigDecimal minorRate = BigDecimal.ZERO; + if (iqc.getCheckQuantity() != null && iqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { + BigDecimal checkQty = iqc.getCheckQuantity(); + criticalRate = BigDecimal.valueOf(totalCritical).multiply(BigDecimal.valueOf(100)) + .divide(checkQty, 2, RoundingMode.HALF_UP); + majorRate = BigDecimal.valueOf(totalMajor).multiply(BigDecimal.valueOf(100)) + .divide(checkQty, 2, RoundingMode.HALF_UP); + minorRate = BigDecimal.valueOf(totalMinor).multiply(BigDecimal.valueOf(100)) + .divide(checkQty, 2, RoundingMode.HALF_UP); + } + + // 3. 更新主表 + MesQcIqcDO updateIqc = new MesQcIqcDO().setId(iqcId) + .setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor) + .setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate); + iqcMapper.updateById(updateIqc); + } + + @Override + public Map getIqcMap(Collection ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyMap(); + } + List list = iqcMapper.selectBatchIds(ids); + return convertMap(list, MesQcIqcDO::getId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineService.java deleted file mode 100644 index eb6bb43..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineService.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.qc.lqc; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcLineDO; - -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; - -import java.util.List; - -/** - * MES 来料检验单行 Service 接口 - * - * @author 芋道源码 - */ -public interface MesQcIqcLineService { - - /** - * 校验来料检验行存在 - * - * @param id 编号 - * @return 来料检验行 - */ - MesQcIqcLineDO validateIqcLineExists(Long id); - - /** - * 获得来料检验行 - * - * @param id 编号 - * @return 来料检验行 - */ - MesQcIqcLineDO getIqcLine(Long id); - - /** - * 获得来料检验行分页 - * - * @param pageReqVO 分页查询 - * @return 来料检验行分页 - */ - PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO); - - /** - * 从模板指标自动生成检验行 - * - * @param iqcId 来料检验单 ID - * @param templateId 模板 ID - */ - void createLinesFromTemplate(Long iqcId, Long templateId); - - /** - * 根据缺陷记录重新计算各行的缺陷统计数量 - * - * @param iqcId 来料检验单 ID - * @param records 缺陷记录列表 - */ - void recalculateLineDefectStats(Long iqcId, List records); - - /** - * 根据来料检验单 ID 获取所有行 - * - * @param iqcId 来料检验单 ID - * @return 行列表 - */ - List getIqcLineListByIqcId(Long iqcId); - - /** - * 根据来料检验单 ID 级联删除所有行 - * - * @param iqcId 来料检验单 ID - */ - void deleteByIqcId(Long iqcId); - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineServiceImpl.java deleted file mode 100644 index 02c7b80..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcLineServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.qc.lqc; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; -import cn.iocoder.yudao.module.mes.dal.mysql.qc.lqc.MesQcIqcLineMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.qc.template.MesQcTemplateIndicatorMapper; -import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; - -/** - * MES 来料检验单行 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MesQcIqcLineServiceImpl implements MesQcIqcLineService { - - @Resource - private MesQcIqcLineMapper iqcLineMapper; - @Resource - private MesQcTemplateIndicatorMapper templateIndicatorMapper; - - @Override - public MesQcIqcLineDO validateIqcLineExists(Long id) { - MesQcIqcLineDO line = iqcLineMapper.selectById(id); - if (line == null) { - throw exception(QC_IQC_LINE_NOT_EXISTS); - } - return line; - } - - @Override - public MesQcIqcLineDO getIqcLine(Long id) { - return iqcLineMapper.selectById(id); - } - - @Override - public PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO) { - return iqcLineMapper.selectPage(pageReqVO); - } - - @Override - public void createLinesFromTemplate(Long iqcId, Long templateId) { - List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); - List lines = convertList(indicators, indicator -> new MesQcIqcLineDO() - .setIqcId(iqcId).setIndicatorId(indicator.getIndicatorId()) - .setToolId(null) // TODO @芋艿：模板指标暂无 toolId，后续可扩展 - .setCheckMethod(indicator.getCheckMethod()) - .setStandardValue(indicator.getStandardValue()).setUnitMeasureId(indicator.getUnitMeasureId()) - .setMaxThreshold(indicator.getThresholdMax()).setMinThreshold(indicator.getThresholdMin()) - .setCriticalQuantity(0).setMajorQuantity(0).setMinorQuantity(0)); - iqcLineMapper.insertBatch(lines); - } - - @Override - public void recalculateLineDefectStats(Long iqcId, List records) { - List lines = iqcLineMapper.selectListByIqcId(iqcId); - if (CollUtil.isEmpty(lines)) { - return; - } - List updateLines = new ArrayList<>(lines.size()); - for (MesQcIqcLineDO line : lines) { - int critical = 0, major = 0, minor = 0; - for (MesQcDefectRecordDO record : records) { - if (ObjUtil.notEqual(record.getLineId(), line.getId())) { - continue; - } - int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1); - if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) { - critical += quantity; - } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MAJOR.getType())) { - major += quantity; - } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MINOR.getType())) { - minor += quantity; - } else { - throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN); - } - } - updateLines.add(new MesQcIqcLineDO().setId(line.getId()) - .setCriticalQuantity(critical).setMajorQuantity(major).setMinorQuantity(minor)); - } - for (MesQcIqcLineDO updateLine : updateLines) { - iqcLineMapper.updateById(updateLine); - } - } - - @Override - public List getIqcLineListByIqcId(Long iqcId) { - return iqcLineMapper.selectListByIqcId(iqcId); - } - - @Override - public void deleteByIqcId(Long iqcId) { - iqcLineMapper.deleteByIqcId(iqcId); - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcService.java deleted file mode 100644 index f274cbc..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcService.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.qc.lqc; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; -import jakarta.validation.Valid; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * MES 来料检验单（IQC） Service 接口 - * - * @author 芋道源码 - */ -public interface MesQcIqcService { - - /** - * 创建来料检验单 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createIqc(@Valid MesQcIqcSaveReqVO createReqVO); - - /** - * 更新来料检验单 - * - * @param updateReqVO 更新信息 - */ - void updateIqc(@Valid MesQcIqcSaveReqVO updateReqVO); - - /** - * 完成来料检验单 - * - * @param id 编号 - */ - void completeIqc(Long id); - - /** - * 删除来料检验单 - * - * @param id 编号 - */ - void deleteIqc(Long id); - - /** - * 校验来料检验单存在 - * - * @param id 编号 - * @return 来料检验单 - */ - MesQcIqcDO validateIqcExists(Long id); - - /** - * 获得来料检验单 - * - * @param id 编号 - * @return 来料检验单 - */ - MesQcIqcDO getIqc(Long id); - - /** - * 获得来料检验单分页 - * - * @param pageReqVO 分页查询 - * @return 来料检验单分页 - */ - PageResult getIqcPage(MesQcIqcPageReqVO pageReqVO); - - /** - * 根据缺陷记录重新计算主表的缺陷统计（含行级下沉） - * - * @param iqcId 来料检验单 ID - * @param records 缺陷记录列表 - */ - void recalculateDefectStats(Long iqcId, List records); - - /** - * 批量获取来料检验单 Map - * - * @param ids 编号集合 - * @return 来料检验单 Map - */ - Map getIqcMap(Collection ids); - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcServiceImpl.java deleted file mode 100644 index b461982..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/lqc/MesQcIqcServiceImpl.java +++ /dev/null @@ -1,253 +0,0 @@ -package cn.iocoder.yudao.module.mes.service.qc.lqc; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; -import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.lqc.MesQcIqcDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO; -import cn.iocoder.yudao.module.mes.dal.mysql.qc.lqc.MesQcIqcMapper; -import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants; -import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; -import cn.iocoder.yudao.module.mes.enums.qc.MesQcIqcStatusEnum; -import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; -import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; -import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService; -import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; - -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; - -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; - -/** - * MES 来料检验单（IQC） Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MesQcIqcServiceImpl implements MesQcIqcService { - - @Resource - private MesQcIqcMapper iqcMapper; - @Resource - private MesQcTemplateService templateService; - - @Resource - private MesQcIqcLineService iqcLineService; - @Resource - private MesQcDefectRecordService defectRecordService; - @Resource - private MesWmArrivalNoticeService arrivalNoticeService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long createIqc(MesQcIqcSaveReqVO createReqVO) { - // 1.1 校验编号唯一 - validateIqcCodeUnique(null, createReqVO.getCode()); - // 1.2 查找物料关联的 IQC 检测模板 - Long templateId = createReqVO.getTemplateId(); - MesQcTemplateDO template = templateService.validateTemplateExists(templateId); - if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.IQC.getType())) { - throw exception(QC_IQC_NO_TEMPLATE); - } - - // 3.1 从模板的产品关联中获取检测参数（min_check_quantity、max_unqualified_quantity） - MesQcTemplateItemDO templateItem = templateService.getTemplateItemByTemplateIdAndItemId( - templateId, createReqVO.getItemId()); - if (templateItem != null) { - if (createReqVO.getMinCheckQuantity() == null) { - createReqVO.setMinCheckQuantity(templateItem.getQuantityCheck()); - } - if (createReqVO.getMaxUnqualifiedQuantity() == null) { - createReqVO.setMaxUnqualifiedQuantity(templateItem.getQuantityUnqualified()); - } - } - // 3.2 插入主表 - MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class); - iqc.setStatus(MesQcIqcStatusEnum.PREPARE.getType()); - iqcMapper.insert(iqc); - - // 4. 从模板指标自动生成检验行 - iqcLineService.createLinesFromTemplate(iqc.getId(), templateId); - return iqc.getId(); - } - - @Override - public void updateIqc(MesQcIqcSaveReqVO updateReqVO) { - // 1.1 校验存在 + 草稿状态 - validateIqcStatusPrepare(updateReqVO.getId()); - // 1.2 校验编号唯一 - validateIqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); - - // 2. 更新 - MesQcIqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIqcDO.class); - iqcMapper.updateById(updateObj); - } - - @Override - public void completeIqc(Long id) { - // 1.1 校验存在 + 草稿状态 - MesQcIqcDO iqc = validateIqcStatusPrepare(id); - // 1.2 校验合格品 + 不合格品 = 检测数量 - if (iqc.getCheckQuantity() != null && iqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { - BigDecimal total = ObjUtil.defaultIfNull(iqc.getQualifiedQuantity(), BigDecimal.ZERO) - .add(ObjUtil.defaultIfNull(iqc.getUnqualifiedQuantity(), BigDecimal.ZERO)); - if (total.compareTo(iqc.getCheckQuantity()) != 0) { - throw exception(QC_IQC_QUANTITY_MISMATCH); - } - } - - // 2. 更新状态为已完成 - MesQcIqcDO updateObj = new MesQcIqcDO() - .setId(id).setStatus(MesQcIqcStatusEnum.FINISHED.getType()); - iqcMapper.updateById(updateObj); - - // 3. 回写来源单据 - writeBackSourceDoc(iqc); - } - - /** - * 回写来源单据（IQC 完成后） - * - * @param iqc 来料检验单 - */ - private void writeBackSourceDoc(MesQcIqcDO iqc) { - // 校验：sourceDocType 非空时，lineId 和 docId 必须非空，否则为脏数据 - if (iqc.getSourceDocType() == null) { - return; - } - if (iqc.getSourceLineId() == null || iqc.getSourceDocId() == null) { - throw new IllegalArgumentException( - "IQC 单[" + iqc.getId() + "] sourceDocType 非空但 sourceLineId 或 sourceDocId 为空"); - } - - // 根据不同的来源单据类型，回写不同的单据 - if (Objects.equals(iqc.getSourceDocType(), MesBizTypeConstants.WM_ARRIVAL_NOTICE)) { - arrivalNoticeService.approveArrivalNoticeWhenIqcComplete(iqc.getSourceDocId(), iqc.getSourceLineId(), - iqc.getId(), iqc.getQualifiedQuantity()); - } - // TODO 外协入库单：未实现，占位 - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteIqc(Long id) { - // 1. 校验存在 + 草稿状态 - validateIqcStatusPrepare(id); - - // 2.1 删除主表 - iqcMapper.deleteById(id); - // 2.2 级联删除行 - iqcLineService.deleteByIqcId(id); - // 2.3 级联删除缺陷记录 - defectRecordService.deleteByQcTypeAndQcId(MesQcTypeEnum.IQC.getType(), id); - } - - @Override - public MesQcIqcDO validateIqcExists(Long id) { - MesQcIqcDO iqc = iqcMapper.selectById(id); - if (iqc == null) { - throw exception(QC_IQC_NOT_EXISTS); - } - return iqc; - } - - /** - * 校验来料检验单存在且为草稿状态 - * - * @param id 来料检验单 ID - * @return 来料检验单 - */ - private MesQcIqcDO validateIqcStatusPrepare(Long id) { - MesQcIqcDO iqc = validateIqcExists(id); - if (ObjUtil.notEqual(iqc.getStatus(), MesQcIqcStatusEnum.PREPARE.getType())) { - throw exception(QC_IQC_NOT_PREPARE); - } - return iqc; - } - - private void validateIqcCodeUnique(Long id, String code) { - MesQcIqcDO iqc = iqcMapper.selectByCode(code); - if (iqc == null) { - return; - } - if (ObjUtil.notEqual(iqc.getId(), id)) { - throw exception(QC_IQC_CODE_DUPLICATE); - } - } - - @Override - public MesQcIqcDO getIqc(Long id) { - return iqcMapper.selectById(id); - } - - @Override - public PageResult getIqcPage(MesQcIqcPageReqVO pageReqVO) { - return iqcMapper.selectPage(pageReqVO); - } - - @Override - public void recalculateDefectStats(Long iqcId, List records) { - // 1. 行级缺陷统计 - iqcLineService.recalculateLineDefectStats(iqcId, records); - - // 2.1 汇总主表的缺陷数量 - int totalCritical = 0, totalMajor = 0, totalMinor = 0; - for (MesQcDefectRecordDO record : records) { - int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1); - if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) { - totalCritical += quantity; - } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MAJOR.getType())) { - totalMajor += quantity; - } else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MINOR.getType())) { - totalMinor += quantity; - } else { - throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN); - } - } - // 2.2 计算缺陷率 - MesQcIqcDO iqc = validateIqcExists(iqcId); - BigDecimal criticalRate = BigDecimal.ZERO; - BigDecimal majorRate = BigDecimal.ZERO; - BigDecimal minorRate = BigDecimal.ZERO; - if (iqc.getCheckQuantity() != null && iqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { - BigDecimal checkQty = iqc.getCheckQuantity(); - criticalRate = BigDecimal.valueOf(totalCritical).multiply(BigDecimal.valueOf(100)) - .divide(checkQty, 2, RoundingMode.HALF_UP); - majorRate = BigDecimal.valueOf(totalMajor).multiply(BigDecimal.valueOf(100)) - .divide(checkQty, 2, RoundingMode.HALF_UP); - minorRate = BigDecimal.valueOf(totalMinor).multiply(BigDecimal.valueOf(100)) - .divide(checkQty, 2, RoundingMode.HALF_UP); - } - - // 3. 更新主表 - MesQcIqcDO updateIqc = new MesQcIqcDO().setId(iqcId) - .setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor) - .setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate); - iqcMapper.updateById(updateIqc); - } - - @Override - public Map getIqcMap(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return Collections.emptyMap(); - } - List list = iqcMapper.selectBatchIds(ids); - return convertMap(list, MesQcIqcDO::getId); - } - -} -- libgit2 0.21.4