BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7a59397700d7db6cc2b18d29148a40e6613d8c8a

Authored by YunaiV
1 parent 27b24b48

feat(mes): add request and response VO for MES material request and material request line

Inline Side-by-side
Showing 17 changed files with 1177 additions and 1 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestController.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
  5 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  8 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  9 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO;
  11 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestRespVO;
  12 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
  14 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
  15 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO;
  16 +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
  17 +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
  18 +import cn.iocoder.yudao.module.mes.service.wm.materialrequest.MesWmMaterialRequestService;
  19 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
  20 +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
  21 +import io.swagger.v3.oas.annotations.Operation;
  22 +import io.swagger.v3.oas.annotations.Parameter;
  23 +import io.swagger.v3.oas.annotations.tags.Tag;
  24 +import jakarta.annotation.Resource;
  25 +import jakarta.servlet.http.HttpServletResponse;
  26 +import jakarta.validation.Valid;
  27 +import org.springframework.security.access.prepost.PreAuthorize;
  28 +import org.springframework.validation.annotation.Validated;
  29 +import org.springframework.web.bind.annotation.*;
  30 +
  31 +import java.io.IOException;
  32 +import java.util.Collections;
  33 +import java.util.List;
  34 +import java.util.Map;
  35 +
  36 +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
  37 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  38 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  39 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  40 +
  41 +@Tag(name = "管理后台 - MES 领料申请单")
  42 +@RestController
  43 +@RequestMapping("/mes/wm/material-request")
  44 +@Validated
  45 +public class MesWmMaterialRequestController {
  46 +
  47 + @Resource
  48 + private MesWmMaterialRequestService materialRequestService;
  49 + @Resource
  50 + private MesMdWorkstationService workstationService;
  51 + @Resource
  52 + private MesProWorkOrderService workOrderService;
  53 + @Resource
  54 + private AdminUserApi adminUserApi;
  55 +
  56 + @PostMapping("/create")
  57 + @Operation(summary = "创建领料申请单")
  58 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:create')")
  59 + public CommonResult<Long> createMaterialRequest(@Valid @RequestBody MesWmMaterialRequestSaveReqVO createReqVO) {
  60 + return success(materialRequestService.createMaterialRequest(createReqVO));
  61 + }
  62 +
  63 + @PutMapping("/update")
  64 + @Operation(summary = "修改领料申请单")
  65 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  66 + public CommonResult<Boolean> updateMaterialRequest(@Valid @RequestBody MesWmMaterialRequestSaveReqVO updateReqVO) {
  67 + materialRequestService.updateMaterialRequest(updateReqVO);
  68 + return success(true);
  69 + }
  70 +
  71 + @DeleteMapping("/delete")
  72 + @Operation(summary = "删除领料申请单")
  73 + @Parameter(name = "id", description = "编号", required = true)
  74 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:delete')")
  75 + public CommonResult<Boolean> deleteMaterialRequest(@RequestParam("id") Long id) {
  76 + materialRequestService.deleteMaterialRequest(id);
  77 + return success(true);
  78 + }
  79 +
  80 + @GetMapping("/get")
  81 + @Operation(summary = "获得领料申请单")
  82 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  83 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')")
  84 + public CommonResult<MesWmMaterialRequestRespVO> getMaterialRequest(@RequestParam("id") Long id) {
  85 + MesWmMaterialRequestDO materialRequest = materialRequestService.getMaterialRequest(id);
  86 + if (materialRequest == null) {
  87 + return success(null);
  88 + }
  89 + return success(buildRespVOList(Collections.singletonList(materialRequest)).get(0));
  90 + }
  91 +
  92 + @GetMapping("/page")
  93 + @Operation(summary = "获得领料申请单分页")
  94 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')")
  95 + public CommonResult<PageResult<MesWmMaterialRequestRespVO>> getMaterialRequestPage(
  96 + @Valid MesWmMaterialRequestPageReqVO pageReqVO) {
  97 + PageResult<MesWmMaterialRequestDO> pageResult = materialRequestService.getMaterialRequestPage(pageReqVO);
  98 + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
  99 + }
  100 +
  101 + @GetMapping("/export-excel")
  102 + @Operation(summary = "导出领料申请单 Excel")
  103 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:export')")
  104 + @ApiAccessLog(operateType = EXPORT)
  105 + public void exportMaterialRequestExcel(@Valid MesWmMaterialRequestPageReqVO pageReqVO,
  106 + HttpServletResponse response) throws IOException {
  107 + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
  108 + PageResult<MesWmMaterialRequestDO> pageResult = materialRequestService.getMaterialRequestPage(pageReqVO);
  109 + ExcelUtils.write(response, "领料申请单.xls", "数据", MesWmMaterialRequestRespVO.class,
  110 + buildRespVOList(pageResult.getList()));
  111 + }
  112 +
  113 + @PutMapping("/submit")
  114 + @Operation(summary = "提交领料申请单")
  115 + @Parameter(name = "id", description = "编号", required = true)
  116 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  117 + public CommonResult<Boolean> submitMaterialRequest(@RequestParam("id") Long id) {
  118 + materialRequestService.submitMaterialRequest(id);
  119 + return success(true);
  120 + }
  121 +
  122 + @PutMapping("/approve")
  123 + @Operation(summary = "审批领料申请单（开始备料）")
  124 + @Parameter(name = "id", description = "编号", required = true)
  125 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  126 + public CommonResult<Boolean> approveMaterialRequest(@RequestParam("id") Long id) {
  127 + materialRequestService.approveMaterialRequest(id);
  128 + return success(true);
  129 + }
  130 +
  131 + @PutMapping("/finish")
  132 + @Operation(summary = "完成领料申请单")
  133 + @Parameter(name = "id", description = "编号", required = true)
  134 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  135 + public CommonResult<Boolean> finishMaterialRequest(@RequestParam("id") Long id) {
  136 + materialRequestService.finishMaterialRequest(id);
  137 + return success(true);
  138 + }
  139 +
  140 + @PutMapping("/cancel")
  141 + @Operation(summary = "取消领料申请单")
  142 + @Parameter(name = "id", description = "编号", required = true)
  143 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  144 + public CommonResult<Boolean> cancelMaterialRequest(@RequestParam("id") Long id) {
  145 + materialRequestService.cancelMaterialRequest(id);
  146 + return success(true);
  147 + }
  148 +
  149 + // ==================== 拼接 VO ====================
  150 +
  151 + private List<MesWmMaterialRequestRespVO> buildRespVOList(List<MesWmMaterialRequestDO> list) {
  152 + if (CollUtil.isEmpty(list)) {
  153 + return Collections.emptyList();
  154 + }
  155 + // 1. 获得关联数据
  156 + Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
  157 + convertSet(list, MesWmMaterialRequestDO::getWorkstationId));
  158 + Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
  159 + convertSet(list, MesWmMaterialRequestDO::getWorkOrderId));
  160 + Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
  161 + convertSet(list, MesWmMaterialRequestDO::getUserId));
  162 + // 2. 构建结果
  163 + return BeanUtils.toBean(list, MesWmMaterialRequestRespVO.class, vo -> {
  164 + findAndThen(workstationMap, vo.getWorkstationId(), ws ->
  165 + vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName()));
  166 + findAndThen(workOrderMap, vo.getWorkOrderId(), wo ->
  167 + vo.setWorkOrderCode(wo.getCode()));
  168 + findAndThen(userMap, vo.getUserId(), user ->
  169 + vo.setUserNickname(user.getNickname()));
  170 + });
  171 + }
  172 +
  173 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/MesWmMaterialRequestLineController.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  8 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO;
  9 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineRespVO;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO;
  11 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  12 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO;
  14 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  15 +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
  16 +import cn.iocoder.yudao.module.mes.service.wm.materialrequest.MesWmMaterialRequestLineService;
  17 +import io.swagger.v3.oas.annotations.Operation;
  18 +import io.swagger.v3.oas.annotations.Parameter;
  19 +import io.swagger.v3.oas.annotations.tags.Tag;
  20 +import jakarta.annotation.Resource;
  21 +import jakarta.validation.Valid;
  22 +import org.springframework.security.access.prepost.PreAuthorize;
  23 +import org.springframework.validation.annotation.Validated;
  24 +import org.springframework.web.bind.annotation.*;
  25 +
  26 +import java.util.Collections;
  27 +import java.util.List;
  28 +import java.util.Map;
  29 +
  30 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  32 +
  33 +@Tag(name = "管理后台 - MES 领料申请单行")
  34 +@RestController
  35 +@RequestMapping("/mes/wm/material-request-line")
  36 +@Validated
  37 +public class MesWmMaterialRequestLineController {
  38 +
  39 + @Resource
  40 + private MesWmMaterialRequestLineService materialRequestLineService;
  41 + @Resource
  42 + private MesMdItemService itemService;
  43 + @Resource
  44 + private MesMdUnitMeasureService unitMeasureService;
  45 +
  46 + @PostMapping("/create")
  47 + @Operation(summary = "创建领料申请单行")
  48 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:create')")
  49 + public CommonResult<Long> createMaterialRequestLine(@Valid @RequestBody MesWmMaterialRequestLineSaveReqVO createReqVO) {
  50 + return success(materialRequestLineService.createMaterialRequestLine(createReqVO));
  51 + }
  52 +
  53 + @PutMapping("/update")
  54 + @Operation(summary = "修改领料申请单行")
  55 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:update')")
  56 + public CommonResult<Boolean> updateMaterialRequestLine(@Valid @RequestBody MesWmMaterialRequestLineSaveReqVO updateReqVO) {
  57 + materialRequestLineService.updateMaterialRequestLine(updateReqVO);
  58 + return success(true);
  59 + }
  60 +
  61 + @DeleteMapping("/delete")
  62 + @Operation(summary = "删除领料申请单行")
  63 + @Parameter(name = "id", description = "编号", required = true)
  64 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:delete')")
  65 + public CommonResult<Boolean> deleteMaterialRequestLine(@RequestParam("id") Long id) {
  66 + materialRequestLineService.deleteMaterialRequestLine(id);
  67 + return success(true);
  68 + }
  69 +
  70 + @GetMapping("/get")
  71 + @Operation(summary = "获得领料申请单行")
  72 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  73 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')")
  74 + public CommonResult<MesWmMaterialRequestLineRespVO> getMaterialRequestLine(@RequestParam("id") Long id) {
  75 + MesWmMaterialRequestLineDO line = materialRequestLineService.getMaterialRequestLine(id);
  76 + if (line == null) {
  77 + return success(null);
  78 + }
  79 + return success(buildRespVOList(Collections.singletonList(line)).get(0));
  80 + }
  81 +
  82 + @GetMapping("/page")
  83 + @Operation(summary = "获得领料申请单行分页")
  84 + @PreAuthorize("@ss.hasPermission('mes:wm-material-request:query')")
  85 + public CommonResult<PageResult<MesWmMaterialRequestLineRespVO>> getMaterialRequestLinePage(
  86 + @Valid MesWmMaterialRequestLinePageReqVO pageReqVO) {
  87 + PageResult<MesWmMaterialRequestLineDO> pageResult = materialRequestLineService.getMaterialRequestLinePage(pageReqVO);
  88 + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
  89 + }
  90 +
  91 + // ==================== 拼接 VO ====================
  92 +
  93 + private List<MesWmMaterialRequestLineRespVO> buildRespVOList(List<MesWmMaterialRequestLineDO> list) {
  94 + if (CollUtil.isEmpty(list)) {
  95 + return Collections.emptyList();
  96 + }
  97 + // 1. 获得关联数据
  98 + Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
  99 + convertSet(list, MesWmMaterialRequestLineDO::getItemId));
  100 + Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
  101 + convertSet(list, MesWmMaterialRequestLineDO::getUnitMeasureId));
  102 + // 2. 构建结果
  103 + return BeanUtils.toBean(list, MesWmMaterialRequestLineRespVO.class, vo -> {
  104 + MapUtils.findAndThen(itemMap, vo.getItemId(), item ->
  105 + vo.setItemCode(item.getCode()).setSpecification(item.getSpecification()));
  106 + MapUtils.findAndThen(unitMeasureMap, vo.getUnitMeasureId(), unit ->
  107 + vo.setUnitMeasureName(unit.getName()));
  108 + });
  109 + }
  110 +
  111 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestPageReqVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +import java.time.LocalDateTime;
  10 +
  11 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  12 +
  13 +@Schema(description = "管理后台 - MES 领料申请单分页 Request VO")
  14 +@Data
  15 +@EqualsAndHashCode(callSuper = true)
  16 +public class MesWmMaterialRequestPageReqVO extends PageParam {
  17 +
  18 + @Schema(description = "工作站ID", example = "1")
  19 + private Long workstationId;
  20 +
  21 + @Schema(description = "生产工单ID", example = "1")
  22 + private Long workOrderId;
  23 +
  24 + @Schema(description = "需求人用户ID", example = "1")
  25 + private Long userId;
  26 +
  27 + @Schema(description = "状态", example = "0")
  28 + private Integer status;
  29 +
  30 + @Schema(description = "需求时间范围")
  31 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  32 + private LocalDateTime[] requestTime;
  33 +
  34 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestRespVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo;
  2 +
  3 +import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
  4 +import cn.idev.excel.annotation.ExcelProperty;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +
  8 +import java.time.LocalDateTime;
  9 +
  10 +@Schema(description = "管理后台 - MES 领料申请单 Response VO")
  11 +@Data
  12 +@ExcelIgnoreUnannotated
  13 +public class MesWmMaterialRequestRespVO {
  14 +
  15 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  16 + @ExcelProperty("编号")
  17 + private Long id;
  18 +
  19 + @Schema(description = "工作站ID", example = "1")
  20 + private Long workstationId;
  21 +
  22 + @Schema(description = "工作站编码", example = "WS0001")
  23 + @ExcelProperty("工作站编码")
  24 + private String workstationCode;
  25 +
  26 + @Schema(description = "工作站名称", example = "1#注塑工作站")
  27 + @ExcelProperty("工作站名称")
  28 + private String workstationName;
  29 +
  30 + @Schema(description = "生产工单ID", example = "1")
  31 + private Long workOrderId;
  32 +
  33 + @Schema(description = "生产工单编码", example = "MO20260222001")
  34 + @ExcelProperty("生产工单编码")
  35 + private String workOrderCode;
  36 +
  37 + @Schema(description = "需求人用户ID", example = "1")
  38 + private Long userId;
  39 +
  40 + @Schema(description = "需求人昵称", example = "管理员")
  41 + @ExcelProperty("需求人昵称")
  42 + private String userNickname;
  43 +
  44 + @Schema(description = "需求时间")
  45 + @ExcelProperty("需求时间")
  46 + private LocalDateTime requestTime;
  47 +
  48 + @Schema(description = "开始备料时间")
  49 + @ExcelProperty("开始备料时间")
  50 + private LocalDateTime startTime;
  51 +
  52 + @Schema(description = "完成时间")
  53 + @ExcelProperty("完成时间")
  54 + private LocalDateTime endTime;
  55 +
  56 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
  57 + @ExcelProperty("状态")
  58 + private Integer status;
  59 +
  60 + @Schema(description = "备注", example = "备注")
  61 + @ExcelProperty("备注")
  62 + private String remark;
  63 +
  64 + @Schema(description = "预留字段1")
  65 + private String attribute1;
  66 +
  67 + @Schema(description = "预留字段2")
  68 + private String attribute2;
  69 +
  70 + @Schema(description = "预留字段3")
  71 + private Integer attribute3;
  72 +
  73 + @Schema(description = "预留字段4")
  74 + private Integer attribute4;
  75 +
  76 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  77 + @ExcelProperty("创建时间")
  78 + private LocalDateTime createTime;
  79 +
  80 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/MesWmMaterialRequestSaveReqVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "管理后台 - MES 领料申请单新增/修改 Request VO")
  9 +@Data
  10 +public class MesWmMaterialRequestSaveReqVO {
  11 +
  12 + @Schema(description = "编号", example = "1024")
  13 + private Long id;
  14 +
  15 + @Schema(description = "工作站ID", example = "1")
  16 + private Long workstationId;
  17 +
  18 + @Schema(description = "生产工单ID", example = "1")
  19 + private Long workOrderId;
  20 +
  21 + @Schema(description = "需求人用户ID", example = "1")
  22 + private Long userId;
  23 +
  24 + @Schema(description = "需求时间")
  25 + private LocalDateTime requestTime;
  26 +
  27 + @Schema(description = "开始备料时间")
  28 + private LocalDateTime startTime;
  29 +
  30 + @Schema(description = "完成时间")
  31 + private LocalDateTime endTime;
  32 +
  33 + @Schema(description = "备注", example = "备注")
  34 + private String remark;
  35 +
  36 + @Schema(description = "预留字段1")
  37 + private String attribute1;
  38 +
  39 + @Schema(description = "预留字段2")
  40 + private String attribute2;
  41 +
  42 + @Schema(description = "预留字段3")
  43 + private Integer attribute3;
  44 +
  45 + @Schema(description = "预留字段4")
  46 + private Integer attribute4;
  47 +
  48 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLinePageReqVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +
  8 +@Schema(description = "管理后台 - MES 领料申请单行分页 Request VO")
  9 +@Data
  10 +@EqualsAndHashCode(callSuper = true)
  11 +public class MesWmMaterialRequestLinePageReqVO extends PageParam {
  12 +
  13 + @Schema(description = "领料申请单ID", example = "1")
  14 + private Long materialRequestId;
  15 +
  16 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineRespVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line;
  2 +
  3 +import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
  4 +import cn.idev.excel.annotation.ExcelProperty;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.Data;
  7 +
  8 +import java.math.BigDecimal;
  9 +import java.time.LocalDateTime;
  10 +
  11 +@Schema(description = "管理后台 - MES 领料申请单行 Response VO")
  12 +@Data
  13 +@ExcelIgnoreUnannotated
  14 +public class MesWmMaterialRequestLineRespVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  17 + @ExcelProperty("编号")
  18 + private Long id;
  19 +
  20 + @Schema(description = "领料申请单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  21 + private Long materialRequestId;
  22 +
  23 + @Schema(description = "产品物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  24 + private Long itemId;
  25 +
  26 + @Schema(description = "产品物料编码", example = "IF2022082432")
  27 + @ExcelProperty("物料编码")
  28 + private String itemCode;
  29 +
  30 + @Schema(description = "产品物料名称", example = "PVC 颗粒")
  31 + @ExcelProperty("物料名称")
  32 + private String itemName;
  33 +
  34 + @Schema(description = "规格型号", example = "透明")
  35 + @ExcelProperty("规格型号")
  36 + private String specification;
  37 +
  38 + @Schema(description = "计量单位ID", example = "1")
  39 + private Long unitMeasureId;
  40 +
  41 + @Schema(description = "计量单位名称", example = "公斤")
  42 + @ExcelProperty("计量单位")
  43 + private String unitMeasureName;
  44 +
  45 + @Schema(description = "需求数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00")
  46 + @ExcelProperty("需求数量")
  47 + private BigDecimal quantity;
  48 +
  49 + @Schema(description = "备注", example = "备注")
  50 + @ExcelProperty("备注")
  51 + private String remark;
  52 +
  53 + @Schema(description = "预留字段1")
  54 + private String attribute1;
  55 +
  56 + @Schema(description = "预留字段2")
  57 + private String attribute2;
  58 +
  59 + @Schema(description = "预留字段3")
  60 + private Integer attribute3;
  61 +
  62 + @Schema(description = "预留字段4")
  63 + private Integer attribute4;
  64 +
  65 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  66 + @ExcelProperty("创建时间")
  67 + private LocalDateTime createTime;
  68 +
  69 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialrequest/vo/line/MesWmMaterialRequestLineSaveReqVO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.DecimalMin;
  5 +import jakarta.validation.constraints.NotNull;
  6 +import lombok.Data;
  7 +
  8 +import java.math.BigDecimal;
  9 +
  10 +@Schema(description = "管理后台 - MES 领料申请单行新增/修改 Request VO")
  11 +@Data
  12 +public class MesWmMaterialRequestLineSaveReqVO {
  13 +
  14 + @Schema(description = "编号", example = "1024")
  15 + private Long id;
  16 +
  17 + @Schema(description = "领料申请单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  18 + @NotNull(message = "领料申请单ID不能为空")
  19 + private Long materialRequestId;
  20 +
  21 + @Schema(description = "产品物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  22 + @NotNull(message = "产品物料ID不能为空")
  23 + private Long itemId;
  24 +
  25 + @Schema(description = "产品物料名称", example = "PVC 颗粒")
  26 + private String itemName;
  27 +
  28 + @Schema(description = "计量单位ID", example = "1")
  29 + private Long unitMeasureId;
  30 +
  31 + @Schema(description = "需求数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.00")
  32 + @NotNull(message = "需求数量不能为空")
  33 + @DecimalMin(value = "0.01", message = "需求数量必须大于 0")
  34 + private BigDecimal quantity;
  35 +
  36 + @Schema(description = "备注", example = "备注")
  37 + private String remark;
  38 +
  39 + @Schema(description = "预留字段1")
  40 + private String attribute1;
  41 +
  42 + @Schema(description = "预留字段2")
  43 + private String attribute2;
  44 +
  45 + @Schema(description = "预留字段3")
  46 + private Integer attribute3;
  47 +
  48 + @Schema(description = "预留字段4")
  49 + private Integer attribute4;
  50 +
  51 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestDO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
  6 +import com.baomidou.mybatisplus.annotation.KeySequence;
  7 +import com.baomidou.mybatisplus.annotation.TableId;
  8 +import com.baomidou.mybatisplus.annotation.TableName;
  9 +import lombok.*;
  10 +
  11 +import java.time.LocalDateTime;
  12 +
  13 +/**
  14 + * MES 领料申请单 DO
  15 + */
  16 +@TableName("mes_wm_material_request")
  17 +@KeySequence("mes_wm_material_request_seq")
  18 +@Data
  19 +@EqualsAndHashCode(callSuper = true)
  20 +@ToString(callSuper = true)
  21 +@Builder
  22 +@NoArgsConstructor
  23 +@AllArgsConstructor
  24 +public class MesWmMaterialRequestDO extends BaseDO {
  25 +
  26 + /**
  27 + * 编号
  28 + */
  29 + @TableId
  30 + private Long id;
  31 + /**
  32 + * 工作站ID
  33 + *
  34 + * 关联 {@link MesMdWorkstationDO#getId()}
  35 + */
  36 + private Long workstationId;
  37 + /**
  38 + * 生产工单ID
  39 + *
  40 + * 关联 {@link MesProWorkOrderDO#getId()}
  41 + */
  42 + private Long workOrderId;
  43 + /**
  44 + * 需求人用户ID
  45 + *
  46 + * 关联 system_users.id
  47 + */
  48 + private Long userId;
  49 + /**
  50 + * 需求时间
  51 + */
  52 + private LocalDateTime requestTime;
  53 + /**
  54 + * 开始备料时间
  55 + */
  56 + private LocalDateTime startTime;
  57 + /**
  58 + * 完成时间
  59 + */
  60 + private LocalDateTime endTime;
  61 + // TODO @AI：枚举类；
  62 + // TODO @AI：字典；
  63 + /**
  64 + * 状态
  65 + *
  66 + * 0=草稿 1=备料中 2=待领料 3=已完成 4=已取消
  67 + */
  68 + private Integer status;
  69 + /**
  70 + * 备注
  71 + */
  72 + private String remark;
  73 + /**
  74 + * 预留字段1
  75 + */
  76 + private String attribute1;
  77 + /**
  78 + * 预留字段2
  79 + */
  80 + private String attribute2;
  81 + /**
  82 + * 预留字段3
  83 + */
  84 + private Integer attribute3;
  85 + /**
  86 + * 预留字段4
  87 + */
  88 + private Integer attribute4;
  89 +
  90 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialrequest/MesWmMaterialRequestLineDO.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
  6 +import com.baomidou.mybatisplus.annotation.KeySequence;
  7 +import com.baomidou.mybatisplus.annotation.TableId;
  8 +import com.baomidou.mybatisplus.annotation.TableName;
  9 +import lombok.*;
  10 +
  11 +import java.math.BigDecimal;
  12 +
  13 +/**
  14 + * MES 领料申请单行 DO
  15 + */
  16 +@TableName("mes_wm_material_request_line")
  17 +@KeySequence("mes_wm_material_request_line_seq")
  18 +@Data
  19 +@EqualsAndHashCode(callSuper = true)
  20 +@ToString(callSuper = true)
  21 +@Builder
  22 +@NoArgsConstructor
  23 +@AllArgsConstructor
  24 +public class MesWmMaterialRequestLineDO extends BaseDO {
  25 +
  26 + /**
  27 + * 编号
  28 + */
  29 + @TableId
  30 + private Long id;
  31 + /**
  32 + * 领料申请单ID
  33 + *
  34 + * 关联 {@link MesWmMaterialRequestDO#getId()}
  35 + */
  36 + private Long materialRequestId;
  37 + /**
  38 + * 产品物料ID
  39 + *
  40 + * 关联 {@link MesMdItemDO#getId()}
  41 + */
  42 + private Long itemId;
  43 + // TODO @AI：不用快照，读取就好了。
  44 + /**
  45 + * 产品物料名称（快照）
  46 + */
  47 + private String itemName;
  48 + /**
  49 + * 计量单位ID
  50 + *
  51 + * 关联 {@link MesMdUnitMeasureDO#getId()}
  52 + */
  53 + private Long unitMeasureId;
  54 + /**
  55 + * 需求数量
  56 + */
  57 + private BigDecimal quantity;
  58 + /**
  59 + * 备注
  60 + */
  61 + private String remark;
  62 + /**
  63 + * 预留字段1
  64 + */
  65 + private String attribute1;
  66 + /**
  67 + * 预留字段2
  68 + */
  69 + private String attribute2;
  70 + /**
  71 + * 预留字段3
  72 + */
  73 + private Integer attribute3;
  74 + /**
  75 + * 预留字段4
  76 + */
  77 + private Integer attribute4;
  78 +
  79 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestLineMapper.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * MES 领料申请单行 Mapper
  14 + */
  15 +@Mapper
  16 +public interface MesWmMaterialRequestLineMapper extends BaseMapperX<MesWmMaterialRequestLineDO> {
  17 +
  18 + default PageResult<MesWmMaterialRequestLineDO> selectPage(MesWmMaterialRequestLinePageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmMaterialRequestLineDO>()
  20 + .eqIfPresent(MesWmMaterialRequestLineDO::getMaterialRequestId, reqVO.getMaterialRequestId())
  21 + .orderByDesc(MesWmMaterialRequestLineDO::getId));
  22 + }
  23 +
  24 + default List<MesWmMaterialRequestLineDO> selectListByMaterialRequestId(Long materialRequestId) {
  25 + return selectList(MesWmMaterialRequestLineDO::getMaterialRequestId, materialRequestId);
  26 + }
  27 +
  28 + default void deleteByMaterialRequestId(Long materialRequestId) {
  29 + delete(MesWmMaterialRequestLineDO::getMaterialRequestId, materialRequestId);
  30 + }
  31 +
  32 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialrequest/MesWmMaterialRequestMapper.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * MES 领料申请单 Mapper
  12 + */
  13 +@Mapper
  14 +public interface MesWmMaterialRequestMapper extends BaseMapperX<MesWmMaterialRequestDO> {
  15 +
  16 + default PageResult<MesWmMaterialRequestDO> selectPage(MesWmMaterialRequestPageReqVO reqVO) {
  17 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmMaterialRequestDO>()
  18 + .eqIfPresent(MesWmMaterialRequestDO::getWorkstationId, reqVO.getWorkstationId())
  19 + .eqIfPresent(MesWmMaterialRequestDO::getWorkOrderId, reqVO.getWorkOrderId())
  20 + .eqIfPresent(MesWmMaterialRequestDO::getUserId, reqVO.getUserId())
  21 + .eqIfPresent(MesWmMaterialRequestDO::getStatus, reqVO.getStatus())
  22 + .betweenIfPresent(MesWmMaterialRequestDO::getRequestTime, reqVO.getRequestTime())
  23 + .orderByDesc(MesWmMaterialRequestDO::getId));
  24 + }
  25 +
  26 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
  View file @7a59397
... ... @@ -322,7 +322,10 @@ public interface ErrorCodeConstants {
322 322 ErrorCode WM_ARRIVAL_NOTICE_NOT_EXISTS = new ErrorCode(1_040_704_000, "到货通知单不存在");
323 323 ErrorCode WM_ARRIVAL_NOTICE_CODE_DUPLICATE = new ErrorCode(1_040_704_001, "到货通知单编码已存在");
324 324 ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_PREPARE = new ErrorCode(1_040_704_002, "只有草稿状态才允许此操作");
325   - ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_003, "存在待检验行，无法审批通过");
  325 + ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_SUBMITTED = new ErrorCode(1_040_704_003, "只有已提交状态才允许审批");
  326 + ErrorCode WM_ARRIVAL_NOTICE_STATUS_NOT_APPROVED = new ErrorCode(1_040_704_004, "只有已审批状态才允许完成");
  327 + ErrorCode WM_ARRIVAL_NOTICE_IQC_PENDING = new ErrorCode(1_040_704_005, "存在待检验行，无法审批通过");
  328 + ErrorCode WM_ARRIVAL_NOTICE_NO_LINE = new ErrorCode(1_040_704_006, "至少需要一条行项目");
326 329 ErrorCode WM_ARRIVAL_NOTICE_LINE_NOT_EXISTS = new ErrorCode(1_040_704_100, "到货通知单行不存在");
327 330  
328 331 // ========== MES 仓库管理-采购入库单（1-040-705-000） ==========
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineService.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.service.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO;
  7 +import jakarta.validation.Valid;
  8 +
  9 +/**
  10 + * MES 领料申请单行 Service 接口
  11 + */
  12 +public interface MesWmMaterialRequestLineService {
  13 +
  14 + /**
  15 + * 创建领料申请单行
  16 + *
  17 + * @param createReqVO 创建信息
  18 + * @return 编号
  19 + */
  20 + Long createMaterialRequestLine(@Valid MesWmMaterialRequestLineSaveReqVO createReqVO);
  21 +
  22 + /**
  23 + * 修改领料申请单行
  24 + *
  25 + * @param updateReqVO 修改信息
  26 + */
  27 + void updateMaterialRequestLine(@Valid MesWmMaterialRequestLineSaveReqVO updateReqVO);
  28 +
  29 + /**
  30 + * 删除领料申请单行
  31 + *
  32 + * @param id 编号
  33 + */
  34 + void deleteMaterialRequestLine(Long id);
  35 +
  36 + /**
  37 + * 获得领料申请单行
  38 + *
  39 + * @param id 编号
  40 + * @return 领料申请单行
  41 + */
  42 + MesWmMaterialRequestLineDO getMaterialRequestLine(Long id);
  43 +
  44 + /**
  45 + * 获得领料申请单行分页
  46 + *
  47 + * @param pageReqVO 分页参数
  48 + * @return 领料申请单行分页
  49 + */
  50 + PageResult<MesWmMaterialRequestLineDO> getMaterialRequestLinePage(MesWmMaterialRequestLinePageReqVO pageReqVO);
  51 +
  52 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestLineServiceImpl.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.service.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLinePageReqVO;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.line.MesWmMaterialRequestLineSaveReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestLineDO;
  8 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestLineMapper;
  9 +import jakarta.annotation.Resource;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.validation.annotation.Validated;
  12 +
  13 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  14 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_MATERIAL_REQUEST_LINE_NOT_EXISTS;
  15 +
  16 +/**
  17 + * MES 领料申请单行 Service 实现类
  18 + */
  19 +@Service
  20 +@Validated
  21 +public class MesWmMaterialRequestLineServiceImpl implements MesWmMaterialRequestLineService {
  22 +
  23 + @Resource
  24 + private MesWmMaterialRequestLineMapper materialRequestLineMapper;
  25 +
  26 + @Override
  27 + public Long createMaterialRequestLine(MesWmMaterialRequestLineSaveReqVO createReqVO) {
  28 + // TODO @AI：校验关联字段
  29 +
  30 + // 插入
  31 + MesWmMaterialRequestLineDO line = BeanUtils.toBean(createReqVO, MesWmMaterialRequestLineDO.class);
  32 + materialRequestLineMapper.insert(line);
  33 + return line.getId();
  34 + }
  35 +
  36 + @Override
  37 + public void updateMaterialRequestLine(MesWmMaterialRequestLineSaveReqVO updateReqVO) {
  38 + // 验证是否存在
  39 + validateMaterialRequestLineExists(updateReqVO.getId());
  40 + // TODO @AI：校验关联字段
  41 +
  42 + // 更新
  43 + MesWmMaterialRequestLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMaterialRequestLineDO.class);
  44 + materialRequestLineMapper.updateById(updateObj);
  45 + }
  46 +
  47 + @Override
  48 + public void deleteMaterialRequestLine(Long id) {
  49 + // 验证是否存在
  50 + validateMaterialRequestLineExists(id);
  51 + // 删除
  52 + materialRequestLineMapper.deleteById(id);
  53 + }
  54 +
  55 + @Override
  56 + public MesWmMaterialRequestLineDO getMaterialRequestLine(Long id) {
  57 + return materialRequestLineMapper.selectById(id);
  58 + }
  59 +
  60 + @Override
  61 + public PageResult<MesWmMaterialRequestLineDO> getMaterialRequestLinePage(MesWmMaterialRequestLinePageReqVO pageReqVO) {
  62 + return materialRequestLineMapper.selectPage(pageReqVO);
  63 + }
  64 +
  65 + private MesWmMaterialRequestLineDO validateMaterialRequestLineExists(Long id) {
  66 + MesWmMaterialRequestLineDO line = materialRequestLineMapper.selectById(id);
  67 + if (line == null) {
  68 + throw exception(WM_MATERIAL_REQUEST_LINE_NOT_EXISTS);
  69 + }
  70 + return line;
  71 + }
  72 +
  73 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestService.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.service.wm.materialrequest;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO;
  7 +import jakarta.validation.Valid;
  8 +
  9 +import java.util.Collection;
  10 +import java.util.List;
  11 +import java.util.Map;
  12 +
  13 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  14 +
  15 +/**
  16 + * MES 领料申请单 Service 接口
  17 + */
  18 +public interface MesWmMaterialRequestService {
  19 +
  20 + /**
  21 + * 创建领料申请单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createMaterialRequest(@Valid MesWmMaterialRequestSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 修改领料申请单
  30 + *
  31 + * @param updateReqVO 修改信息
  32 + */
  33 + void updateMaterialRequest(@Valid MesWmMaterialRequestSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 删除领料申请单（级联删除行，仅草稿状态允许）
  37 + *
  38 + * @param id 编号
  39 + */
  40 + void deleteMaterialRequest(Long id);
  41 +
  42 + /**
  43 + * 获得领料申请单
  44 + *
  45 + * @param id 编号
  46 + * @return 领料申请单
  47 + */
  48 + MesWmMaterialRequestDO getMaterialRequest(Long id);
  49 +
  50 + /**
  51 + * 获得领料申请单分页
  52 + *
  53 + * @param pageReqVO 分页参数
  54 + * @return 领料申请单分页
  55 + */
  56 + PageResult<MesWmMaterialRequestDO> getMaterialRequestPage(MesWmMaterialRequestPageReqVO pageReqVO);
  57 +
  58 + // TODO @AI：不用 0、1 这种状态，只写中文就行
  59 + /**
  60 + * 提交领料申请单（0=草稿 → 1=备料中）
  61 + *
  62 + * @param id 编号
  63 + */
  64 + void submitMaterialRequest(Long id);
  65 +
  66 + // TODO @AI：不用 0、1 这种状态，只写中文就行
  67 + /**
  68 + * 审批领料申请单（1=备料中 → 2=待领料）
  69 + *
  70 + * @param id 编号
  71 + */
  72 + void approveMaterialRequest(Long id);
  73 +
  74 + // TODO @AI：不用 0、1 这种状态，只写中文就行
  75 + /**
  76 + * 完成领料申请单（2=待领料 → 3=已完成），内部调用
  77 + *
  78 + * @param id 编号
  79 + */
  80 + void finishMaterialRequest(Long id);
  81 +
  82 + /**
  83 + * 取消领料申请单（非已完成 → 4=已取消）
  84 + *
  85 + * @param id 编号
  86 + */
  87 + void cancelMaterialRequest(Long id);
  88 +
  89 + /**
  90 + * 按编号集合获得领料申请单列表
  91 + *
  92 + * @param ids 编号集合
  93 + * @return 领料申请单列表
  94 + */
  95 + List<MesWmMaterialRequestDO> getMaterialRequestList(Collection<Long> ids);
  96 +
  97 + default Map<Long, MesWmMaterialRequestDO> getMaterialRequestMap(Collection<Long> ids) {
  98 + return convertMap(getMaterialRequestList(ids), MesWmMaterialRequestDO::getId);
  99 + }
  100 +
  101 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialrequest/MesWmMaterialRequestServiceImpl.java 0 → 100644
  View file @7a59397
  1 +package cn.iocoder.yudao.module.mes.service.wm.materialrequest;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestPageReqVO;
  7 +import cn.iocoder.yudao.module.mes.controller.admin.wm.materialrequest.vo.MesWmMaterialRequestSaveReqVO;
  8 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialrequest.MesWmMaterialRequestDO;
  9 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestLineMapper;
  10 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialrequest.MesWmMaterialRequestMapper;
  11 +import jakarta.annotation.Resource;
  12 +import org.springframework.stereotype.Service;
  13 +import org.springframework.transaction.annotation.Transactional;
  14 +import org.springframework.validation.annotation.Validated;
  15 +
  16 +import java.util.Collection;
  17 +import java.util.Collections;
  18 +import java.util.List;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
  22 +
  23 +// 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 风格，优化代码；
  24 +/**
  25 + * MES 领料申请单 Service 实现类
  26 + */
  27 +@Service
  28 +@Validated
  29 +public class MesWmMaterialRequestServiceImpl implements MesWmMaterialRequestService {
  30 +
  31 + @Resource
  32 + private MesWmMaterialRequestMapper materialRequestMapper;
  33 +
  34 + @Resource
  35 + private MesWmMaterialRequestLineMapper materialRequestLineMapper;
  36 +
  37 + @Override
  38 + public Long createMaterialRequest(MesWmMaterialRequestSaveReqVO createReqVO) {
  39 + MesWmMaterialRequestDO materialRequest = BeanUtils.toBean(createReqVO, MesWmMaterialRequestDO.class);
  40 + materialRequest.setStatus(0); // 草稿
  41 + materialRequestMapper.insert(materialRequest);
  42 + return materialRequest.getId();
  43 + }
  44 +
  45 + @Override
  46 + public void updateMaterialRequest(MesWmMaterialRequestSaveReqVO updateReqVO) {
  47 + // 校验存在
  48 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(updateReqVO.getId());
  49 + // 只有草稿状态才允许修改
  50 + if (!materialRequest.getStatus().equals(0)) {
  51 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  52 + }
  53 + MesWmMaterialRequestDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMaterialRequestDO.class);
  54 + materialRequestMapper.updateById(updateObj);
  55 + }
  56 +
  57 + @Override
  58 + @Transactional(rollbackFor = Exception.class)
  59 + public void deleteMaterialRequest(Long id) {
  60 + // 校验存在
  61 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id);
  62 + // 只有草稿状态才允许删除
  63 + if (!materialRequest.getStatus().equals(0)) {
  64 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  65 + }
  66 + // 级联删除行
  67 + materialRequestLineMapper.deleteByMaterialRequestId(id);
  68 + // 删除
  69 + materialRequestMapper.deleteById(id);
  70 + }
  71 +
  72 + @Override
  73 + public MesWmMaterialRequestDO getMaterialRequest(Long id) {
  74 + return materialRequestMapper.selectById(id);
  75 + }
  76 +
  77 + @Override
  78 + public PageResult<MesWmMaterialRequestDO> getMaterialRequestPage(MesWmMaterialRequestPageReqVO pageReqVO) {
  79 + return materialRequestMapper.selectPage(pageReqVO);
  80 + }
  81 +
  82 + @Override
  83 + public void submitMaterialRequest(Long id) {
  84 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id);
  85 + // 0=草稿 → 1=备料中
  86 + if (!materialRequest.getStatus().equals(0)) {
  87 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  88 + }
  89 + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(1));
  90 + }
  91 +
  92 + @Override
  93 + public void approveMaterialRequest(Long id) {
  94 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id);
  95 + // 1=备料中 → 2=待领料
  96 + if (!materialRequest.getStatus().equals(1)) {
  97 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  98 + }
  99 + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(2));
  100 + }
  101 +
  102 + @Override
  103 + public void finishMaterialRequest(Long id) {
  104 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id);
  105 + // 2=待领料 → 3=已完成
  106 + if (!materialRequest.getStatus().equals(2)) {
  107 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  108 + }
  109 + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(3));
  110 + }
  111 +
  112 + @Override
  113 + public void cancelMaterialRequest(Long id) {
  114 + MesWmMaterialRequestDO materialRequest = validateMaterialRequestExists(id);
  115 + // 已完成不可取消
  116 + if (materialRequest.getStatus().equals(3)) {
  117 + throw exception(WM_MATERIAL_REQUEST_STATUS_INVALID);
  118 + }
  119 + materialRequestMapper.updateById(new MesWmMaterialRequestDO().setId(id).setStatus(4));
  120 + }
  121 +
  122 + @Override
  123 + public List<MesWmMaterialRequestDO> getMaterialRequestList(Collection<Long> ids) {
  124 + if (CollUtil.isEmpty(ids)) {
  125 + return Collections.emptyList();
  126 + }
  127 + return materialRequestMapper.selectByIds(ids);
  128 + }
  129 +
  130 + private MesWmMaterialRequestDO validateMaterialRequestExists(Long id) {
  131 + MesWmMaterialRequestDO materialRequest = materialRequestMapper.selectById(id);
  132 + if (materialRequest == null) {
  133 + throw exception(WM_MATERIAL_REQUEST_NOT_EXISTS);
  134 + }
  135 + return materialRequest;
  136 + }
  137 +
  138 +}
... ...