diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java new file mode 100644 index 0000000..44e613d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java @@ -0,0 +1,155 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc; + +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.oqc.vo.MesQcOqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO; +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.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO; +import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService; +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.oqc.MesQcOqcService; +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 出货检验单(OQC)") +@RestController +@RequestMapping("/mes/qc/oqc") +@Validated +public class MesQcOqcController { + + @Resource + private MesQcOqcService oqcService; + @Resource + private MesMdClientService clientService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建出货检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:create')") + public CommonResult createOqc(@Valid @RequestBody MesQcOqcSaveReqVO createReqVO) { + return success(oqcService.createOqc(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新出货检验单") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:update')") + public CommonResult updateOqc(@Valid @RequestBody MesQcOqcSaveReqVO updateReqVO) { + oqcService.updateOqc(updateReqVO); + return success(true); + } + + @PutMapping("/complete") + @Operation(summary = "完成出货检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:update')") + public CommonResult completeOqc(@RequestParam("id") Long id) { + oqcService.completeOqc(id); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除出货检验单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:delete')") + public CommonResult deleteOqc(@RequestParam("id") Long id) { + oqcService.deleteOqc(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得出货检验单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')") + public CommonResult getOqc(@RequestParam("id") Long id) { + MesQcOqcDO oqc = oqcService.getOqc(id); + return success(buildOqcRespVOList(Collections.singletonList(oqc)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得出货检验单分页") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')") + public CommonResult> getOqcPage(@Valid MesQcOqcPageReqVO pageReqVO) { + PageResult pageResult = oqcService.getOqcPage(pageReqVO); + return success(new PageResult<>(buildOqcRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出出货检验单 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportOqcExcel(@Valid MesQcOqcPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = oqcService.getOqcPage(pageReqVO).getList(); + List voList = buildOqcRespVOList(list); + ExcelUtils.write(response, "出货检验单.xls", "数据", MesQcOqcRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildOqcRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 批量查询客户 + Map clientMap = clientService.getClientMap( + convertSet(list, MesQcOqcDO::getClientId)); + // 批量查询物料 + Map itemMap = itemService.getItemMap( + convertSet(list, MesQcOqcDO::getItemId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 批量查询检测人员 + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesQcOqcDO::getInspectorUserId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcOqcRespVO.class, vo -> { + findAndThen(clientMap, vo.getClientId(), + client -> vo.setClientNickname(client.getNickname())); + 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/oqc/MesQcOqcLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcLineController.java new file mode 100644 index 0000000..5973061 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcLineController.java @@ -0,0 +1,87 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc; + +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.oqc.vo.line.MesQcOqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.line.MesQcOqcLineRespVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO; +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService; +import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcLineService; +import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService; +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/oqc/line") +@Validated +public class MesQcOqcLineController { + + @Resource + private MesQcOqcLineService oqcLineService; + @Resource + private MesQcIndicatorService indicatorService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @GetMapping("/get") + @Operation(summary = "获得出货检验单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')") + public CommonResult getOqcLine(@RequestParam("id") Long id) { + MesQcOqcLineDO line = oqcLineService.getOqcLine(id); + return success(buildLineRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得出货检验单行分页") + @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')") + public CommonResult> getOqcLinePage(@Valid MesQcOqcLinePageReqVO pageReqVO) { + PageResult pageResult = oqcLineService.getOqcLinePage(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, MesQcOqcLineDO::getIndicatorId)); + // 批量查询计量单位 + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(list, MesQcOqcLineDO::getUnitMeasureId)); + // 拼装 VO + return BeanUtils.toBean(list, MesQcOqcLineRespVO.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())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcPageReqVO.java new file mode 100644 index 0000000..001a345 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcPageReqVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.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 MesQcOqcPageReqVO extends PageParam { + + @Schema(description = "检验单编号", example = "OQC2025") + private String code; + + @Schema(description = "客户 ID", example = "10") + private Long clientId; + + @Schema(description = "批次号", example = "BC2025") + private String batchCode; + + @Schema(description = "产品物料 ID", example = "20") + 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[] outDate; + + @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/oqc/vo/MesQcOqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java new file mode 100644 index 0000000..83111d9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java @@ -0,0 +1,154 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.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 MesQcOqcRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "OQC20250101001") + @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 = "SALES") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "SO20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 客户 ========== + + @Schema(description = "客户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + private Long clientId; + + @Schema(description = "客户简称", example = "客户A") + @ExcelProperty("客户简称") + private String clientNickname; + + @Schema(description = "批次号", example = "BC20250101") + @ExcelProperty("批次号") + private String batchCode; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") + private Long itemId; + + @Schema(description = "产品物料编码", example = "ITEM001") + @ExcelProperty("产品物料编码") + private String itemCode; + + @Schema(description = "产品物料名称", example = "物料A") + @ExcelProperty("产品物料名称") + private String itemName; + + @Schema(description = "规格型号", example = "100mm*50mm") + private String itemSpecification; + + @Schema(description = "单位名称", example = "个") + private String unitName; + + // ========== 数量 ========== + + @Schema(description = "最低检测数", example = "5") + private Integer minCheckQuantity; + + @Schema(description = "最大不合格数", example = "0") + private Integer maxUnqualifiedQuantity; + + @Schema(description = "本次出货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @ExcelProperty("出货数量") + private BigDecimal outQuantity; + + @Schema(description = "本次检测数量", example = "10") + @ExcelProperty("检测数量") + private Integer checkQuantity; + + @Schema(description = "合格品数量", example = "9") + @ExcelProperty("合格品数量") + private Integer qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "1") + @ExcelProperty("不合格品数量") + private Integer unqualifiedQuantity; + + // ========== 缺陷统计 ========== + + @Schema(description = "致命缺陷率(%)", example = "0.00") + private BigDecimal criticalRate; + + @Schema(description = "严重缺陷率(%)", example = "0.00") + private BigDecimal majorRate; + + @Schema(description = "轻微缺陷率(%)", example = "10.00") + private BigDecimal minorRate; + + @Schema(description = "致命缺陷数量", example = "0") + private Integer criticalQuantity; + + @Schema(description = "严重缺陷数量", example = "0") + private Integer majorQuantity; + + @Schema(description = "轻微缺陷数量", example = "1") + private Integer minorQuantity; + + // ========== 检验 ========== + + @Schema(description = "检测结果", example = "1") + @ExcelProperty("检测结果") + private Integer checkResult; + + @Schema(description = "出货日期") + @ExcelProperty("出货日期") + private LocalDateTime outDate; + + @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/oqc/vo/MesQcOqcSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java new file mode 100644 index 0000000..08fd1b8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java @@ -0,0 +1,97 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.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 MesQcOqcSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "检验单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "OQC20250101001") + @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 = "SALES") + private String sourceDocType; + + @Schema(description = "来源单据编号", example = "SO20250101001") + private String sourceDocCode; + + @Schema(description = "来源单据行 ID", example = "300") + private Long sourceLineId; + + // ========== 客户 ========== + + @Schema(description = "客户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + @NotNull(message = "客户不能为空") + private Long clientId; + + @Schema(description = "批次号", example = "BC20250101") + private String batchCode; + + // ========== 物料 ========== + + @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") + @NotNull(message = "产品物料不能为空") + private Long itemId; + + // ========== 数量 ========== + + @Schema(description = "最低检测数", example = "5") + private Integer minCheckQuantity; + + @Schema(description = "最大不合格数", example = "0") + private Integer maxUnqualifiedQuantity; + + @Schema(description = "本次出货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "本次出货数量不能为空") + private BigDecimal outQuantity; + + @Schema(description = "本次检测数量", example = "10") + private Integer checkQuantity; + + @Schema(description = "合格品数量", example = "9") + private Integer qualifiedQuantity; + + @Schema(description = "不合格品数量", example = "1") + private Integer unqualifiedQuantity; + + // ========== 检验 ========== + + @Schema(description = "检测结果", example = "1") + private Integer checkResult; + + @Schema(description = "出货日期") + private LocalDateTime outDate; + + @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/oqc/vo/line/MesQcOqcLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLinePageReqVO.java new file mode 100644 index 0000000..be83e18 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.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 MesQcOqcLinePageReqVO extends PageParam { + + @Schema(description = "出货检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "出货检验单 ID 不能为空") + private Long oqcId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java new file mode 100644 index 0000000..e47b6bb --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/line/MesQcOqcLineRespVO.java @@ -0,0 +1,66 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.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 MesQcOqcLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "出货检验单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + private Long oqcId; + + @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 = "检测方法", 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/rqc/MesQcRqcDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java new file mode 100644 index 0000000..1e9a7ce --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java @@ -0,0 +1,154 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.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 退货检验单(RQC, Return Quality Control) DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_rqc") +@KeySequence("mes_qc_rqc_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcRqcDO 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; + + // ========== 退货类型 ========== + + // TODO @AI:改成 int;然后枚举类在 dict constants 也添加下; + /** + * 退货检验类型 + * + * 字典 mes_rqc_type + */ + private String rqcType; + + // ========== 物料 ========== + + /** + * 产品物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 批次号 + */ + private String batchCode; + + // ========== 数量 ========== + + /** + * 检测数量 + */ + private BigDecimal checkQuantity; + /** + * 合格品数量 + */ + private BigDecimal qualifiedQuantity; + /** + * 不合格数量 + */ + private BigDecimal unqualifiedQuantity; + + // ========== 检验 ========== + + /** + * 检测结果 + * + * 枚举 {@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/rqc/MesQcRqcLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcLineDO.java new file mode 100644 index 0000000..322e8a6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcLineDO.java @@ -0,0 +1,110 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc; + +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_rqc_line") +@KeySequence("mes_qc_rqc_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcRqcLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 退货检验单 ID + * + * 关联 {@link MesQcRqcDO#getId()} + */ + private Long rqcId; + /** + * 检测指标 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/rqc/MesQcRqcLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/rqc/MesQcRqcLineMapper.java new file mode 100644 index 0000000..1fc134d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/rqc/MesQcRqcLineMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc; + +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.rqc.vo.line.MesQcRqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 退货检验行 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcRqcLineMapper extends BaseMapperX { + + default PageResult selectPage(MesQcRqcLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesQcRqcLineDO::getRqcId, reqVO.getRqcId()) + .orderByAsc(MesQcRqcLineDO::getId)); + } + + default List selectListByRqcId(Long rqcId) { + return selectList(MesQcRqcLineDO::getRqcId, rqcId); + } + + default void deleteByRqcId(Long rqcId) { + delete(new LambdaQueryWrapperX() + .eq(MesQcRqcLineDO::getRqcId, rqcId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/rqc/MesQcRqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/rqc/MesQcRqcMapper.java new file mode 100644 index 0000000..af3523e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/rqc/MesQcRqcMapper.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc; + +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.rqc.vo.MesQcRqcPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 退货检验单(RQC) Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcRqcMapper extends BaseMapperX { + + default PageResult selectPage(MesQcRqcPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesQcRqcDO::getCode, reqVO.getCode()) + .eqIfPresent(MesQcRqcDO::getItemId, reqVO.getItemId()) + .eqIfPresent(MesQcRqcDO::getRqcType, reqVO.getRqcType()) + .eqIfPresent(MesQcRqcDO::getCheckResult, reqVO.getCheckResult()) + .eqIfPresent(MesQcRqcDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesQcRqcDO::getInspectDate, reqVO.getInspectDate()) + .eqIfPresent(MesQcRqcDO::getInspectorUserId, reqVO.getInspectorUserId()) + .orderByDesc(MesQcRqcDO::getId)); + } + + default MesQcRqcDO selectByCode(String code) { + return selectOne(MesQcRqcDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineService.java new file mode 100644 index 0000000..2992335 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineService.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.service.qc.rqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.line.MesQcRqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO; + +import java.util.List; + +/** + * MES 退货检验行 Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcRqcLineService { + + /** + * 校验退货检验行存在 + * + * @param id 编号 + * @return 退货检验行 + */ + MesQcRqcLineDO validateRqcLineExists(Long id); + + /** + * 获得退货检验行 + * + * @param id 编号 + * @return 退货检验行 + */ + MesQcRqcLineDO getRqcLine(Long id); + + /** + * 获得退货检验行分页 + * + * @param pageReqVO 分页查询 + * @return 退货检验行分页 + */ + PageResult getRqcLinePage(MesQcRqcLinePageReqVO pageReqVO); + + /** + * 从模板指标自动生成检验行 + * + * @param rqcId 退货检验单 ID + * @param templateId 模板 ID + */ + void createLinesFromTemplate(Long rqcId, Long templateId); + + /** + * 根据缺陷记录重新计算各行的缺陷统计数量 + * + * @param rqcId 退货检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateLineDefectStats(Long rqcId, List records); + + /** + * 根据退货检验单 ID 获取所有行 + * + * @param rqcId 退货检验单 ID + * @return 行列表 + */ + List getRqcLineListByRqcId(Long rqcId); + + /** + * 根据退货检验单 ID 级联删除所有行 + * + * @param rqcId 退货检验单 ID + */ + void deleteByRqcId(Long rqcId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineServiceImpl.java new file mode 100644 index 0000000..c35b50f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcLineServiceImpl.java @@ -0,0 +1,113 @@ +package cn.iocoder.yudao.module.mes.service.qc.rqc; + +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.rqc.vo.line.MesQcRqcLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateIndicatorDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc.MesQcRqcLineMapper; +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 MesQcRqcLineServiceImpl implements MesQcRqcLineService { + + @Resource + private MesQcRqcLineMapper rqcLineMapper; + @Resource + private MesQcTemplateIndicatorMapper templateIndicatorMapper; + + @Override + public MesQcRqcLineDO validateRqcLineExists(Long id) { + MesQcRqcLineDO line = rqcLineMapper.selectById(id); + if (line == null) { + throw exception(QC_RQC_LINE_NOT_EXISTS); + } + return line; + } + + @Override + public MesQcRqcLineDO getRqcLine(Long id) { + return rqcLineMapper.selectById(id); + } + + @Override + public PageResult getRqcLinePage(MesQcRqcLinePageReqVO pageReqVO) { + return rqcLineMapper.selectPage(pageReqVO); + } + + @Override + public void createLinesFromTemplate(Long rqcId, Long templateId) { + List indicators = templateIndicatorMapper.selectListByTemplateId(templateId); + List lines = convertList(indicators, indicator -> new MesQcRqcLineDO() + .setRqcId(rqcId).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)); + rqcLineMapper.insertBatch(lines); + } + + @Override + public void recalculateLineDefectStats(Long rqcId, List records) { + List lines = rqcLineMapper.selectListByRqcId(rqcId); + if (CollUtil.isEmpty(lines)) { + return; + } + List updateLines = new ArrayList<>(lines.size()); + for (MesQcRqcLineDO 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 MesQcRqcLineDO().setId(line.getId()) + .setCriticalQuantity(critical).setMajorQuantity(major).setMinorQuantity(minor)); + } + for (MesQcRqcLineDO updateLine : updateLines) { + rqcLineMapper.updateById(updateLine); + } + } + + @Override + public List getRqcLineListByRqcId(Long rqcId) { + return rqcLineMapper.selectListByRqcId(rqcId); + } + + @Override + public void deleteByRqcId(Long rqcId) { + rqcLineMapper.deleteByRqcId(rqcId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java new file mode 100644 index 0000000..e88729f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcService.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.mes.service.qc.rqc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 退货检验单(RQC) Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcRqcService { + + /** + * 创建退货检验单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createRqc(@Valid MesQcRqcSaveReqVO createReqVO); + + /** + * 更新退货检验单 + * + * @param updateReqVO 更新信息 + */ + void updateRqc(@Valid MesQcRqcSaveReqVO updateReqVO); + + /** + * 完成退货检验单 + * + * @param id 编号 + */ + void completeRqc(Long id); + + /** + * 删除退货检验单 + * + * @param id 编号 + */ + void deleteRqc(Long id); + + /** + * 校验退货检验单存在 + * + * @param id 编号 + * @return 退货检验单 + */ + MesQcRqcDO validateRqcExists(Long id); + + /** + * 获得退货检验单 + * + * @param id 编号 + * @return 退货检验单 + */ + MesQcRqcDO getRqc(Long id); + + /** + * 获得退货检验单分页 + * + * @param pageReqVO 分页查询 + * @return 退货检验单分页 + */ + PageResult getRqcPage(MesQcRqcPageReqVO pageReqVO); + + /** + * 根据缺陷记录重新计算行级缺陷统计 + * + * @param rqcId 退货检验单 ID + * @param records 缺陷记录列表 + */ + void recalculateDefectStats(Long rqcId, List records); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java new file mode 100644 index 0000000..39b420e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java @@ -0,0 +1,166 @@ +package cn.iocoder.yudao.module.mes.service.qc.rqc; + +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.rqc.vo.MesQcRqcPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.rqc.vo.MesQcRqcSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.rqc.MesQcRqcMapper; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcIqcStatusEnum; +import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum; +import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService; +import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService; +import 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.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 退货检验单(RQC) Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcRqcServiceImpl implements MesQcRqcService { + + @Resource + private MesQcRqcMapper rqcMapper; + @Resource + private MesQcTemplateService templateService; + @Resource + private MesQcRqcLineService rqcLineService; + @Resource + @Lazy + private MesQcDefectRecordService defectRecordService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createRqc(MesQcRqcSaveReqVO createReqVO) { + // 1.1 校验编号唯一 + validateRqcCodeUnique(null, createReqVO.getCode()); + // TODO @AI:关联的物资等存在的校验; + // 1.2 校验检验模板存在且支持 RQC 类型 + Long templateId = createReqVO.getTemplateId(); + MesQcTemplateDO template = templateService.validateTemplateExists(templateId); + if (!CollUtil.contains(template.getTypes(), MesQcTypeEnum.RQC.getType())) { + throw exception(QC_RQC_NO_TEMPLATE); + } + + // 2. 插入主表 + MesQcRqcDO rqc = BeanUtils.toBean(createReqVO, MesQcRqcDO.class) + .setStatus(MesQcIqcStatusEnum.PREPARE.getType()); + rqcMapper.insert(rqc); + + // 3. 从模板指标自动生成检验行 + rqcLineService.createLinesFromTemplate(rqc.getId(), templateId); + return rqc.getId(); + } + + @Override + public void updateRqc(MesQcRqcSaveReqVO updateReqVO) { + // 1.1 校验存在 + 草稿状态 + validateRqcStatusPrepare(updateReqVO.getId()); + // 1.2 校验编号唯一 + validateRqcCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 2. 更新 + MesQcRqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcRqcDO.class); + rqcMapper.updateById(updateObj); + } + + @Override + public void completeRqc(Long id) { + // 1.1 校验存在 + 草稿状态 + MesQcRqcDO rqc = validateRqcStatusPrepare(id); + // 1.2 校验合格品 + 不合格品 = 检测数量 + if (rqc.getCheckQuantity() != null && rqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) { + BigDecimal qualified = rqc.getQualifiedQuantity() != null ? rqc.getQualifiedQuantity() : BigDecimal.ZERO; + BigDecimal unqualified = rqc.getUnqualifiedQuantity() != null ? rqc.getUnqualifiedQuantity() : BigDecimal.ZERO; + if (qualified.add(unqualified).compareTo(rqc.getCheckQuantity()) != 0) { + throw exception(QC_RQC_QUANTITY_MISMATCH); + } + } + + // 2. 更新状态为已完成 + MesQcRqcDO updateObj = new MesQcRqcDO().setId(id).setStatus(MesQcIqcStatusEnum.FINISHED.getType()); + rqcMapper.updateById(updateObj); + + // TODO @芋艿:WM 模块迁移后,更新来源退料/退货单行的质量状态 + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteRqc(Long id) { + // 1. 校验存在 + 草稿状态 + validateRqcStatusPrepare(id); + + // 2.1 删除主表 + rqcMapper.deleteById(id); + // 2.2 级联删除行 + rqcLineService.deleteByRqcId(id); + // 2.3 级联删除缺陷记录 + defectRecordService.deleteByQcTypeAndQcId(MesQcTypeEnum.RQC.getType(), id); + } + + @Override + public MesQcRqcDO validateRqcExists(Long id) { + MesQcRqcDO rqc = rqcMapper.selectById(id); + if (rqc == null) { + throw exception(QC_RQC_NOT_EXISTS); + } + return rqc; + } + + /** + * 校验退货检验单存在且为草稿状态 + * + * @param id 退货检验单 ID + * @return 退货检验单 + */ + private MesQcRqcDO validateRqcStatusPrepare(Long id) { + MesQcRqcDO rqc = validateRqcExists(id); + if (ObjUtil.notEqual(rqc.getStatus(), MesQcIqcStatusEnum.PREPARE.getType())) { + throw exception(QC_RQC_NOT_PREPARE); + } + return rqc; + } + + private void validateRqcCodeUnique(Long id, String code) { + MesQcRqcDO rqc = rqcMapper.selectByCode(code); + if (rqc == null) { + return; + } + if (ObjUtil.notEqual(rqc.getId(), id)) { + throw exception(QC_RQC_CODE_DUPLICATE); + } + } + + @Override + public MesQcRqcDO getRqc(Long id) { + return rqcMapper.selectById(id); + } + + @Override + public PageResult getRqcPage(MesQcRqcPageReqVO pageReqVO) { + return rqcMapper.selectPage(pageReqVO); + } + + @Override + public void recalculateDefectStats(Long rqcId, List records) { + // RQC 只更新行级缺陷统计,主表不存储缺陷统计字段 + rqcLineService.recalculateLineDefectStats(rqcId, records); + } + +}