From 6d4dc2bdf47d29f76f0ef5d03b32176364433fec Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 22 Feb 2026 12:24:20 +0800 Subject: [PATCH] feat(mes): add RQC line request and response VO, and implement RQC line controller and service --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcLineController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcPageReqVO.java | 42 ++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLinePageReqVO.java | 20 ++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcDO.java | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcLineDO.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcLineMapper.java | 35 +++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java | 36 ++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineService.java | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 1428 insertions(+), 0 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcLineController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLinePageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcLineDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcLineMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java new file mode 100644 index 0000000..c79fe38 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java @@ -0,0 +1,146 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc; + +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.rqc.vo.MesQcRqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO; +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.qc.rqc.MesQcRqcDO; +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.qc.rqc.MesQcRqcService; +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.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 退货检验单（RQC）") +@RestController +@RequestMapping("/mes/qc/rqc") +@Validated +public class MesQcRqcController { + + @Resource + private MesQcRqcService rqcService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建退货检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:create')") + public CommonResult createRqc(@Valid @RequestBody MesQcRqcSaveReqVO createReqVO) { + return success(rqcService.createRqc(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新退货检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:update')") + public CommonResult updateRqc(@Valid @RequestBody MesQcRqcSaveReqVO updateReqVO) { + rqcService.updateRqc(updateReqVO); + return success(true); + } + + @PutMapping("/complete") + @Operation(summary = "完成退货检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:update')") + public CommonResult completeRqc(@RequestParam("id") Long id) { + rqcService.completeRqc(id); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除退货检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:delete')") + public CommonResult deleteRqc(@RequestParam("id") Long id) { + rqcService.deleteRqc(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得退货检验单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:query')") + public CommonResult getRqc(@RequestParam("id") Long id) { + MesQcRqcDO rqc = rqcService.getRqc(id); + return success(buildRqcRespVOList(Collections.singletonList(rqc)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得退货检验单分页") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:query')") + public CommonResult> getRqcPage(@Valid MesQcRqcPageReqVO pageReqVO) { + PageResult pageResult = rqcService.getRqcPage(pageReqVO); + return success(new PageResult<>(buildRqcRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出退货检验单 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportRqcExcel(@Valid MesQcRqcPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = rqcService.getRqcPage(pageReqVO).getList(); + List voList = buildRqcRespVOList(list); + ExcelUtils.write(response, "退货检验单.xls", "数据", MesQcRqcRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildRqcRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 批量查询物料 + Map itemMap = itemService.getItemMap( + convertSet(list, MesQcRqcDO::getItemId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 批量查询检测人员 + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesQcRqcDO::getInspectorUserId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcRqcRespVO.class, vo -> { + 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/rqc/MesQcRqcLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcLineController.java new file mode 100644 index 0000000..f28c372 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcLineController.java @@ -0,0 +1,98 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc; + +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.rqc.vo.line.MesQcRqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.line.MesQcRqcLineRespVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.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.rqc.MesQcRqcLineService; +import cn.iocoder.yudao.module.mes.service.qc.indicator.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/rqc/line") +@Validated +public class MesQcRqcLineController { + + @Resource + private MesQcRqcLineService rqcLineService; + @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-rqc:query')") + public CommonResult getRqcLine(@RequestParam("id") Long id) { + MesQcRqcLineDO line = rqcLineService.getRqcLine(id); + return success(buildLineRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得退货检验单行分页") + @PreAuthorize("@ss.hasPermission('mes:qc-rqc:query')") + public CommonResult> getRqcLinePage(@Valid MesQcRqcLinePageReqVO pageReqVO) { + PageResult pageResult = rqcLineService.getRqcLinePage(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, MesQcRqcLineDO::getIndicatorId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(list, MesQcRqcLineDO::getUnitMeasureId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcRqcLineRespVO.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/rqc/vo/MesQcRqcPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcPageReqVO.java new file mode 100644 index 0000000..6414539 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcPageReqVO.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.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 MesQcRqcPageReqVO extends PageParam { + + @Schema(description = "检验单编号", example = "RQC2025") + private String code; + + @Schema(description = "产品物料 ID", example = "20") + private Long itemId; + + @Schema(description = "退货检验类型", example = "1") + private String rqcType; + + @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/rqc/vo/MesQcRqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java new file mode 100644 index 0000000..5e91813 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java @@ -0,0 +1,117 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.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 MesQcRqcRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RQC20250101001") + @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 = "RTISSUE") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "RT20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 退货类型 ========== + + @Schema(description = "退货检验类型", example = "1") + @ExcelProperty("退货类型") + private String rqcType; + + // ========== 物料 ========== + + @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 = "BATCH001") + @ExcelProperty("批次号") + private String batchCode; + + // ========== 数量 ========== + + @Schema(description = "检测数量", example = "100") + @ExcelProperty("检测数量") + private BigDecimal checkQuantity; + + @Schema(description = "合格品数量", example = "90") + @ExcelProperty("合格品数量") + private BigDecimal qualifiedQuantity; + + @Schema(description = "不合格数量", example = "10") + @ExcelProperty("不合格数量") + private BigDecimal unqualifiedQuantity; + + // ========== 检验 ========== + + @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/rqc/vo/MesQcRqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java new file mode 100644 index 0000000..c52398f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java @@ -0,0 +1,83 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.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 MesQcRqcSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RQC20250101001") + @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 = "RTISSUE") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "RT20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 退货类型 ========== + + @Schema(description = "退货检验类型", example = "1") + private String rqcType; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") + @NotNull(message = "产品物料不能为空") + private Long itemId; + + @Schema(description = "批次号", example = "BATCH001") + private String batchCode; + + // ========== 数量 ========== + + @Schema(description = "检测数量", example = "100") + private BigDecimal checkQuantity; + + @Schema(description = "合格品数量", example = "90") + private BigDecimal qualifiedQuantity; + + @Schema(description = "不合格数量", example = "10") + private BigDecimal unqualifiedQuantity; + + // ========== 检验 ========== + + @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/rqc/vo/line/MesQcRqcLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLinePageReqVO.java new file mode 100644 index 0000000..f72361c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.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 MesQcRqcLinePageReqVO extends PageParam { + + @Schema(description = "退货检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "退货检验单 ID 不能为空") + private Long rqcId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java new file mode 100644 index 0000000..c680aeb --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/line/MesQcRqcLineRespVO.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.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 MesQcRqcLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "退货检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long rqcId; + + @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/oqc/MesQcOqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcDO.java new file mode 100644 index 0000000..766bf64 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcDO.java @@ -0,0 +1,197 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +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 出货检验单（OQC, Outgoing Quality Control） DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_oqc") +@KeySequence("mes_qc_oqc_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcOqcDO 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; + /** + * 来源单据类型 + */ + private String sourceDocType; + /** + * 来源单据编号 + */ + private String sourceDocCode; + /** + * 来源单据行 ID + */ + private Long sourceLineId; + + // ========== 客户 ========== + + /** + * 客户 ID + * + * 关联 {@link MesMdClientDO#getId()} + */ + private Long clientId; + /** + * 批次号 + */ + private String batchCode; + + // ========== 物料 ========== + + /** + * 产品物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + + // ========== 数量 ========== + + /** + * 最低检测数 + */ + private Integer minCheckQuantity; + /** + * 最大不合格数 + */ + private Integer maxUnqualifiedQuantity; + /** + * 本次出货数量 + */ + private BigDecimal outQuantity; + /** + * 本次检测数量 + */ + 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; + + // ========== 检验 ========== + + /** + * 检测结果 + * + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum} + */ + private Integer checkResult; + /** + * 出货日期 + */ + private LocalDateTime outDate; + /** + * 检测日期 + */ + private LocalDateTime inspectDate; + /** + * 检测人员用户 ID + * + * 关联 AdminUserDO 的 id + */ + private Long inspectorUserId; + /** + * 状态 + * + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcOqcStatusEnum} + */ + 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/oqc/MesQcOqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcLineDO.java new file mode 100644 index 0000000..1c23d12 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/oqc/MesQcOqcLineDO.java @@ -0,0 +1,103 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc; + +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 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_oqc_line") +@KeySequence("mes_qc_oqc_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcOqcLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 出货检验单 ID + * + * 关联 {@link MesQcOqcDO#getId()} + */ + private Long oqcId; + /** + * 检测指标 ID + * + * 关联 {@link MesQcIndicatorDO#getId()} + */ + private Long indicatorId; + /** + * 检测方法 + */ + 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/oqc/MesQcOqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcLineMapper.java new file mode 100644 index 0000000..34031d0 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcLineMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc; + +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.oqc.vo.line.MesQcOqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 出货检验单行 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcOqcLineMapper extends BaseMapperX { + + default PageResult selectPage(MesQcOqcLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesQcOqcLineDO::getOqcId, reqVO.getOqcId()) + .orderByAsc(MesQcOqcLineDO::getId)); + } + + default List selectListByOqcId(Long oqcId) { + return selectList(MesQcOqcLineDO::getOqcId, oqcId); + } + + default void deleteByOqcId(Long oqcId) { + delete(new LambdaQueryWrapperX() + .eq(MesQcOqcLineDO::getOqcId, oqcId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java new file mode 100644 index 0000000..d938559 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/oqc/MesQcOqcMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc; + +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.oqc.vo.MesQcOqcPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 出货检验单（OQC） Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcOqcMapper extends BaseMapperX { + + default PageResult selectPage(MesQcOqcPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesQcOqcDO::getCode, reqVO.getCode()) + .eqIfPresent(MesQcOqcDO::getClientId, reqVO.getClientId()) + .likeIfPresent(MesQcOqcDO::getBatchCode, reqVO.getBatchCode()) + .eqIfPresent(MesQcOqcDO::getItemId, reqVO.getItemId()) + .eqIfPresent(MesQcOqcDO::getCheckResult, reqVO.getCheckResult()) + .eqIfPresent(MesQcOqcDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesQcOqcDO::getOutDate, reqVO.getOutDate()) + .betweenIfPresent(MesQcOqcDO::getInspectDate, reqVO.getInspectDate()) + .eqIfPresent(MesQcOqcDO::getInspectorUserId, reqVO.getInspectorUserId()) + .orderByDesc(MesQcOqcDO::getId)); + } + + default MesQcOqcDO selectByCode(String code) { + return selectOne(MesQcOqcDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineService.java new file mode 100644 index 0000000..1f8fbb2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineService.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.service.qc.oqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.line.MesQcOqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO; + +import java.util.List; + +/** + * MES 出货检验单行 Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcOqcLineService { + + /** + * 获得出货检验行 + * + * @param id 编号 + * @return 出货检验行 + */ + MesQcOqcLineDO getOqcLine(Long id); + + /** + * 获得出货检验行分页 + * + * @param pageReqVO 分页查询 + * @return 出货检验行分页 + */ + PageResult getOqcLinePage(MesQcOqcLinePageReqVO pageReqVO); + + /** + * 根据出货检验单 ID 查询所有行 + * + * @param oqcId 出货检验单 ID + * @return 行列表 + */ + List getOqcLineListByOqcId(Long oqcId); + + /** + * 从模板指标自动生成检验行 + * + * @param oqcId 出货检验单 ID + * @param templateId 模板 ID + */ + void createLinesFromTemplate(Long oqcId, Long templateId); + + /** + * 根据出货检验单 ID 级联删除所有行 + * + * @param oqcId 出货检验单 ID + */ + void deleteByOqcId(Long oqcId); + + /** + * 校验出货检验行存在 + * + * @param id 编号 + * @return 出货检验行 + */ + MesQcOqcLineDO validateOqcLineExists(Long id); + + /** + * 根据缺陷记录重新计算行级缺陷统计 + * + * @param oqcId 出货检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateLineDefectStats(Long oqcId, List records); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java new file mode 100644 index 0000000..d922584 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java @@ -0,0 +1,112 @@ +package cn.iocoder.yudao.module.mes.service.qc.oqc; + +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.oqc.vo.line.MesQcOqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcLineMapper; +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 MesQcOqcLineServiceImpl implements MesQcOqcLineService { + + @Resource + private MesQcOqcLineMapper oqcLineMapper; + @Resource + private MesQcTemplateIndicatorMapper templateIndicatorMapper; + + @Override + public MesQcOqcLineDO validateOqcLineExists(Long id) { + MesQcOqcLineDO line = oqcLineMapper.selectById(id); + if (line == null) { + throw exception(QC_OQC_LINE_NOT_EXISTS); + } + return line; + } + + @Override + public MesQcOqcLineDO getOqcLine(Long id) { + return oqcLineMapper.selectById(id); + } + + @Override + public PageResult getOqcLinePage(MesQcOqcLinePageReqVO pageReqVO) { + return oqcLineMapper.selectPage(pageReqVO); + } + + @Override + public void createLinesFromTemplate(Long oqcId, Long templateId) { + List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); + List lines = convertList(indicators, indicator -> new MesQcOqcLineDO() + .setOqcId(oqcId).setIndicatorId(indicator.getIndicatorId()) + .setCheckMethod(indicator.getCheckMethod()) + .setStandardValue(indicator.getStandardValue()).setUnitMeasureId(indicator.getUnitMeasureId()) + .setMaxThreshold(indicator.getThresholdMax()).setMinThreshold(indicator.getThresholdMin()) + .setCriticalQuantity(0).setMajorQuantity(0).setMinorQuantity(0)); + oqcLineMapper.insertBatch(lines); + } + + @Override + public void recalculateLineDefectStats(Long oqcId, List records) { + List lines = oqcLineMapper.selectListByOqcId(oqcId); + if (CollUtil.isEmpty(lines)) { + return; + } + List updateLines = new ArrayList<>(lines.size()); + for (MesQcOqcLineDO 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 MesQcOqcLineDO().setId(line.getId()) + .setCriticalQuantity(critical).setMajorQuantity(major).setMinorQuantity(minor)); + } + for (MesQcOqcLineDO updateLine : updateLines) { + oqcLineMapper.updateById(updateLine); + } + } + + @Override + public List getOqcLineListByOqcId(Long oqcId) { + return oqcLineMapper.selectListByOqcId(oqcId); + } + + @Override + public void deleteByOqcId(Long oqcId) { + oqcLineMapper.deleteByOqcId(oqcId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java new file mode 100644 index 0000000..b8bac60 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcService.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.mes.service.qc.oqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 出货检验单（OQC） Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcOqcService { + + /** + * 创建出货检验单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createOqc(@Valid MesQcOqcSaveReqVO createReqVO); + + /** + * 更新出货检验单 + * + * @param updateReqVO 更新信息 + */ + void updateOqc(@Valid MesQcOqcSaveReqVO updateReqVO); + + /** + * 完成出货检验单 + * + * @param id 编号 + */ + void completeOqc(Long id); + + /** + * 删除出货检验单 + * + * @param id 编号 + */ + void deleteOqc(Long id); + + /** + * 校验出货检验单存在 + * + * @param id 编号 + * @return 出货检验单 + */ + MesQcOqcDO validateOqcExists(Long id); + + /** + * 获得出货检验单 + * + * @param id 编号 + * @return 出货检验单 + */ + MesQcOqcDO getOqc(Long id); + + /** + * 获得出货检验单分页 + * + * @param pageReqVO 分页查询 + * @return 出货检验单分页 + */ + PageResult getOqcPage(MesQcOqcPageReqVO pageReqVO); + + /** + * 根据缺陷记录重新计算主表的缺陷统计（含行级下沉） + * + * @param oqcId 出货检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateDefectStats(Long oqcId, List records); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java new file mode 100644 index 0000000..08757a4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java @@ -0,0 +1,215 @@ +package cn.iocoder.yudao.module.mes.service.qc.oqc; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO; +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.oqc.MesQcOqcMapper; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcOqcStatusEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; +import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; +import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService; +import 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 出货检验单（OQC） Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcOqcServiceImpl implements MesQcOqcService { + + @Resource + private MesQcOqcMapper oqcMapper; + @Resource + private MesQcTemplateService templateService; + @Resource + private MesQcOqcLineService oqcLineService; + @Resource + @Lazy + private MesQcDefectRecordService defectRecordService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createOqc(MesQcOqcSaveReqVO createReqVO) { + // 1.1 校验编号唯一 + validateOqcCodeUnique(null, createReqVO.getCode()); + // 1.2 校验模板存在且包含 OQC 类型 + Long templateId = createReqVO.getTemplateId(); + MesQcTemplateDO template = templateService.validateTemplateExists(templateId); + if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.OQC.getType())) { + throw exception(QC_OQC_NO_TEMPLATE); + } + + // 1.3 从模板的产品关联中获取检测参数 + // TODO @芋艿：【暂时不用删除】到底 miniCheckQuantity 和 maxUnqualifiedQuantity 是否有必要存储？ + MesQcTemplateItemDO templateItem = templateService.getTemplateItemByTemplateIdAndItemId( + templateId, createReqVO.getItemId()); + if (templateItem != null) { + if (createReqVO.getMinCheckQuantity() == null) { + createReqVO.setMinCheckQuantity(templateItem.getQuantityCheck()); + } + if (createReqVO.getMaxUnqualifiedQuantity() == null) { + createReqVO.setMaxUnqualifiedQuantity(templateItem.getQuantityUnqualified()); + } + } + + // 2. 插入主表 + MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class); + oqc.setStatus(MesQcOqcStatusEnum.PREPARE.getType()); + oqcMapper.insert(oqc); + + // 3. 从模板指标自动生成检验行 + oqcLineService.createLinesFromTemplate(oqc.getId(), templateId); + return oqc.getId(); + } + + @Override + public void updateOqc(MesQcOqcSaveReqVO updateReqVO) { + // 1.1 校验存在 + 草稿状态 + validateOqcStatusPrepare(updateReqVO.getId()); + // 1.2 校验编号唯一 + validateOqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 2. 更新 + MesQcOqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcOqcDO.class); + oqcMapper.updateById(updateObj); + } + + @Override + public void completeOqc(Long id) { + // 1.1 校验存在 + 草稿状态 + MesQcOqcDO oqc = validateOqcStatusPrepare(id); + // 1.2 校验合格品 + 不合格品 = 检测数量 + if (oqc.getCheckQuantity() != null && oqc.getCheckQuantity() > 0) { + int total = (oqc.getQualifiedQuantity() != null ? oqc.getQualifiedQuantity() : 0) + + (oqc.getUnqualifiedQuantity() != null ? oqc.getUnqualifiedQuantity() : 0); + if (total != oqc.getCheckQuantity()) { + throw exception(QC_OQC_QUANTITY_MISMATCH); + } + } + + // 2. 更新状态为已完成 + MesQcOqcDO updateObj = new MesQcOqcDO() + .setId(id).setStatus(MesQcOqcStatusEnum.FINISHED.getType()); + oqcMapper.updateById(updateObj); + + // TODO @芋艿：WM 模块迁移后，更新销售出库单行的检验结果 + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteOqc(Long id) { + // 1. 校验存在 + 草稿状态 + validateOqcStatusPrepare(id); + + // 2.1 删除主表 + oqcMapper.deleteById(id); + // 2.2 级联删除行 + oqcLineService.deleteByOqcId(id); + // 2.3 级联删除缺陷记录 + defectRecordService.deleteByQcTypeAndQcId(MesQcTypeEnum.OQC.getType(), id); + } + + @Override + public MesQcOqcDO validateOqcExists(Long id) { + MesQcOqcDO oqc = oqcMapper.selectById(id); + if (oqc == null) { + throw exception(QC_OQC_NOT_EXISTS); + } + return oqc; + } + + /** + * 校验出货检验单存在且为草稿状态 + */ + private MesQcOqcDO validateOqcStatusPrepare(Long id) { + MesQcOqcDO oqc = validateOqcExists(id); + if (ObjUtil.notEqual(oqc.getStatus(), MesQcOqcStatusEnum.PREPARE.getType())) { + throw exception(QC_OQC_NOT_PREPARE); + } + return oqc; + } + + private void validateOqcCodeUnique(Long id, String code) { + MesQcOqcDO oqc = oqcMapper.selectByCode(code); + if (oqc == null) { + return; + } + if (ObjUtil.notEqual(oqc.getId(), id)) { + throw exception(QC_OQC_CODE_DUPLICATE); + } + } + + @Override + public MesQcOqcDO getOqc(Long id) { + return oqcMapper.selectById(id); + } + + @Override + public PageResult getOqcPage(MesQcOqcPageReqVO pageReqVO) { + return oqcMapper.selectPage(pageReqVO); + } + + @Override + public void recalculateDefectStats(Long oqcId, List records) { + // 1. 行级缺陷统计 + oqcLineService.recalculateLineDefectStats(oqcId, 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 计算缺陷率 + MesQcOqcDO oqc = validateOqcExists(oqcId); + BigDecimal criticalRate = BigDecimal.ZERO; + BigDecimal majorRate = BigDecimal.ZERO; + BigDecimal minorRate = BigDecimal.ZERO; + if (oqc.getCheckQuantity() != null && oqc.getCheckQuantity() > 0) { + BigDecimal checkQty = BigDecimal.valueOf(oqc.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. 更新主表 + MesQcOqcDO updateOqc = new MesQcOqcDO().setId(oqcId) + .setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor) + .setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate); + oqcMapper.updateById(updateOqc); + } + +} -- libgit2 0.21.4