diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java new file mode 100644 index 0000000..69e501d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java @@ -0,0 +1,174 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc; + +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.ipqc.vo.MesQcIpqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO; +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.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; +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.workstation.MesMdWorkstationService; +import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; +import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +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.ArrayList; +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 过程检验单(IPQC)") +@RestController +@RequestMapping("/mes/qc/ipqc") +@Validated +public class MesQcIpqcController { + + @Resource + private MesQcIpqcService ipqcService; + @Resource + private MesProWorkOrderService workOrderService; + @Resource + private MesMdWorkstationService workstationService; + @Resource + private MesProProcessService processService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建过程检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:create')") + public CommonResult createIpqc(@Valid @RequestBody MesQcIpqcSaveReqVO createReqVO) { + return success(ipqcService.createIpqc(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新过程检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')") + public CommonResult updateIpqc(@Valid @RequestBody MesQcIpqcSaveReqVO updateReqVO) { + ipqcService.updateIpqc(updateReqVO); + return success(true); + } + + @PutMapping("/complete") + @Operation(summary = "完成过程检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:update')") + public CommonResult completeIpqc(@RequestParam("id") Long id) { + ipqcService.completeIpqc(id); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除过程检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:delete')") + public CommonResult deleteIpqc(@RequestParam("id") Long id) { + ipqcService.deleteIpqc(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得过程检验单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:query')") + public CommonResult getIpqc(@RequestParam("id") Long id) { + MesQcIpqcDO ipqc = ipqcService.getIpqc(id); + return success(buildIpqcRespVOList(Collections.singletonList(ipqc)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得过程检验单分页") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:query')") + public CommonResult> getIpqcPage(@Valid MesQcIpqcPageReqVO pageReqVO) { + PageResult pageResult = ipqcService.getIpqcPage(pageReqVO); + return success(new PageResult<>(buildIpqcRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出过程检验单 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportIpqcExcel(@Valid MesQcIpqcPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = ipqcService.getIpqcPage(pageReqVO).getList(); + List voList = buildIpqcRespVOList(list); + ExcelUtils.write(response, "过程检验单.xls", "数据", MesQcIpqcRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildIpqcRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 批量查询工单 + Map workOrderMap = workOrderService.getWorkOrderMap( + convertSet(list, MesQcIpqcDO::getWorkOrderId)); + // 批量查询工位 + Map workstationMap = workstationService.getWorkstationMap( + convertSet(list, MesQcIpqcDO::getWorkstationId)); + // 批量查询工序 + Map processMap = processService.getProcessMap( + convertSet(list, MesQcIpqcDO::getProcessId)); + // 批量查询物料 + Map itemMap = itemService.getItemMap( + convertSet(list, MesQcIpqcDO::getItemId)); + // 批量查询计量单位( + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 批量查询检测人员 + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesQcIpqcDO::getInspectorUserId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcIpqcRespVO.class, vo -> { + findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> vo + .setWorkOrderCode(workOrder.getCode()).setWorkOrderName(workOrder.getName())); + findAndThen(workstationMap, vo.getWorkstationId(), + ws -> vo.setWorkstationName(ws.getName())); + findAndThen(processMap, vo.getProcessId(), + process -> vo.setProcessName(process.getName())); + findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()); + findAndThen(unitMeasureMap, item.getUnitMeasureId(), + unit -> vo.setUnitName(unit.getName())); + }); + findAndThen(userMap, vo.getInspectorUserId(), + user -> vo.setInspectorNickname(user.getNickname())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java new file mode 100644 index 0000000..3ffa1bd --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcLineController.java @@ -0,0 +1,98 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc; + +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.ipqc.vo.line.MesQcIpqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.line.MesQcIpqcLineRespVO; +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.qc.ipqc.MesQcIpqcLineDO; +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.indicator.MesQcIndicatorService; +import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcLineService; +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/ipqc/line") +@Validated +public class MesQcIpqcLineController { + + @Resource + private MesQcIpqcLineService ipqcLineService; + @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-ipqc:query')") + public CommonResult getIpqcLine(@RequestParam("id") Long id) { + MesQcIpqcLineDO line = ipqcLineService.getIpqcLine(id); + return success(buildLineRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得过程检验单行分页") + @PreAuthorize("@ss.hasPermission('mes:qc-ipqc:query')") + public CommonResult> getIpqcLinePage(@Valid MesQcIpqcLinePageReqVO pageReqVO) { + PageResult pageResult = ipqcLineService.getIpqcLinePage(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, MesQcIpqcLineDO::getIndicatorId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(list, MesQcIpqcLineDO::getUnitMeasureId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcIpqcLineRespVO.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/ipqc/vo/MesQcIpqcPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java new file mode 100644 index 0000000..087dbdf --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcPageReqVO.java @@ -0,0 +1,48 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.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 MesQcIpqcPageReqVO extends PageParam { + + @Schema(description = "检验单编号", example = "IPQC2025") + private String code; + + @Schema(description = "IPQC 检验类型", example = "IPQC") + private String type; + + @Schema(description = "生产工单 ID", example = "10") + private Long workOrderId; + + @Schema(description = "工位 ID", example = "30") + private Long workstationId; + + @Schema(description = "产品物料 ID", example = "50") + private Long itemId; + + @Schema(description = "检测结果", example = "1") + private Integer checkResult; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "检测人员用户 ID", example = "1") + private Long inspectorUserId; + + @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/ipqc/vo/MesQcIpqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java new file mode 100644 index 0000000..36b6d7b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java @@ -0,0 +1,172 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.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 MesQcIpqcRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPQC20250101001") + @ExcelProperty("检验单编号") + private String code; + + @Schema(description = "检验单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX工单过程检验") + @ExcelProperty("检验单名称") + private String name; + + @Schema(description = "IPQC 检验类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPQC") + @ExcelProperty("检验类型") + private String type; + + @Schema(description = "检验模板 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long templateId; + + // ========== 来源单据 ========== + + @Schema(description = "来源单据 ID", example = "200") + private Long sourceDocId; + + @Schema(description = "来源单据类型", example = "FEEDBACK") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "FB20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 生产关联 ========== + + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + private Long workOrderId; + + @Schema(description = "工单编号", example = "WO20250101001") + @ExcelProperty("工单编号") + private String workOrderCode; + + @Schema(description = "工单名称", example = "生产工单A") + private String workOrderName; + + @Schema(description = "生产任务 ID", example = "20") + private Long taskId; + + @Schema(description = "工位 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30") + private Long workstationId; + + @Schema(description = "工位名称", example = "工位A") + @ExcelProperty("工位名称") + private String workstationName; + + @Schema(description = "工序 ID", example = "40") + private Long processId; + + @Schema(description = "工序名称", example = "组装") + @ExcelProperty("工序名称") + private String processName; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "50") + 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 = "100") + @ExcelProperty("检测数量") + private BigDecimal checkQuantity; + + @Schema(description = "合格品数量", example = "95") + @ExcelProperty("合格品数量") + private BigDecimal qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "5") + @ExcelProperty("不合格品数量") + private BigDecimal unqualifiedQuantity; + + @Schema(description = "工废数量", example = "2") + @ExcelProperty("工废数量") + private BigDecimal laborScrapQuantity; + + @Schema(description = "料废数量", example = "2") + @ExcelProperty("料废数量") + private BigDecimal materialScrapQuantity; + + @Schema(description = "其他废品数量", example = "1") + @ExcelProperty("其他废品数量") + private BigDecimal otherScrapQuantity; + + // ========== 缺陷统计 ========== + + @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 = "1") + @ExcelProperty("检测结果") + private Integer checkResult; + + @Schema(description = "检测日期") + @ExcelProperty("检测日期") + private LocalDateTime inspectDate; + + @Schema(description = "检测人员用户 ID", example = "1") + private Long inspectorUserId; + + @Schema(description = "检测人员昵称", example = "张三") + @ExcelProperty("检测人员") + private String inspectorNickname; + + @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/ipqc/vo/MesQcIpqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java new file mode 100644 index 0000000..1494fdf --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcSaveReqVO.java @@ -0,0 +1,102 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.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 MesQcIpqcSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPQC20250101001") + @NotEmpty(message = "检验单编号不能为空") + private String code; + + @Schema(description = "检验单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX工单过程检验") + @NotEmpty(message = "检验单名称不能为空") + private String name; + + @Schema(description = "IPQC 检验类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPQC") + @NotEmpty(message = "检验类型不能为空") + private String type; + + @Schema(description = "检验模板 ID", example = "100") + private Long templateId; + + // ========== 来源单据 ========== + + @Schema(description = "来源单据 ID", example = "200") + private Long sourceDocId; + + @Schema(description = "来源单据类型", example = "FEEDBACK") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "FB20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 生产关联 ========== + + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + @NotNull(message = "生产工单不能为空") + private Long workOrderId; + + @Schema(description = "生产任务 ID", example = "20") + private Long taskId; + + @Schema(description = "工位 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30") + @NotNull(message = "工位不能为空") + private Long workstationId; + + @Schema(description = "工序 ID", example = "40") + private Long processId; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", example = "50") + private Long itemId; + + // ========== 数量 ========== + + @Schema(description = "检测数量", example = "100") + private BigDecimal checkQuantity; + + @Schema(description = "合格品数量", example = "95") + private BigDecimal qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "5") + private BigDecimal unqualifiedQuantity; + + @Schema(description = "工废数量", example = "2") + private BigDecimal laborScrapQuantity; + + @Schema(description = "料废数量", example = "2") + private BigDecimal materialScrapQuantity; + + @Schema(description = "其他废品数量", example = "1") + private BigDecimal otherScrapQuantity; + + // ========== 检验 ========== + + @Schema(description = "检测结果", example = "1") + private Integer checkResult; + + @Schema(description = "检测日期") + private LocalDateTime inspectDate; + + @Schema(description = "检测人员用户 ID", example = "1") + private Long inspectorUserId; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLinePageReqVO.java new file mode 100644 index 0000000..92eba28 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.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 MesQcIpqcLinePageReqVO extends PageParam { + + @Schema(description = "过程检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "过程检验单 ID 不能为空") + private Long ipqcId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java new file mode 100644 index 0000000..34da6b2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/line/MesQcIpqcLineRespVO.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.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 MesQcIpqcLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "过程检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long ipqcId; + + @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/ipqc/MesQcIpqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java new file mode 100644 index 0000000..a52b4e7 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcDO.java @@ -0,0 +1,215 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc; + +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.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; +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 过程检验单(IPQC, In-Process Quality Control) DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_ipqc") +@KeySequence("mes_qc_ipqc_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcIpqcDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 检验单编号 + */ + private String code; + /** + * 检验单名称 + */ + private String name; + // TODO @AI:搞成 int 类型; + /** + * IPQC 检验类型 + * + * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_IPQC_TYPE} + */ + private String type; + /** + * 检验模板 ID + * + * 关联 {@link MesQcTemplateDO#getId()} + */ + private Long templateId; + + // ========== 来源单据(TODO @芋艿:PRO/WM 模块联动后接入) ========== + + /** + * 来源单据 ID + */ + private Long sourceDocId; + /** + * 来源单据类型 + */ + private String sourceDocType; + /** + * 来源单据编号 + */ + private String sourceDocCode; + /** + * 来源单据行 ID + */ + private Long sourceLineId; + + // ========== 生产关联 ========== + + /** + * 生产工单 ID + * + * 关联 {@link MesProWorkOrderDO#getId()} + */ + private Long workOrderId; + /** + * 生产任务 ID + * + * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO#getId()} + */ + private Long taskId; + /** + * 工位 ID + * + * 关联 {@link MesMdWorkstationDO#getId()} + */ + private Long workstationId; + /** + * 工序 ID + * + * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO#getId()} + */ + private Long processId; + + // ========== 物料 ========== + + /** + * 产品物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + + // ========== 数量 ========== + + /** + * 检测数量 + */ + private BigDecimal checkQuantity; + /** + * 合格品数量 + */ + private BigDecimal qualifiedQuantity; + /** + * 不合格品数量 + */ + private BigDecimal unqualifiedQuantity; + /** + * 工废数量 + */ + private BigDecimal laborScrapQuantity; + /** + * 料废数量 + */ + private BigDecimal materialScrapQuantity; + /** + * 其他废品数量 + */ + private BigDecimal otherScrapQuantity; + + // ========== 缺陷统计 ========== + + /** + * 致命缺陷率(%) + */ + 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 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/ipqc/MesQcIpqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java new file mode 100644 index 0000000..3843abf --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/ipqc/MesQcIpqcLineDO.java @@ -0,0 +1,110 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc; + +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_ipqc_line") +@KeySequence("mes_qc_ipqc_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcIpqcLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 过程检验单 ID + * + * 关联 {@link MesQcIpqcDO#getId()} + */ + private Long ipqcId; + /** + * 检测指标 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/ipqc/MesQcIpqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcLineMapper.java new file mode 100644 index 0000000..4dad4b9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcLineMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc; + +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.ipqc.vo.line.MesQcIpqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 过程检验单行 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcIpqcLineMapper extends BaseMapperX { + + default PageResult selectPage(MesQcIpqcLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesQcIpqcLineDO::getIpqcId, reqVO.getIpqcId()) + .orderByAsc(MesQcIpqcLineDO::getId)); + } + + default List selectListByIpqcId(Long ipqcId) { + return selectList(MesQcIpqcLineDO::getIpqcId, ipqcId); + } + + default void deleteByIpqcId(Long ipqcId) { + delete(new LambdaQueryWrapperX() + .eq(MesQcIpqcLineDO::getIpqcId, ipqcId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java new file mode 100644 index 0000000..a370683 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc; + +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.ipqc.vo.MesQcIpqcPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 过程检验单(IPQC) Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcIpqcMapper extends BaseMapperX { + + default PageResult selectPage(MesQcIpqcPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesQcIpqcDO::getCode, reqVO.getCode()) + .eqIfPresent(MesQcIpqcDO::getType, reqVO.getType()) + .eqIfPresent(MesQcIpqcDO::getWorkOrderId, reqVO.getWorkOrderId()) + .eqIfPresent(MesQcIpqcDO::getWorkstationId, reqVO.getWorkstationId()) + .eqIfPresent(MesQcIpqcDO::getItemId, reqVO.getItemId()) + .eqIfPresent(MesQcIpqcDO::getCheckResult, reqVO.getCheckResult()) + .eqIfPresent(MesQcIpqcDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesQcIpqcDO::getInspectDate, reqVO.getInspectDate()) + .eqIfPresent(MesQcIpqcDO::getInspectorUserId, reqVO.getInspectorUserId()) + .orderByDesc(MesQcIpqcDO::getId)); + } + + default MesQcIpqcDO selectByCode(String code) { + return selectOne(MesQcIpqcDO::getCode, code); + } + +} 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 cc9f07f..19e2f83 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 @@ -270,6 +270,24 @@ public interface ErrorCodeConstants { // ========== MES 质量管理-检验结果(1-040-606-000) ========== ErrorCode QC_RESULT_NOT_EXISTS = new ErrorCode(1_040_606_000, "检验结果不存在"); + // ========== MES 质量管理-出货检验(1-040-607-000) ========== + ErrorCode QC_OQC_NOT_EXISTS = new ErrorCode(1_040_607_000, "出货检验单不存在"); + ErrorCode QC_OQC_CODE_DUPLICATE = new ErrorCode(1_040_607_001, "出货检验单编号已存在"); + ErrorCode QC_OQC_NOT_PREPARE = new ErrorCode(1_040_607_002, "只有草稿状态的检验单才可操作"); + ErrorCode QC_OQC_QUANTITY_MISMATCH = new ErrorCode(1_040_607_004, "合格品与不合格品数量之和须等于检测数量"); + ErrorCode QC_OQC_NO_TEMPLATE = new ErrorCode(1_040_607_005, "当前产品未配置 OQC 检测模板"); + // ========== MES 质量管理-出货检验行(1-040-607-100) ========== + ErrorCode QC_OQC_LINE_NOT_EXISTS = new ErrorCode(1_040_607_100, "出货检验行不存在"); + + // ========== MES 质量管理-退货检验 RQC(1-040-608-000) ========== + ErrorCode QC_RQC_NOT_EXISTS = new ErrorCode(1_040_608_000, "退货检验单不存在"); + ErrorCode QC_RQC_CODE_DUPLICATE = new ErrorCode(1_040_608_001, "退货检验单编号已存在"); + ErrorCode QC_RQC_NOT_PREPARE = new ErrorCode(1_040_608_002, "只有草稿状态的检验单才可操作"); + ErrorCode QC_RQC_QUANTITY_MISMATCH = new ErrorCode(1_040_608_004, "合格品与不合格品数量之和须等于检测数量"); + ErrorCode QC_RQC_NO_TEMPLATE = new ErrorCode(1_040_608_005, "当前产品未配置 RQC 检测模板"); + // ========== MES 质量管理-退货检验行(1-040-608-100) ========== + ErrorCode QC_RQC_LINE_NOT_EXISTS = new ErrorCode(1_040_608_100, "退货检验行不存在"); + // ========== 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/enums/qc/MesQcOqcStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcOqcStatusEnum.java new file mode 100644 index 0000000..1f4f7ec --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcOqcStatusEnum.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.enums.qc; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 出货检验单状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesQcOqcStatusEnum implements ArrayValuable { + + PREPARE(0, "草稿"), + FINISHED(1, "已完成"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesQcOqcStatusEnum::getType).toArray(Integer[]::new); + + /** + * 状态值 + */ + private final Integer type; + /** + * 状态名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessService.java index 22ace74..7d7c9b3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessService.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcess import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; import jakarta.validation.Valid; + +import java.util.Collection; import java.util.List; import java.util.Map; @@ -54,7 +56,7 @@ public interface MesProProcessService { * @param ids 编号列表 * @return 生产工序列表 */ - List getProcessList(List ids); + List getProcessList(Collection ids); /** * 获得生产工序分页 @@ -85,7 +87,7 @@ public interface MesProProcessService { * @param ids 编号列表 * @return 工序 Map */ - default Map getProcessMap(List ids) { + default Map getProcessMap(Collection ids) { return convertMap(getProcessList(ids), MesProProcessDO::getId); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java index ec067db..6d3cbc5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -119,7 +120,7 @@ public class MesProProcessServiceImpl implements MesProProcessService { } @Override - public List getProcessList(List ids) { + public List getProcessList(Collection ids) { if (CollUtil.isEmpty(ids)) { return Collections.emptyList(); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineService.java new file mode 100644 index 0000000..8a1ac6b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineService.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.service.qc.ipqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.line.MesQcIpqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcLineDO; + +import java.util.List; + +/** + * MES 过程检验单行 Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcIpqcLineService { + + /** + * 获得过程检验行 + * + * @param id 编号 + * @return 过程检验行 + */ + MesQcIpqcLineDO getIpqcLine(Long id); + + /** + * 获得过程检验行分页 + * + * @param pageReqVO 分页查询 + * @return 过程检验行分页 + */ + PageResult getIpqcLinePage(MesQcIpqcLinePageReqVO pageReqVO); + + /** + * 根据过程检验单 ID 查询所有行 + * + * @param ipqcId 过程检验单 ID + * @return 行列表 + */ + List selectListByIpqcId(Long ipqcId); + + /** + * 从模板指标自动生成检验行 + * + * @param ipqcId 过程检验单 ID + * @param templateId 模板 ID + */ + void createLinesFromTemplate(Long ipqcId, Long templateId); + + /** + * 根据过程检验单 ID 级联删除所有行 + * + * @param ipqcId 过程检验单 ID + */ + void deleteByIpqcId(Long ipqcId); + + /** + * 校验过程检验行存在 + * + * @param id 编号 + * @return 过程检验行 + */ + MesQcIpqcLineDO validateIpqcLineExists(Long id); + + /** + * 根据缺陷记录重新计算行级缺陷统计 + * + * @param ipqcId 过程检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateLineDefectStats(Long ipqcId, List records); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java new file mode 100644 index 0000000..4a3342a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcLineServiceImpl.java @@ -0,0 +1,113 @@ +package cn.iocoder.yudao.module.mes.service.qc.ipqc; + +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.ipqc.vo.line.MesQcIpqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcLineMapper; +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 MesQcIpqcLineServiceImpl implements MesQcIpqcLineService { + + @Resource + private MesQcIpqcLineMapper ipqcLineMapper; + @Resource + private MesQcTemplateIndicatorMapper templateIndicatorMapper; + + @Override + public MesQcIpqcLineDO getIpqcLine(Long id) { + return ipqcLineMapper.selectById(id); + } + + @Override + public PageResult getIpqcLinePage(MesQcIpqcLinePageReqVO pageReqVO) { + return ipqcLineMapper.selectPage(pageReqVO); + } + + @Override + public List selectListByIpqcId(Long ipqcId) { + return ipqcLineMapper.selectListByIpqcId(ipqcId); + } + + @Override + public void createLinesFromTemplate(Long ipqcId, Long templateId) { + List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); + List lines = convertList(indicators, indicator -> new MesQcIpqcLineDO() + .setIpqcId(ipqcId).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)); + ipqcLineMapper.insertBatch(lines); + } + + @Override + public void deleteByIpqcId(Long ipqcId) { + ipqcLineMapper.deleteByIpqcId(ipqcId); + } + + @Override + public MesQcIpqcLineDO validateIpqcLineExists(Long id) { + MesQcIpqcLineDO line = ipqcLineMapper.selectById(id); + if (line == null) { + throw exception(QC_IPQC_LINE_NOT_EXISTS); + } + return line; + } + + @Override + public void recalculateLineDefectStats(Long ipqcId, List records) { + List lines = ipqcLineMapper.selectListByIpqcId(ipqcId); + if (CollUtil.isEmpty(lines)) { + return; + } + List updateLines = new ArrayList<>(lines.size()); + for (MesQcIpqcLineDO 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 MesQcIpqcLineDO().setId(line.getId()) + .setCriticalQuantity(critical).setMajorQuantity(major).setMinorQuantity(minor)); + } + for (MesQcIpqcLineDO updateLine : updateLines) { + ipqcLineMapper.updateById(updateLine); + } + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java new file mode 100644 index 0000000..f7f3c3f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcService.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.mes.service.qc.ipqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 过程检验单(IPQC) Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcIpqcService { + + /** + * 创建过程检验单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIpqc(@Valid MesQcIpqcSaveReqVO createReqVO); + + /** + * 更新过程检验单 + * + * @param updateReqVO 更新信息 + */ + void updateIpqc(@Valid MesQcIpqcSaveReqVO updateReqVO); + + /** + * 完成过程检验单 + * + * @param id 编号 + */ + void completeIpqc(Long id); + + /** + * 删除过程检验单 + * + * @param id 编号 + */ + void deleteIpqc(Long id); + + /** + * 获得过程检验单 + * + * @param id 编号 + * @return 过程检验单 + */ + MesQcIpqcDO getIpqc(Long id); + + /** + * 获得过程检验单分页 + * + * @param pageReqVO 分页查询 + * @return 过程检验单分页 + */ + PageResult getIpqcPage(MesQcIpqcPageReqVO pageReqVO); + + /** + * 校验过程检验单存在 + * + * @param id 编号 + * @return 过程检验单 + */ + MesQcIpqcDO validateIpqcExists(Long id); + + /** + * 根据缺陷记录重新计算主表的缺陷统计(含行级下沉) + * + * @param ipqcId 过程检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateDefectStats(Long ipqcId, List records); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java new file mode 100644 index 0000000..7d75e08 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java @@ -0,0 +1,240 @@ +package cn.iocoder.yudao.module.mes.service.qc.ipqc; + +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.ipqc.vo.MesQcIpqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO; +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.ipqc.MesQcIpqcMapper; +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.md.workstation.MesMdWorkstationService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; +import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; +import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; +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.*; + +/** + * MES 过程检验单(IPQC) Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcIpqcServiceImpl implements MesQcIpqcService { + + @Resource + private MesQcIpqcMapper ipqcMapper; + + @Resource + private MesQcTemplateService templateService; + @Resource + private MesQcIpqcLineService ipqcLineService; + @Resource + @Lazy + private MesProWorkOrderService workOrderService; + @Resource + @Lazy + private MesMdWorkstationService workstationService; + @Resource + @Lazy + private MesQcDefectRecordService defectRecordService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) { + // 1.1 校验编号唯一 + validateIpqcCodeUnique(null, createReqVO.getCode()); + + // 1.2 从工单获取产品物料 ID + // TODO @AI:需要校验 workOrderService 存在; +// TODO createReqVO 里的 itemId 字段去掉;直接去下面的实体去 set; + MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(createReqVO.getWorkOrderId()); + if (workOrder != null) { + createReqVO.setItemId(workOrder.getProductId()); + } + + // 1.3 从工位获取工序 ID + // TODO @AI:需要校验 workstationService 存在; + // TODO @AI:processId 不存储,去读取好了; + MesMdWorkstationDO workstation = workstationService.getWorkstation(createReqVO.getWorkstationId()); + if (workstation != null && workstation.getProcessId() != null) { + createReqVO.setProcessId(workstation.getProcessId()); + } + + // 1.4 根据产品 + 检验类型自动匹配模板 + // TODO @AI:直接调用 templateService 的校验方法; + MesQcTemplateDO template = templateService.getTemplateByItemIdAndType( + createReqVO.getItemId(), MesQcTypeEnum.IPQC.getType()); + if (template == null) { + throw exception(QC_IPQC_NO_TEMPLATE); + } + createReqVO.setTemplateId(template.getId()); + + // 1.5 从模板的产品关联中获取检测参数 + MesQcTemplateItemDO templateItem = templateService.getTemplateItemByTemplateIdAndItemId( + template.getId(), createReqVO.getItemId()); + // 模板产品关联可能为空(模板关联了其他产品但也可手动选择),此处不强制 + + // 2. 插入主表 + MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class); + ipqc.setStatus(MesQcIqcStatusEnum.PREPARE.getType()); + ipqcMapper.insert(ipqc); + + // 3. 从模板指标自动生成检验行 + ipqcLineService.createLinesFromTemplate(ipqc.getId(), template.getId()); + return ipqc.getId(); + } + + @Override + public void updateIpqc(MesQcIpqcSaveReqVO updateReqVO) { + // 1.1 校验存在 + 草稿状态 + validateIpqcStatusPrepare(updateReqVO.getId()); + // 1.2 校验编号唯一 + validateIpqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 2. 更新 + MesQcIpqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIpqcDO.class); + ipqcMapper.updateById(updateObj); + } + + @Override + public void completeIpqc(Long id) { + // 1.1 校验存在 + 草稿状态 + MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id); + // 1.2 校验合格品 + 不合格品 = 检测数量 + if (ipqc.getCheckQuantity() != null && ipqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { + BigDecimal qualified = ipqc.getQualifiedQuantity() != null ? ipqc.getQualifiedQuantity() : BigDecimal.ZERO; + BigDecimal unqualified = ipqc.getUnqualifiedQuantity() != null ? ipqc.getUnqualifiedQuantity() : BigDecimal.ZERO; + if (qualified.add(unqualified).compareTo(ipqc.getCheckQuantity()) != 0) { + throw exception(QC_IPQC_QUANTITY_MISMATCH); + } + } + + // 2. 更新状态为已完成 + MesQcIpqcDO updateObj = new MesQcIpqcDO(); + updateObj.setId(id); + updateObj.setStatus(MesQcIqcStatusEnum.FINISHED.getType()); + ipqcMapper.updateById(updateObj); + + // TODO @芋艿:IPQC 完成时的 PRO/WM 联动(报工反馈更新、产品产出单拆分),待 WM 模块迁移后对接 + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteIpqc(Long id) { + // 1. 校验存在 + 草稿状态 + validateIpqcStatusPrepare(id); + + // 2.1 删除主表 + ipqcMapper.deleteById(id); + // 2.2 级联删除行 + ipqcLineService.deleteByIpqcId(id); + // 2.3 级联删除缺陷记录 + defectRecordService.deleteByQcTypeAndQcId(MesQcTypeEnum.IPQC.getType(), id); + } + + @Override + public MesQcIpqcDO validateIpqcExists(Long id) { + MesQcIpqcDO ipqc = ipqcMapper.selectById(id); + if (ipqc == null) { + throw exception(QC_IPQC_NOT_EXISTS); + } + return ipqc; + } + + /** + * 校验过程检验单存在且为草稿状态 + * + * @param id 过程检验单 ID + * @return 过程检验单 + */ + private MesQcIpqcDO validateIpqcStatusPrepare(Long id) { + MesQcIpqcDO ipqc = validateIpqcExists(id); + if (ObjUtil.notEqual(ipqc.getStatus(), MesQcIqcStatusEnum.PREPARE.getType())) { + throw exception(QC_IPQC_NOT_PREPARE); + } + return ipqc; + } + + private void validateIpqcCodeUnique(Long id, String code) { + MesQcIpqcDO ipqc = ipqcMapper.selectByCode(code); + if (ipqc == null) { + return; + } + if (ObjUtil.notEqual(ipqc.getId(), id)) { + throw exception(QC_IPQC_CODE_DUPLICATE); + } + } + + @Override + public MesQcIpqcDO getIpqc(Long id) { + return ipqcMapper.selectById(id); + } + + @Override + public PageResult getIpqcPage(MesQcIpqcPageReqVO pageReqVO) { + return ipqcMapper.selectPage(pageReqVO); + } + + @Override + public void recalculateDefectStats(Long ipqcId, List records) { + // 1. 行级缺陷统计 + ipqcLineService.recalculateLineDefectStats(ipqcId, 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 计算缺陷率(IPQC 的 checkQuantity 是 BigDecimal) + MesQcIpqcDO ipqc = validateIpqcExists(ipqcId); + BigDecimal criticalRate = BigDecimal.ZERO; + BigDecimal majorRate = BigDecimal.ZERO; + BigDecimal minorRate = BigDecimal.ZERO; + if (ipqc.getCheckQuantity() != null && ipqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { + BigDecimal checkQty = ipqc.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. 更新主表 + MesQcIpqcDO updateIpqc = new MesQcIpqcDO().setId(ipqcId) + .setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor) + .setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate); + ipqcMapper.updateById(updateIpqc); + } + +}