From 7a59397700d7db6cc2b18d29148a40e6613d8c8a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 22 Feb 2026 16:13:50 +0800 Subject: [PATCH] feat(mes): add request and response VO for MES material request and material request line --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java | 34 ++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java | 16 ++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestLineDO.java | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestLineMapper.java | 32 ++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java | 26 ++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 5 ++++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 17 files changed, 1177 insertions(+), 1 deletion(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestLineDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestLineMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java new file mode 100644 index 0000000..589c755 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java @@ -0,0 +1,173 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest; + +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.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO; +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; +import cn.iocoder.yudao.module.mes.service.wm.materialrequest.MesWmMaterialRequestService; +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 领料申请单") +@RestController +@RequestMapping("/mes/wm/material-request") +@Validated +public class MesWmMaterialRequestController { + + @Resource + private MesWmMaterialRequestService materialRequestService; + @Resource + private MesMdWorkstationService workstationService; + @Resource + private MesProWorkOrderService workOrderService; + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建领料申请单") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:create')") + public CommonResult createMaterialRequest(@Valid @RequestBody MesWmMaterialRequestSaveReqVO createReqVO) { + return success(materialRequestService.createMaterialRequest(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改领料申请单") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult updateMaterialRequest(@Valid @RequestBody MesWmMaterialRequestSaveReqVO updateReqVO) { + materialRequestService.updateMaterialRequest(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除领料申请单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:delete')") + public CommonResult deleteMaterialRequest(@RequestParam("id") Long id) { + materialRequestService.deleteMaterialRequest(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得领料申请单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')") + public CommonResult getMaterialRequest(@RequestParam("id") Long id) { + MesWmMaterialRequestDO materialRequest = materialRequestService.getMaterialRequest(id); + if (materialRequest == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(materialRequest)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得领料申请单分页") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')") + public CommonResult> getMaterialRequestPage( + @Valid MesWmMaterialRequestPageReqVO pageReqVO) { + PageResult pageResult = materialRequestService.getMaterialRequestPage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出领料申请单 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMaterialRequestExcel(@Valid MesWmMaterialRequestPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = materialRequestService.getMaterialRequestPage(pageReqVO); + ExcelUtils.write(response, "领料申请单.xls", "数据", MesWmMaterialRequestRespVO.class, + buildRespVOList(pageResult.getList())); + } + + @PutMapping("/submit") + @Operation(summary = "提交领料申请单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult submitMaterialRequest(@RequestParam("id") Long id) { + materialRequestService.submitMaterialRequest(id); + return success(true); + } + + @PutMapping("/approve") + @Operation(summary = "审批领料申请单（开始备料）") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult approveMaterialRequest(@RequestParam("id") Long id) { + materialRequestService.approveMaterialRequest(id); + return success(true); + } + + @PutMapping("/finish") + @Operation(summary = "完成领料申请单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult finishMaterialRequest(@RequestParam("id") Long id) { + materialRequestService.finishMaterialRequest(id); + return success(true); + } + + @PutMapping("/cancel") + @Operation(summary = "取消领料申请单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult cancelMaterialRequest(@RequestParam("id") Long id) { + materialRequestService.cancelMaterialRequest(id); + return success(true); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map workstationMap = workstationService.getWorkstationMap( + convertSet(list, MesWmMaterialRequestDO::getWorkstationId)); + Map workOrderMap = workOrderService.getWorkOrderMap( + convertSet(list, MesWmMaterialRequestDO::getWorkOrderId)); + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesWmMaterialRequestDO::getUserId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmMaterialRequestRespVO.class, vo -> { + findAndThen(workstationMap, vo.getWorkstationId(), ws -> + vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName())); + findAndThen(workOrderMap, vo.getWorkOrderId(), wo -> + vo.setWorkOrderCode(wo.getCode())); + findAndThen(userMap, vo.getUserId(), user -> + vo.setUserNickname(user.getNickname())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java new file mode 100644 index 0000000..3245721 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java @@ -0,0 +1,111 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest; + +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.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO; +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.wm.materialrequest.MesWmMaterialRequestLineDO; +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.wm.materialrequest.MesWmMaterialRequestLineService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import 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; + +@Tag(name = "管理后台 - MES 领料申请单行") +@RestController +@RequestMapping("/mes/wm/material-request-line") +@Validated +public class MesWmMaterialRequestLineController { + + @Resource + private MesWmMaterialRequestLineService materialRequestLineService; + @Resource + private MesMdItemService itemService; + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @PostMapping("/create") + @Operation(summary = "创建领料申请单行") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:create')") + public CommonResult createMaterialRequestLine(@Valid @RequestBody MesWmMaterialRequestLineSaveReqVO createReqVO) { + return success(materialRequestLineService.createMaterialRequestLine(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改领料申请单行") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')") + public CommonResult updateMaterialRequestLine(@Valid @RequestBody MesWmMaterialRequestLineSaveReqVO updateReqVO) { + materialRequestLineService.updateMaterialRequestLine(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除领料申请单行") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:delete')") + public CommonResult deleteMaterialRequestLine(@RequestParam("id") Long id) { + materialRequestLineService.deleteMaterialRequestLine(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得领料申请单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')") + public CommonResult getMaterialRequestLine(@RequestParam("id") Long id) { + MesWmMaterialRequestLineDO line = materialRequestLineService.getMaterialRequestLine(id); + if (line == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得领料申请单行分页") + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')") + public CommonResult> getMaterialRequestLinePage( + @Valid MesWmMaterialRequestLinePageReqVO pageReqVO) { + PageResult pageResult = materialRequestLineService.getMaterialRequestLinePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmMaterialRequestLineDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(list, MesWmMaterialRequestLineDO::getUnitMeasureId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmMaterialRequestLineRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> + vo.setItemCode(item.getCode()).setSpecification(item.getSpecification())); + MapUtils.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/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java new file mode 100644 index 0000000..1931712 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +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) +public class MesWmMaterialRequestPageReqVO extends PageParam { + + @Schema(description = "工作站ID", example = "1") + private Long workstationId; + + @Schema(description = "生产工单ID", example = "1") + private Long workOrderId; + + @Schema(description = "需求人用户ID", example = "1") + private Long userId; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "需求时间范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java new file mode 100644 index 0000000..ac0b8a2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java @@ -0,0 +1,80 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.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.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 领料申请单 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesWmMaterialRequestRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "工作站ID", example = "1") + private Long workstationId; + + @Schema(description = "工作站编码", example = "WS0001") + @ExcelProperty("工作站编码") + private String workstationCode; + + @Schema(description = "工作站名称", example = "1#注塑工作站") + @ExcelProperty("工作站名称") + private String workstationName; + + @Schema(description = "生产工单ID", example = "1") + private Long workOrderId; + + @Schema(description = "生产工单编码", example = "MO20260222001") + @ExcelProperty("生产工单编码") + private String workOrderCode; + + @Schema(description = "需求人用户ID", example = "1") + private Long userId; + + @Schema(description = "需求人昵称", example = "管理员") + @ExcelProperty("需求人昵称") + private String userNickname; + + @Schema(description = "需求时间") + @ExcelProperty("需求时间") + private LocalDateTime requestTime; + + @Schema(description = "开始备料时间") + @ExcelProperty("开始备料时间") + private LocalDateTime startTime; + + @Schema(description = "完成时间") + @ExcelProperty("完成时间") + private LocalDateTime endTime; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + @ExcelProperty("状态") + private Integer status; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @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/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java new file mode 100644 index 0000000..0ce379d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java @@ -0,0 +1,48 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 领料申请单新增/修改 Request VO") +@Data +public class MesWmMaterialRequestSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "工作站ID", example = "1") + private Long workstationId; + + @Schema(description = "生产工单ID", example = "1") + private Long workOrderId; + + @Schema(description = "需求人用户ID", example = "1") + private Long userId; + + @Schema(description = "需求时间") + private LocalDateTime requestTime; + + @Schema(description = "开始备料时间") + private LocalDateTime startTime; + + @Schema(description = "完成时间") + private LocalDateTime endTime; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java new file mode 100644 index 0000000..86a844d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Schema(description = "管理后台 - MES 领料申请单行分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +public class MesWmMaterialRequestLinePageReqVO extends PageParam { + + @Schema(description = "领料申请单ID", example = "1") + private Long materialRequestId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java new file mode 100644 index 0000000..66cb785 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java @@ -0,0 +1,69 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line; + +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 MesWmMaterialRequestLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "领料申请单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long materialRequestId; + + @Schema(description = "产品物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long itemId; + + @Schema(description = "产品物料编码", example = "IF2022082432") + @ExcelProperty("物料编码") + private String itemCode; + + @Schema(description = "产品物料名称", example = "PVC 颗粒") + @ExcelProperty("物料名称") + private String itemName; + + @Schema(description = "规格型号", example = "透明") + @ExcelProperty("规格型号") + private String specification; + + @Schema(description = "计量单位ID", example = "1") + private Long unitMeasureId; + + @Schema(description = "计量单位名称", example = "公斤") + @ExcelProperty("计量单位") + private String unitMeasureName; + + @Schema(description = "需求数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00") + @ExcelProperty("需求数量") + private BigDecimal quantity; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @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/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java new file mode 100644 index 0000000..ffd39bf --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 领料申请单行新增/修改 Request VO") +@Data +public class MesWmMaterialRequestLineSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "领料申请单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "领料申请单ID不能为空") + private Long materialRequestId; + + @Schema(description = "产品物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "产品物料ID不能为空") + private Long itemId; + + @Schema(description = "产品物料名称", example = "PVC 颗粒") + private String itemName; + + @Schema(description = "计量单位ID", example = "1") + private Long unitMeasureId; + + @Schema(description = "需求数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00") + @NotNull(message = "需求数量不能为空") + @DecimalMin(value = "0.01", message = "需求数量必须大于 0") + private BigDecimal quantity; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java new file mode 100644 index 0000000..ae3e7b5 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java @@ -0,0 +1,90 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * MES 领料申请单 DO + */ +@TableName("mes_wm_material_request") +@KeySequence("mes_wm_material_request_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmMaterialRequestDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 工作站ID + * + * 关联 {@link MesMdWorkstationDO#getId()} + */ + private Long workstationId; + /** + * 生产工单ID + * + * 关联 {@link MesProWorkOrderDO#getId()} + */ + private Long workOrderId; + /** + * 需求人用户ID + * + * 关联 system_users.id + */ + private Long userId; + /** + * 需求时间 + */ + private LocalDateTime requestTime; + /** + * 开始备料时间 + */ + private LocalDateTime startTime; + /** + * 完成时间 + */ + private LocalDateTime endTime; + // TODO @AI：枚举类； + // TODO @AI：字典； + /** + * 状态 + * + * 0=草稿 1=备料中 2=待领料 3=已完成 4=已取消 + */ + 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/wm/materialrequest/MesWmMaterialRequestLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestLineDO.java new file mode 100644 index 0000000..be7be89 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestLineDO.java @@ -0,0 +1,79 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO; +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 + */ +@TableName("mes_wm_material_request_line") +@KeySequence("mes_wm_material_request_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmMaterialRequestLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 领料申请单ID + * + * 关联 {@link MesWmMaterialRequestDO#getId()} + */ + private Long materialRequestId; + /** + * 产品物料ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + // TODO @AI：不用快照，读取就好了。 + /** + * 产品物料名称（快照） + */ + private String itemName; + /** + * 计量单位ID + * + * 关联 {@link MesMdUnitMeasureDO#getId()} + */ + private Long unitMeasureId; + /** + * 需求数量 + */ + private BigDecimal quantity; + /** + * 备注 + */ + 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/wm/materialrequest/MesWmMaterialRequestLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestLineMapper.java new file mode 100644 index 0000000..125c468 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestLineMapper.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest; + +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.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 领料申请单行 Mapper + */ +@Mapper +public interface MesWmMaterialRequestLineMapper extends BaseMapperX { + + default PageResult selectPage(MesWmMaterialRequestLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmMaterialRequestLineDO::getMaterialRequestId, reqVO.getMaterialRequestId()) + .orderByDesc(MesWmMaterialRequestLineDO::getId)); + } + + default List selectListByMaterialRequestId(Long materialRequestId) { + return selectList(MesWmMaterialRequestLineDO::getMaterialRequestId, materialRequestId); + } + + default void deleteByMaterialRequestId(Long materialRequestId) { + delete(MesWmMaterialRequestLineDO::getMaterialRequestId, materialRequestId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java new file mode 100644 index 0000000..da8d2a4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java @@ -0,0 +1,26 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest; + +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.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 领料申请单 Mapper + */ +@Mapper +public interface MesWmMaterialRequestMapper extends BaseMapperX { + + default PageResult selectPage(MesWmMaterialRequestPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmMaterialRequestDO::getWorkstationId, reqVO.getWorkstationId()) + .eqIfPresent(MesWmMaterialRequestDO::getWorkOrderId, reqVO.getWorkOrderId()) + .eqIfPresent(MesWmMaterialRequestDO::getUserId, reqVO.getUserId()) + .eqIfPresent(MesWmMaterialRequestDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesWmMaterialRequestDO::getRequestTime, reqVO.getRequestTime()) + .orderByDesc(MesWmMaterialRequestDO::getId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index a30012b..ef318c7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -322,7 +322,10 @@ public interface ErrorCodeConstants { ErrorCode WM_ARRIVAL_NOTICE_NOT_EXISTS = new ErrorCode(1_040_704_000, "到货通知单不存在"); ErrorCode WM_ARRIVAL_NOTICE_CODE_DUPLICATE = new ErrorCode(1_040_704_001, "到货通知单编码已存在"); ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_PREPARE = new ErrorCode(1_040_704_002, "只有草稿状态才允许此操作"); - ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_003, "存在待检验行，无法审批通过"); + ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_SUBMITTED = new ErrorCode(1_040_704_003, "只有已提交状态才允许审批"); + ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_APPROVED = new ErrorCode(1_040_704_004, "只有已审批状态才允许完成"); + ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_005, "存在待检验行，无法审批通过"); + ErrorCode WM_ARRIVAL_NOTICE_NO_LINE = new ErrorCode(1_040_704_006, "至少需要一条行项目"); ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_704_100, "到货通知单行不存在"); // ========== MES 仓库管理-采购入库单（1-040-705-000） ========== diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java new file mode 100644 index 0000000..220a6ba --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java @@ -0,0 +1,52 @@ +package cn.iocoder.yudao.module.mes.service.wm.materialrequest; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO; +import jakarta.validation.Valid; + +/** + * MES 领料申请单行 Service 接口 + */ +public interface MesWmMaterialRequestLineService { + + /** + * 创建领料申请单行 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaterialRequestLine(@Valid MesWmMaterialRequestLineSaveReqVO createReqVO); + + /** + * 修改领料申请单行 + * + * @param updateReqVO 修改信息 + */ + void updateMaterialRequestLine(@Valid MesWmMaterialRequestLineSaveReqVO updateReqVO); + + /** + * 删除领料申请单行 + * + * @param id 编号 + */ + void deleteMaterialRequestLine(Long id); + + /** + * 获得领料申请单行 + * + * @param id 编号 + * @return 领料申请单行 + */ + MesWmMaterialRequestLineDO getMaterialRequestLine(Long id); + + /** + * 获得领料申请单行分页 + * + * @param pageReqVO 分页参数 + * @return 领料申请单行分页 + */ + PageResult getMaterialRequestLinePage(MesWmMaterialRequestLinePageReqVO pageReqVO); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java new file mode 100644 index 0000000..98a9349 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.service.wm.materialrequest; + +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.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestLineMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_MATERIAL_REQUEST_LINE_NOT_EXISTS; + +/** + * MES 领料申请单行 Service 实现类 + */ +@Service +@Validated +public class MesWmMaterialRequestLineServiceImpl implements MesWmMaterialRequestLineService { + + @Resource + private MesWmMaterialRequestLineMapper materialRequestLineMapper; + + @Override + public Long createMaterialRequestLine(MesWmMaterialRequestLineSaveReqVO createReqVO) { + // TODO @AI：校验关联字段 + + // 插入 + MesWmMaterialRequestLineDO line = BeanUtils.toBean(createReqVO, MesWmMaterialRequestLineDO.class); + materialRequestLineMapper.insert(line); + return line.getId(); + } + + @Override + public void updateMaterialRequestLine(MesWmMaterialRequestLineSaveReqVO updateReqVO) { + // 验证是否存在 + validateMaterialRequestLineExists(updateReqVO.getId()); + // TODO @AI：校验关联字段 + + // 更新 + MesWmMaterialRequestLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMaterialRequestLineDO.class); + materialRequestLineMapper.updateById(updateObj); + } + + @Override + public void deleteMaterialRequestLine(Long id) { + // 验证是否存在 + validateMaterialRequestLineExists(id); + // 删除 + materialRequestLineMapper.deleteById(id); + } + + @Override + public MesWmMaterialRequestLineDO getMaterialRequestLine(Long id) { + return materialRequestLineMapper.selectById(id); + } + + @Override + public PageResult getMaterialRequestLinePage(MesWmMaterialRequestLinePageReqVO pageReqVO) { + return materialRequestLineMapper.selectPage(pageReqVO); + } + + private MesWmMaterialRequestLineDO validateMaterialRequestLineExists(Long id) { + MesWmMaterialRequestLineDO line = materialRequestLineMapper.selectById(id); + if (line == null) { + throw exception(WM_MATERIAL_REQUEST_LINE_NOT_EXISTS); + } + return line; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java new file mode 100644 index 0000000..2e2de6a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java @@ -0,0 +1,101 @@ +package cn.iocoder.yudao.module.mes.service.wm.materialrequest; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO; +import jakarta.validation.Valid; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; + +/** + * MES 领料申请单 Service 接口 + */ +public interface MesWmMaterialRequestService { + + /** + * 创建领料申请单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMaterialRequest(@Valid MesWmMaterialRequestSaveReqVO createReqVO); + + /** + * 修改领料申请单 + * + * @param updateReqVO 修改信息 + */ + void updateMaterialRequest(@Valid MesWmMaterialRequestSaveReqVO updateReqVO); + + /** + * 删除领料申请单（级联删除行，仅草稿状态允许） + * + * @param id 编号 + */ + void deleteMaterialRequest(Long id); + + /** + * 获得领料申请单 + * + * @param id 编号 + * @return 领料申请单 + */ + MesWmMaterialRequestDO getMaterialRequest(Long id); + + /** + * 获得领料申请单分页 + * + * @param pageReqVO 分页参数 + * @return 领料申请单分页 + */ + PageResult getMaterialRequestPage(MesWmMaterialRequestPageReqVO pageReqVO); + + // TODO @AI：不用 0、1 这种状态，只写中文就行 + /** + * 提交领料申请单（0=草稿 → 1=备料中） + * + * @param id 编号 + */ + void submitMaterialRequest(Long id); + + // TODO @AI：不用 0、1 这种状态，只写中文就行 + /** + * 审批领料申请单（1=备料中 → 2=待领料） + * + * @param id 编号 + */ + void approveMaterialRequest(Long id); + + // TODO @AI：不用 0、1 这种状态，只写中文就行 + /** + * 完成领料申请单（2=待领料 → 3=已完成），内部调用 + * + * @param id 编号 + */ + void finishMaterialRequest(Long id); + + /** + * 取消领料申请单（非已完成 → 4=已取消） + * + * @param id 编号 + */ + void cancelMaterialRequest(Long id); + + /** + * 按编号集合获得领料申请单列表 + * + * @param ids 编号集合 + * @return 领料申请单列表 + */ + List getMaterialRequestList(Collection ids); + + default Map getMaterialRequestMap(Collection ids) { + return convertMap(getMaterialRequestList(ids), MesWmMaterialRequestDO::getId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java new file mode 100644 index 0000000..e8be2d1 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java @@ -0,0 +1,138 @@ +package cn.iocoder.yudao.module.mes.service.wm.materialrequest; + +import cn.hutool.core.collection.CollUtil; +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.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestLineMapper; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +// TODO @AI：参考 /Users/yunai/Java/yudao-all-in-one/ruoyi-vue-pro/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java 风格，优化代码； +/** + * MES 领料申请单 Service 实现类 + */ +@Service +@Validated +public class MesWmMaterialRequestServiceImpl implements MesWmMaterialRequestService { + + @Resource + private MesWmMaterialRequestMapper materialRequestMapper; + + @Resource + private MesWmMaterialRequestLineMapper materialRequestLineMapper; + + @Override + public Long createMaterialRequest(MesWmMaterialRequestSaveReqVO createReqVO) { + MesWmMaterialRequestDO materialRequest = BeanUtils.toBean(createReqVO, MesWmMaterialRequestDO.class); + materialRequest.setStatus(0); // 草稿 + materialRequestMapper.insert(materialRequest); + return materialRequest.getId(); + } + + @Override + public void updateMaterialRequest(MesWmMaterialRequestSaveReqVO updateReqVO) { + // 校验存在 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(updateReqVO.getId()); + // 只有草稿状态才允许修改 + if (!materialRequest.getStatus().equals(0)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + MesWmMaterialRequestDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMaterialRequestDO.class); + materialRequestMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteMaterialRequest(Long id) { + // 校验存在 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id); + // 只有草稿状态才允许删除 + if (!materialRequest.getStatus().equals(0)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + // 级联删除行 + materialRequestLineMapper.deleteByMaterialRequestId(id); + // 删除 + materialRequestMapper.deleteById(id); + } + + @Override + public MesWmMaterialRequestDO getMaterialRequest(Long id) { + return materialRequestMapper.selectById(id); + } + + @Override + public PageResult getMaterialRequestPage(MesWmMaterialRequestPageReqVO pageReqVO) { + return materialRequestMapper.selectPage(pageReqVO); + } + + @Override + public void submitMaterialRequest(Long id) { + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id); + // 0=草稿 → 1=备料中 + if (!materialRequest.getStatus().equals(0)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(1)); + } + + @Override + public void approveMaterialRequest(Long id) { + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id); + // 1=备料中 → 2=待领料 + if (!materialRequest.getStatus().equals(1)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(2)); + } + + @Override + public void finishMaterialRequest(Long id) { + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id); + // 2=待领料 → 3=已完成 + if (!materialRequest.getStatus().equals(2)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(3)); + } + + @Override + public void cancelMaterialRequest(Long id) { + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id); + // 已完成不可取消 + if (materialRequest.getStatus().equals(3)) { + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID); + } + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(4)); + } + + @Override + public List getMaterialRequestList(Collection ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyList(); + } + return materialRequestMapper.selectByIds(ids); + } + + private MesWmMaterialRequestDO validateMaterialRequestExists(Long id) { + MesWmMaterialRequestDO materialRequest = materialRequestMapper.selectById(id); + if (materialRequest == null) { + throw exception(WM_MATERIAL_REQUEST_NOT_EXISTS); + } + return materialRequest; + } + +} -- libgit2 0.21.4