diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java new file mode 100644 index 0000000..e21216a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java @@ -0,0 +1,147 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService; +import cn.iocoder.yudao.module.mes.service.qc.MesQcIqcService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen; + +@Tag(name = "管理后台 - MES 来料检验单（IQC）") +@RestController +@RequestMapping("/mes/qc/iqc") +@Validated +public class MesQcIqcController { + + @Resource + private MesQcIqcService iqcService; + @Resource + private MesMdVendorService vendorService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @PostMapping("/create") + @Operation(summary = "创建来料检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:create')") + public CommonResult createIqc(@Valid @RequestBody MesQcIqcSaveReqVO createReqVO) { + return success(iqcService.createIqc(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新来料检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") + public CommonResult updateIqc(@Valid @RequestBody MesQcIqcSaveReqVO updateReqVO) { + iqcService.updateIqc(updateReqVO); + return success(true); + } + + @PutMapping("/complete") + @Operation(summary = "完成来料检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") + public CommonResult completeIqc(@RequestParam("id") Long id) { + iqcService.completeIqc(id); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除来料检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:delete')") + public CommonResult deleteIqc(@RequestParam("id") Long id) { + iqcService.deleteIqc(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得来料检验单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')") + public CommonResult getIqc(@RequestParam("id") Long id) { + MesQcIqcDO iqc = iqcService.getIqc(id); + return success(buildIqcRespVOList(Collections.singletonList(iqc)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得来料检验单分页") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')") + public CommonResult> getIqcPage(@Valid MesQcIqcPageReqVO pageReqVO) { + PageResult pageResult = iqcService.getIqcPage(pageReqVO); + return success(new PageResult<>(buildIqcRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出来料检验单 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportIqcExcel(@Valid MesQcIqcPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = iqcService.getIqcPage(pageReqVO).getList(); + List voList = buildIqcRespVOList(list); + ExcelUtils.write(response, "来料检验单.xls", "数据", MesQcIqcRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildIqcRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 批量查询供应商 + Map vendorMap = vendorService.getVendorMap( + convertSet(list, MesQcIqcDO::getVendorId)); + // 批量查询物料 + Map itemMap = itemService.getItemMap( + convertSet(list, MesQcIqcDO::getItemId)); + // 批量查询计量单位（通过物料的 unitMeasureId） + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcIqcRespVO.class, vo -> { + findAndThen(vendorMap, vo.getVendorId(), + vendor -> vo.setVendorNickname(vendor.getNickname())); + findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()); + vo.setItemName(item.getName()); + vo.setItemSpecification(item.getSpecification()); + findAndThen(unitMeasureMap, item.getUnitMeasureId(), + unit -> vo.setUnitName(unit.getName())); + }); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcDefectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcDefectController.java new file mode 100644 index 0000000..5a83f79 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcDefectController.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +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.defect.MesQcIqcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcDefectDO; +import cn.iocoder.yudao.module.mes.service.qc.MesQcIqcService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - MES 来料检验缺陷记录") +@RestController +@RequestMapping("/mes/qc/iqc/defect") +@Validated +public class MesQcIqcDefectController { + + @Resource + private MesQcIqcService iqcService; + + @PostMapping("/create") + @Operation(summary = "创建来料检验缺陷记录") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:create')") + public CommonResult createIqcDefect(@Valid @RequestBody MesQcIqcDefectSaveReqVO createReqVO) { + return success(iqcService.createIqcDefect(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新来料检验缺陷记录") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") + public CommonResult updateIqcDefect(@Valid @RequestBody MesQcIqcDefectSaveReqVO updateReqVO) { + iqcService.updateIqcDefect(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除来料检验缺陷记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:update')") + public CommonResult deleteIqcDefect(@RequestParam("id") Long id) { + iqcService.deleteIqcDefect(id); + return success(true); + } + + @GetMapping("/page") + @Operation(summary = "获得来料检验缺陷记录分页") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')") + public CommonResult> getIqcDefectPage(@Valid MesQcIqcDefectPageReqVO pageReqVO) { + PageResult pageResult = iqcService.getIqcDefectPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesQcIqcDefectRespVO.class)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcLineController.java new file mode 100644 index 0000000..339c805 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcLineController.java @@ -0,0 +1,98 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +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.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLineRespVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.tm.tool.MesTmToolDO; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.qc.MesQcIqcService; +import cn.iocoder.yudao.module.mes.service.qc.MesQcIndicatorService; +import cn.iocoder.yudao.module.mes.service.tm.tool.MesTmToolService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen; + +@Tag(name = "管理后台 - MES 来料检验单行") +@RestController +@RequestMapping("/mes/qc/iqc/line") +@Validated +public class MesQcIqcLineController { + + @Resource + private MesQcIqcService iqcService; + @Resource + private MesQcIndicatorService indicatorService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + @Resource + private MesTmToolService toolService; + + @GetMapping("/get") + @Operation(summary = "获得来料检验单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')") + public CommonResult getIqcLine(@RequestParam("id") Long id) { + MesQcIqcLineDO line = iqcService.getIqcLine(id); + return success(buildLineRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得来料检验单行分页") + @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')") + public CommonResult> getIqcLinePage(@Valid MesQcIqcLinePageReqVO pageReqVO) { + PageResult pageResult = iqcService.getIqcLinePage(pageReqVO); + return success(new PageResult<>(buildLineRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + // ==================== 拼接 VO ==================== + + private List buildLineRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 批量查询检测指标 + Map indicatorMap = indicatorService.getIndicatorMap( + convertSet(list, MesQcIqcLineDO::getIndicatorId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(list, MesQcIqcLineDO::getUnitMeasureId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcIqcLineRespVO.class, vo -> { + findAndThen(indicatorMap, vo.getIndicatorId(), indicator -> + vo.setIndicatorCode(indicator.getCode()).setIndicatorName(indicator.getName()) + .setIndicatorType(indicator.getType())); + findAndThen(unitMeasureMap, vo.getUnitMeasureId(), + unit -> vo.setUnitMeasureName(unit.getName())); + // 逐个查询工具名称（工具数量通常较少） + if (vo.getToolId() != null) { + MesTmToolDO tool = toolService.getTool(vo.getToolId()); + if (tool != null) { + vo.setToolName(tool.getName()); + } + } + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcPageReqVO.java new file mode 100644 index 0000000..175fc3b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcPageReqVO.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - MES 来料检验单分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcIqcPageReqVO extends PageParam { + + @Schema(description = "检验单编号", example = "IQC2025") + private String code; + + @Schema(description = "供应商 ID", example = "10") + private Long vendorId; + + @Schema(description = "供应商批次号", example = "VB2025") + private String vendorBatch; + + @Schema(description = "产品物料 ID", example = "20") + private Long itemId; + + @Schema(description = "检测结果", example = "PASS") + private String checkResult; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "来料日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] receiveDate; + + @Schema(description = "检测日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] inspectDate; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java new file mode 100644 index 0000000..7f3ad39 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java @@ -0,0 +1,150 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 来料检验单 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesQcIqcRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "IQC20250101001") + @ExcelProperty("检验单编号") + private String code; + + @Schema(description = "检验单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "物料A来料检验") + @ExcelProperty("检验单名称") + private String name; + + @Schema(description = "检验模板 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long templateId; + + // ========== 来源单据 ========== + + @Schema(description = "来源单据 ID", example = "200") + private Long sourceDocId; + + @Schema(description = "来源单据类型", example = "ARRIVAL") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "ARV20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 供应商 ========== + + @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + private Long vendorId; + + @Schema(description = "供应商简称", example = "供应商A") + private String vendorNickname; + + @Schema(description = "供应商批次号", example = "VB20250101") + @ExcelProperty("供应商批次号") + private String vendorBatch; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") + private Long itemId; + + @Schema(description = "产品物料编码", example = "ITEM001") + @ExcelProperty("产品物料编码") + private String itemCode; + + @Schema(description = "产品物料名称", example = "物料A") + @ExcelProperty("产品物料名称") + private String itemName; + + @Schema(description = "规格型号", example = "100mm*50mm") + private String itemSpecification; + + @Schema(description = "单位名称", example = "个") + private String unitName; + + // ========== 数量 ========== + + @Schema(description = "最低检测数", example = "5") + private Integer minCheckQuantity; + + @Schema(description = "最大不合格数", example = "0") + private Integer maxUnqualifiedQuantity; + + @Schema(description = "本次接收数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @ExcelProperty("接收数量") + private BigDecimal receivedQuantity; + + @Schema(description = "本次检测数量", example = "10") + @ExcelProperty("检测数量") + private Integer checkQuantity; + + @Schema(description = "合格品数量", example = "9") + @ExcelProperty("合格品数量") + private Integer qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "1") + @ExcelProperty("不合格品数量") + private Integer unqualifiedQuantity; + + // ========== 缺陷统计 ========== + + @Schema(description = "致命缺陷率（%）", example = "0.00") + private BigDecimal criticalRate; + + @Schema(description = "严重缺陷率（%）", example = "0.00") + private BigDecimal majorRate; + + @Schema(description = "轻微缺陷率（%）", example = "10.00") + private BigDecimal minorRate; + + @Schema(description = "致命缺陷数量", example = "0") + private Integer criticalQuantity; + + @Schema(description = "严重缺陷数量", example = "0") + private Integer majorQuantity; + + @Schema(description = "轻微缺陷数量", example = "1") + private Integer minorQuantity; + + // ========== 检验 ========== + + @Schema(description = "检测结果", example = "PASS") + @ExcelProperty("检测结果") + private String checkResult; + + @Schema(description = "来料日期") + @ExcelProperty("来料日期") + private LocalDateTime receiveDate; + + @Schema(description = "检测日期") + @ExcelProperty("检测日期") + private LocalDateTime inspectDate; + + @Schema(description = "检测人员", example = "张三") + @ExcelProperty("检测人员") + private String inspector; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty("状态") + private Integer status; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java new file mode 100644 index 0000000..dcb1277 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcSaveReqVO.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 来料检验单新增/修改 Request VO") +@Data +public class MesQcIqcSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "IQC20250101001") + @NotEmpty(message = "检验单编号不能为空") + private String code; + + @Schema(description = "检验单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "物料A来料检验") + @NotEmpty(message = "检验单名称不能为空") + private String name; + + @Schema(description = "检验模板 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "检验模板不能为空") + private Long templateId; + + // ========== 来源单据 ========== + + @Schema(description = "来源单据 ID", example = "200") + private Long sourceDocId; + + @Schema(description = "来源单据类型", example = "ARRIVAL") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "ARV20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 供应商 ========== + + @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + @NotNull(message = "供应商不能为空") + private Long vendorId; + + @Schema(description = "供应商批次号", example = "VB20250101") + private String vendorBatch; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") + @NotNull(message = "产品物料不能为空") + private Long itemId; + + // ========== 数量 ========== + + @Schema(description = "最低检测数", example = "5") + private Integer minCheckQuantity; + + @Schema(description = "最大不合格数", example = "0") + private Integer maxUnqualifiedQuantity; + + @Schema(description = "本次接收数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "本次接收数量不能为空") + private BigDecimal receivedQuantity; + + @Schema(description = "本次检测数量", example = "10") + private Integer checkQuantity; + + @Schema(description = "合格品数量", example = "9") + private Integer qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "1") + private Integer unqualifiedQuantity; + + // ========== 检验 ========== + + @Schema(description = "检测结果", example = "PASS") + private String checkResult; + + @Schema(description = "来料日期") + private LocalDateTime receiveDate; + + @Schema(description = "检测日期") + private LocalDateTime inspectDate; + + @Schema(description = "检测人员", example = "张三") + private String inspector; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectPageReqVO.java new file mode 100644 index 0000000..6df8cc3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectPageReqVO.java @@ -0,0 +1,23 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 来料检验缺陷记录分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcIqcDefectPageReqVO extends PageParam { + + @Schema(description = "来料检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "来料检验单 ID 不能为空") + private Long iqcId; + + @Schema(description = "来料检验行 ID", example = "200") + private Long lineId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectRespVO.java new file mode 100644 index 0000000..08cf055 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectRespVO.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 来料检验缺陷记录 Response VO") +@Data +public class MesQcIqcDefectRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "来料检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long iqcId; + + @Schema(description = "来料检验行 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") + private Long lineId; + + @Schema(description = "缺陷描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "表面划伤") + private String defectName; + + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "CRITICAL") + private String defectLevel; + + @Schema(description = "缺陷数量", example = "1") + private Integer defectQuantity; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectSaveReqVO.java new file mode 100644 index 0000000..3b030d0 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/defect/MesQcIqcDefectSaveReqVO.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 来料检验缺陷记录新增/修改 Request VO") +@Data +public class MesQcIqcDefectSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "来料检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "来料检验单 ID 不能为空") + private Long iqcId; + + @Schema(description = "来料检验行 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") + @NotNull(message = "来料检验行 ID 不能为空") + private Long lineId; + + @Schema(description = "缺陷描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "表面划伤") + @NotEmpty(message = "缺陷描述不能为空") + private String defectName; + + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "CRITICAL") + @NotEmpty(message = "缺陷等级不能为空") + private String defectLevel; + + @Schema(description = "缺陷数量", example = "1") + private Integer defectQuantity; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLinePageReqVO.java new file mode 100644 index 0000000..d9a3fe6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 来料检验单行分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcIqcLinePageReqVO extends PageParam { + + @Schema(description = "来料检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "来料检验单 ID 不能为空") + private Long iqcId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java new file mode 100644 index 0000000..e1c70d1 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/line/MesQcIqcLineRespVO.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 来料检验单行 Response VO") +@Data +@Accessors(chain = true) +public class MesQcIqcLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "来料检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long iqcId; + + @Schema(description = "检测指标 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + private Long indicatorId; + + @Schema(description = "检测指标编码", example = "IND001") + private String indicatorCode; + + @Schema(description = "检测指标名称", example = "外观") + private String indicatorName; + + @Schema(description = "检测指标类型", example = "QUANTITATIVE") + private String indicatorType; + + @Schema(description = "检测工具 ID", example = "5") + private Long toolId; + + @Schema(description = "检测工具名称", example = "卡尺") + private String toolName; + + @Schema(description = "检测方法", example = "目测") + private String checkMethod; + + @Schema(description = "标准值", example = "10.5000") + private BigDecimal standardValue; + + @Schema(description = "计量单位 ID", example = "3") + private Long unitMeasureId; + + @Schema(description = "计量单位名称", example = "毫米") + private String unitMeasureName; + + @Schema(description = "误差上限", example = "11.0000") + private BigDecimal maxThreshold; + + @Schema(description = "误差下限", example = "10.0000") + private BigDecimal minThreshold; + + @Schema(description = "致命缺陷数量", example = "0") + private Integer criticalQuantity; + + @Schema(description = "严重缺陷数量", example = "0") + private Integer majorQuantity; + + @Schema(description = "轻微缺陷数量", example = "1") + private Integer minorQuantity; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcDO.java new file mode 100644 index 0000000..d6cfe22 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcDO.java @@ -0,0 +1,200 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc; + +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 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; + +// TODO @AI：IQC 完整的拼写，也加下； +/** + * MES 来料检验单（IQC） 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; + + // ========== 来源单据（TODO @芋艿：WM 模块迁移后接入） ========== + + /** + * 来源单据 ID + */ + private Long sourceDocId; + /** + * 来源单据类型 + * + * 字典 mes_qc_source_doc_type + */ + private String sourceDocType; + /** + * 来源单据编号 + */ + private String sourceDocCode; + /** + * 来源单据行 ID + */ + 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 Integer checkQuantity; + /** + * 合格品数量 + */ + private Integer qualifiedQuantity; + /** + * 不合格品数量 + */ + private Integer unqualifiedQuantity; + + // ========== 缺陷统计 ========== + + /** + * 致命缺陷率（%） + */ + private BigDecimal criticalRate; + /** + * 严重缺陷率（%） + */ + private BigDecimal majorRate; + /** + * 轻微缺陷率（%） + */ + private BigDecimal minorRate; + /** + * 致命缺陷数量 + */ + private Integer criticalQuantity; + /** + * 严重缺陷数量 + */ + private Integer majorQuantity; + /** + * 轻微缺陷数量 + */ + private Integer minorQuantity; + + // ========== 检验 ========== + + // TODO @AI：需要搞个枚举么？使用 int 把。现在就搞了； + /** + * 检测结果 + * + * 字典 mes_qc_check_result + */ + private String checkResult; + /** + * 来料日期 + */ + private LocalDateTime receiveDate; + /** + * 检测日期 + */ + private LocalDateTime inspectDate; + /** + * 检测人员 + */ + // TODO @AI：改成 inspectorUserId； + private String inspector; + // TODO @AI：需要搞个枚举么？使用 int 把。现在就搞了； + /** + * 状态（0=草稿 1=已完成） + * + * 字典 mes_qc_iqc_status + */ + 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/MesQcIqcDefectDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcDefectDO.java new file mode 100644 index 0000000..890c649 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcDefectDO.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * MES 来料检验缺陷记录 DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_iqc_defect") +@KeySequence("mes_qc_iqc_defect_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcIqcDefectDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 来料检验单 ID + * + * 关联 {@link MesQcIqcDO#getId()} + */ + private Long iqcId; + /** + * 来料检验行 ID + * + * 关联 {@link MesQcIqcLineDO#getId()} + */ + private Long lineId; + /** + * 缺陷描述 + */ + private String defectName; + // TODO @AI：要不枚举值也加下，也改成 int； + /** + * 缺陷等级 + * + * 字典 mes_defect_level + */ + private String defectLevel; + /** + * 缺陷数量 + */ + private Integer defectQuantity; + /** + * 备注 + */ + 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/MesQcIqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcLineDO.java new file mode 100644 index 0000000..96bc82d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcIqcLineDO.java @@ -0,0 +1,109 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc; + +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.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/mysql/qc/MesQcIqcDefectMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcDefectMapper.java new file mode 100644 index 0000000..dfecb10 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcDefectMapper.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc; + +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.defect.MesQcIqcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcDefectDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 来料检验缺陷记录 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcIqcDefectMapper extends BaseMapperX { + + default PageResult selectPage(MesQcIqcDefectPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesQcIqcDefectDO::getIqcId, reqVO.getIqcId()) + .eqIfPresent(MesQcIqcDefectDO::getLineId, reqVO.getLineId()) + .orderByDesc(MesQcIqcDefectDO::getId)); + } + + default List selectListByIqcId(Long iqcId) { + return selectList(MesQcIqcDefectDO::getIqcId, iqcId); + } + + default List selectListByIqcIdAndLineId(Long iqcId, Long lineId) { + return selectList(new LambdaQueryWrapperX() + .eq(MesQcIqcDefectDO::getIqcId, iqcId) + .eq(MesQcIqcDefectDO::getLineId, lineId)); + } + + default void deleteByIqcId(Long iqcId) { + delete(new LambdaQueryWrapperX() + .eq(MesQcIqcDefectDO::getIqcId, iqcId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcLineMapper.java new file mode 100644 index 0000000..0c78c1a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcLineMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc; + +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.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/MesQcIqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcMapper.java new file mode 100644 index 0000000..82e464d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcIqcMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc; + +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.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()) + .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/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java index fcaa7a1..6209a38 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java @@ -17,6 +17,7 @@ public interface DictTypeConstants { String MES_CAL_CALENDAR_TYPE = "mes_cal_calendar_type"; // MES 班组类型 String MES_CAL_PLAN_STATUS = "mes_cal_plan_status"; // MES 排班计划状态 String MES_DV_MACHINERY_STATUS = "mes_dv_machinery_status"; // MES 设备状态 + String MES_DV_SUBJECT_TYPE = "mes_dv_subject_type"; // MES 点检保养项目类型 String MES_INDEX_TYPE = "mes_index_type"; // MES 检测项类型 String MES_QC_RESULT_TYPE = "mes_qc_result_type"; // MES 质检结果值类型 String MES_DEFECT_LEVEL = "mes_defect_level"; // MES 缺陷等级 @@ -26,5 +27,8 @@ public interface DictTypeConstants { String MES_QC_TYPE = "mes_qc_type"; // MES 检测种类（IQC/IPQC/OQC/RQC） String MES_PRO_LINK_TYPE = "mes_pro_link_type"; // MES 工序关系类型 String MES_TIME_UNIT_TYPE = "mes_time_unit_type"; // MES 时间单位 + String MES_QC_IQC_STATUS = "mes_qc_iqc_status"; // MES 检验单状态 + String MES_QC_CHECK_RESULT = "mes_qc_check_result"; // MES 检测结果 + String MES_QC_SOURCE_DOC_TYPE = "mes_qc_source_doc_type"; // MES 来源单据类型 } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 28ac24a..657f0e6 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -120,6 +120,10 @@ public interface ErrorCodeConstants { ErrorCode DV_MACHINERY_NOT_EXISTS = new ErrorCode(1_040_301_000, "设备不存在"); ErrorCode DV_MACHINERY_CODE_DUPLICATE = new ErrorCode(1_040_301_001, "设备编码已存在"); + // ========== MES 设备管理-点检保养项目（1-040-304-000） ========== + ErrorCode DV_SUBJECT_NOT_EXISTS = new ErrorCode(1_040_304_000, "点检保养项目不存在"); + ErrorCode DV_SUBJECT_CODE_DUPLICATE = new ErrorCode(1_040_304_001, "项目编码已存在"); + // ========== MES 设备管理-点检计划（1-040-302-000） ========== ErrorCode DV_CHECK_PLAN_NOT_EXISTS = new ErrorCode(1_040_302_000, "点检计划不存在"); @@ -192,6 +196,18 @@ public interface ErrorCodeConstants { ErrorCode QC_DEFECT_CODE_DUPLICATE = new ErrorCode(1_040_602_001, "缺陷类型编码已存在"); ErrorCode QC_DEFECT_NAME_DUPLICATE = new ErrorCode(1_040_602_002, "缺陷类型名称已存在"); + // ========== MES 质量管理-来料检验 IQC（1-040-603-000） ========== + ErrorCode QC_IQC_NOT_EXISTS = new ErrorCode(1_040_603_000, "来料检验单不存在"); + ErrorCode QC_IQC_CODE_DUPLICATE = new ErrorCode(1_040_603_001, "来料检验单编号已存在"); + ErrorCode QC_IQC_ONLY_PREPARE_CAN_DELETE = new ErrorCode(1_040_603_002, "只能删除草稿状态的检验单"); + ErrorCode QC_IQC_ONLY_PREPARE_CAN_COMPLETE = new ErrorCode(1_040_603_003, "只能完成草稿状态的检验单"); + ErrorCode QC_IQC_QUANTITY_MISMATCH = new ErrorCode(1_040_603_004, "合格品与不合格品数量之和须等于检测数量"); + ErrorCode QC_IQC_NO_TEMPLATE = new ErrorCode(1_040_603_005, "当前产品未配置 IQC 检测模板"); + // ========== MES 质量管理-来料检验行（1-040-603-100） ========== + ErrorCode QC_IQC_LINE_NOT_EXISTS = new ErrorCode(1_040_603_100, "来料检验行不存在"); + // ========== MES 质量管理-来料检验缺陷（1-040-603-200） ========== + ErrorCode QC_IQC_DEFECT_NOT_EXISTS = new ErrorCode(1_040_603_200, "来料检验缺陷记录不存在"); + // ========== MES 仓库管理-仓库（1-040-700-000） ========== ErrorCode WM_WAREHOUSE_NOT_EXISTS = new ErrorCode(1_040_700_000, "仓库不存在"); ErrorCode WM_WAREHOUSE_CODE_DUPLICATE = new ErrorCode(1_040_700_001, "仓库编码已存在"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcService.java new file mode 100644 index 0000000..7368b69 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcService.java @@ -0,0 +1,118 @@ +package cn.iocoder.yudao.module.mes.service.qc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.*; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcDefectDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcIqcLineDO; +import jakarta.validation.Valid; + +// TODO @AI：和别的模块一样，拆分成多个 service +/** + * 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 getIqc(Long id); + + /** + * 获得来料检验单分页 + * + * @param pageReqVO 分页查询 + * @return 来料检验单分页 + */ + PageResult getIqcPage(MesQcIqcPageReqVO pageReqVO); + + // ========== 来料检验行（只读） ========== + + /** + * 获得来料检验行 + * + * @param id 编号 + * @return 来料检验行 + */ + MesQcIqcLineDO getIqcLine(Long id); + + /** + * 获得来料检验行分页 + * + * @param pageReqVO 分页查询 + * @return 来料检验行分页 + */ + PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO); + + // ========== 来料检验缺陷记录 ========== + + /** + * 创建来料检验缺陷记录 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIqcDefect(@Valid MesQcIqcDefectSaveReqVO createReqVO); + + /** + * 更新来料检验缺陷记录 + * + * @param updateReqVO 更新信息 + */ + void updateIqcDefect(@Valid MesQcIqcDefectSaveReqVO updateReqVO); + + /** + * 删除来料检验缺陷记录 + * + * @param id 编号 + */ + void deleteIqcDefect(Long id); + + /** + * 获得来料检验缺陷记录分页 + * + * @param pageReqVO 分页查询 + * @return 来料检验缺陷记录分页 + */ + PageResult getIqcDefectPage(MesQcIqcDefectPageReqVO pageReqVO); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcServiceImpl.java new file mode 100644 index 0000000..aac0c38 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcIqcServiceImpl.java @@ -0,0 +1,333 @@ +package cn.iocoder.yudao.module.mes.service.qc; + +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.*; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.defect.MesQcIqcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.line.MesQcIqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.*; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.*; +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.List; +import java.util.Objects; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +// TODO @AI：和别的模块一样，拆分成多个 service +/** + * MES 来料检验单（IQC） Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcIqcServiceImpl implements MesQcIqcService { + + // TODO @AI：搞个枚举类； + /** + * IQC 检测种类值（对应 mes_qc_type 字典 value=1） + */ + private static final int QC_TYPE_IQC = 1; + + @Resource + private MesQcIqcMapper iqcMapper; + @Resource + private MesQcIqcLineMapper iqcLineMapper; + @Resource + private MesQcIqcDefectMapper iqcDefectMapper; + @Resource + private MesQcTemplateMapper templateMapper; + @Resource + private MesQcTemplateIndicatorMapper templateIndicatorMapper; + @Resource + private MesQcTemplateItemMapper templateItemMapper; + + // ========== 来料检验主表 ========== + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createIqc(MesQcIqcSaveReqVO createReqVO) { + // 1. 校验编号唯一 + validateIqcCodeUnique(null, createReqVO.getCode()); + + // 2. 查找物料关联的 IQC 检测模板 + Long templateId = createReqVO.getTemplateId(); + MesQcTemplateDO template = templateMapper.selectById(templateId); + if (template == null || template.getTypes() == null || !template.getTypes().contains(QC_TYPE_IQC)) { + throw exception(QC_IQC_NO_TEMPLATE); + } + + // 3. 从模板的产品关联中获取检测参数（min_check_quantity、max_unqualified_quantity） + MesQcTemplateItemDO templateItem = templateItemMapper.selectByTemplateIdAndItemId( + templateId, createReqVO.getItemId()); + if (templateItem != null) { + if (createReqVO.getMinCheckQuantity() == null) { + createReqVO.setMinCheckQuantity(templateItem.getQuantityCheck()); + } + if (createReqVO.getMaxUnqualifiedQuantity() == null) { + createReqVO.setMaxUnqualifiedQuantity(templateItem.getQuantityUnqualified()); + } + } + + // 4. 插入主表 + MesQcIqcDO iqc = BeanUtils.toBean(createReqVO, MesQcIqcDO.class); + iqc.setStatus(0); // 草稿 + iqcMapper.insert(iqc); + + // 5. 从模板指标自动生成检验行 + List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); + for (MesQcTemplateIndicatorDO indicator : indicators) { + MesQcIqcLineDO line = new MesQcIqcLineDO(); + line.setIqcId(iqc.getId()); + line.setIndicatorId(indicator.getIndicatorId()); + line.setToolId(null); // TODO @芋艿：模板指标暂无 toolId，后续可扩展 + line.setCheckMethod(indicator.getCheckMethod()); + line.setStandardValue(indicator.getStandardValue()); + line.setUnitMeasureId(indicator.getUnitMeasureId()); + line.setMaxThreshold(indicator.getThresholdMax()); + line.setMinThreshold(indicator.getThresholdMin()); + line.setCriticalQuantity(0); + line.setMajorQuantity(0); + line.setMinorQuantity(0); + iqcLineMapper.insert(line); + } + + return iqc.getId(); + } + + @Override + public void updateIqc(MesQcIqcSaveReqVO updateReqVO) { + // 1. 校验存在 + MesQcIqcDO iqc = validateIqcExists(updateReqVO.getId()); + // 2. 校验状态为草稿 + if (!Objects.equals(iqc.getStatus(), 0)) { + throw exception(QC_IQC_ONLY_PREPARE_CAN_COMPLETE); + } + // 3. 校验编号唯一 + validateIqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + // 4. 更新 + MesQcIqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIqcDO.class); + iqcMapper.updateById(updateObj); + } + + @Override + public void completeIqc(Long id) { + // 1. 校验存在 + MesQcIqcDO iqc = validateIqcExists(id); + // 2. 校验状态为草稿 + if (!Objects.equals(iqc.getStatus(), 0)) { + throw exception(QC_IQC_ONLY_PREPARE_CAN_COMPLETE); + } + // 3. 校验合格品 + 不合格品 = 检测数量 + if (iqc.getCheckQuantity() != null && iqc.getCheckQuantity() > 0) { + int total = (iqc.getQualifiedQuantity() != null ? iqc.getQualifiedQuantity() : 0) + + (iqc.getUnqualifiedQuantity() != null ? iqc.getUnqualifiedQuantity() : 0); + if (total != iqc.getCheckQuantity()) { + throw exception(QC_IQC_QUANTITY_MISMATCH); + } + } + // 4. 更新状态为已完成 + MesQcIqcDO updateObj = new MesQcIqcDO(); + updateObj.setId(id); + updateObj.setStatus(1); + iqcMapper.updateById(updateObj); + // TODO @芋艿：WM 模块迁移后，更新到货通知单行/外协入库单行的检验结果 + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteIqc(Long id) { + // 1. 校验存在 + MesQcIqcDO iqc = validateIqcExists(id); + // 2. 仅草稿可删 + if (!Objects.equals(iqc.getStatus(), 0)) { + throw exception(QC_IQC_ONLY_PREPARE_CAN_DELETE); + } + // 3. 删除主表 + iqcMapper.deleteById(id); + // 4. 级联删除行 + iqcLineMapper.deleteByIqcId(id); + // 5. 级联删除缺陷记录 + iqcDefectMapper.deleteByIqcId(id); + } + + private MesQcIqcDO validateIqcExists(Long id) { + MesQcIqcDO iqc = iqcMapper.selectById(id); + if (iqc == null) { + throw exception(QC_IQC_NOT_EXISTS); + } + 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 MesQcIqcLineDO getIqcLine(Long id) { + return iqcLineMapper.selectById(id); + } + + @Override + public PageResult getIqcLinePage(MesQcIqcLinePageReqVO pageReqVO) { + return iqcLineMapper.selectPage(pageReqVO); + } + + // ========== 来料检验缺陷记录 ========== + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createIqcDefect(MesQcIqcDefectSaveReqVO createReqVO) { + // 1. 校验 IQC 存在 + validateIqcExists(createReqVO.getIqcId()); + // 2. 校验行存在 + validateIqcLineExists(createReqVO.getLineId()); + // 3. 插入 + MesQcIqcDefectDO defect = BeanUtils.toBean(createReqVO, MesQcIqcDefectDO.class); + iqcDefectMapper.insert(defect); + // 4. 重新计算缺陷统计 + recalculateDefectStats(createReqVO.getIqcId()); + return defect.getId(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateIqcDefect(MesQcIqcDefectSaveReqVO updateReqVO) { + // 1. 校验存在 + validateIqcDefectExists(updateReqVO.getId()); + // 2. 更新 + MesQcIqcDefectDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIqcDefectDO.class); + iqcDefectMapper.updateById(updateObj); + // 3. 重新计算缺陷统计 + recalculateDefectStats(updateReqVO.getIqcId()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteIqcDefect(Long id) { + // 1. 校验存在 + MesQcIqcDefectDO defect = validateIqcDefectExists(id); + // 2. 删除 + iqcDefectMapper.deleteById(id); + // 3. 重新计算缺陷统计 + recalculateDefectStats(defect.getIqcId()); + } + + private void validateIqcLineExists(Long id) { + if (iqcLineMapper.selectById(id) == null) { + throw exception(QC_IQC_LINE_NOT_EXISTS); + } + } + + private MesQcIqcDefectDO validateIqcDefectExists(Long id) { + MesQcIqcDefectDO defect = iqcDefectMapper.selectById(id); + if (defect == null) { + throw exception(QC_IQC_DEFECT_NOT_EXISTS); + } + return defect; + } + + @Override + public PageResult getIqcDefectPage(MesQcIqcDefectPageReqVO pageReqVO) { + return iqcDefectMapper.selectPage(pageReqVO); + } + + // ========== 内部方法 ========== + + /** + * 重新计算缺陷统计（行级 + 主表级） + * + * @param iqcId 来料检验单 ID + */ + private void recalculateDefectStats(Long iqcId) { + // 1. 查询所有缺陷记录 + List defects = iqcDefectMapper.selectListByIqcId(iqcId); + + // 2. 更新每行的缺陷数量 + List lines = iqcLineMapper.selectListByIqcId(iqcId); + for (MesQcIqcLineDO line : lines) { + int critical = 0, major = 0, minor = 0; + for (MesQcIqcDefectDO defect : defects) { + if (Objects.equals(defect.getLineId(), line.getId())) { + int qty = defect.getDefectQuantity() != null ? defect.getDefectQuantity() : 1; + switch (defect.getDefectLevel()) { + case "CRITICAL": critical += qty; break; + case "MAJOR": major += qty; break; + case "MINOR": minor += qty; break; + } + } + } + MesQcIqcLineDO updateLine = new MesQcIqcLineDO(); + updateLine.setId(line.getId()); + updateLine.setCriticalQuantity(critical); + updateLine.setMajorQuantity(major); + updateLine.setMinorQuantity(minor); + iqcLineMapper.updateById(updateLine); + } + + // 3. 汇总主表的缺陷数量 + int totalCritical = 0, totalMajor = 0, totalMinor = 0; + for (MesQcIqcDefectDO defect : defects) { + int qty = defect.getDefectQuantity() != null ? defect.getDefectQuantity() : 1; + switch (defect.getDefectLevel()) { + case "CRITICAL": totalCritical += qty; break; + case "MAJOR": totalMajor += qty; break; + case "MINOR": totalMinor += qty; break; + } + } + + // 4. 计算缺陷率 + MesQcIqcDO iqc = iqcMapper.selectById(iqcId); + BigDecimal criticalRate = BigDecimal.ZERO; + BigDecimal majorRate = BigDecimal.ZERO; + BigDecimal minorRate = BigDecimal.ZERO; + if (iqc != null && iqc.getCheckQuantity() != null && iqc.getCheckQuantity() > 0) { + BigDecimal checkQty = BigDecimal.valueOf(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); + } + + // 5. 更新主表 + MesQcIqcDO updateIqc = new MesQcIqcDO(); + updateIqc.setId(iqcId); + updateIqc.setCriticalQuantity(totalCritical); + updateIqc.setMajorQuantity(totalMajor); + updateIqc.setMinorQuantity(totalMinor); + updateIqc.setCriticalRate(criticalRate); + updateIqc.setMajorRate(majorRate); + updateIqc.setMinorRate(minorRate); + iqcMapper.updateById(updateIqc); + } + +}