diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java new file mode 100644 index 0000000..62adb30 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java @@ -0,0 +1,175 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue; + +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.collection.MapUtils; +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.returnissue.vo.MesWmReturnIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO; +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.returnissue.MesWmReturnIssueDO; +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.returnissue.MesWmReturnIssueService; +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; + +@Tag(name = "管理后台 - MES 生产退料单") +@RestController +@RequestMapping("/mes/wm/return-issue") +@Validated +public class MesWmReturnIssueController { + + @Resource + private MesWmReturnIssueService issueService; + @Resource + private MesMdWorkstationService workstationService; + @Resource + private MesProWorkOrderService workOrderService; + + @PostMapping("/create") + @Operation(summary = "创建生产退料单") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:create')") + public CommonResult createReturnIssue(@Valid @RequestBody MesWmReturnIssueSaveReqVO createReqVO) { + return success(issueService.createReturnIssue(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改生产退料单") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult updateReturnIssue(@Valid @RequestBody MesWmReturnIssueSaveReqVO updateReqVO) { + issueService.updateReturnIssue(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产退料单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:delete')") + public CommonResult deleteReturnIssue(@RequestParam("id") Long id) { + issueService.deleteReturnIssue(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产退料单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult getReturnIssue(@RequestParam("id") Long id) { + MesWmReturnIssueDO issue = issueService.getReturnIssue(id); + if (issue == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(issue)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得生产退料单分页") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult> getReturnIssuePage( + @Valid MesWmReturnIssuePageReqVO pageReqVO) { + PageResult pageResult = issueService.getReturnIssuePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出生产退料单 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportReturnIssueExcel(@Valid MesWmReturnIssuePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = issueService.getReturnIssuePage(pageReqVO); + ExcelUtils.write(response, "生产退料单.xls", "数据", MesWmReturnIssueRespVO.class, + buildRespVOList(pageResult.getList())); + } + + @PutMapping("/finish") + @Operation(summary = "完成生产退料单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:execute')") + public CommonResult finishReturnIssue(@RequestParam("id") Long id) { + issueService.finishReturnIssue(id); + return success(true); + } + + @PutMapping("/submit") + @Operation(summary = "提交生产退料单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult submitReturnIssue(@RequestParam("id") Long id) { + issueService.submitReturnIssue(id); + return success(true); + } + + @PutMapping("/stock") + @Operation(summary = "入库上架") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult stockReturnIssue(@RequestParam("id") Long id) { + issueService.stockReturnIssue(id); + return success(true); + } + + @PutMapping("/cancel") + @Operation(summary = "取消生产退料单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult cancelReturnIssue(@RequestParam("id") Long id) { + issueService.cancelReturnIssue(id); + return success(true); + } + + @GetMapping("/check-quantity") + @Operation(summary = "校验生产退料单数量", description = "校验每行明细数量之和是否等于行退料数量") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult checkReturnIssueQuantity(@RequestParam("id") Long id) { + return success(issueService.checkReturnIssueQuantity(id)); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map workstationMap = workstationService.getWorkstationMap( + convertSet(list, MesWmReturnIssueDO::getWorkstationId)); + Map workOrderMap = workOrderService.getWorkOrderMap( + convertSet(list, MesWmReturnIssueDO::getWorkOrderId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmReturnIssueRespVO.class, vo -> { + // 2.1 填充工作站名称 + MapUtils.findAndThen(workstationMap, vo.getWorkstationId(), + workstation -> vo.setWorkstationName(workstation.getName())); + // 2.2 填充工单编号 + MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), + workOrder -> vo.setWorkOrderCode(workOrder.getCode())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueDetailController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueDetailController.java new file mode 100644 index 0000000..642692c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueDetailController.java @@ -0,0 +1,140 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +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.returnissue.vo.detail.MesWmReturnIssueDetailRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.MesWmReturnIssueDetailSaveReqVO; +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.returnissue.MesWmReturnIssueDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +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.returnissue.MesWmReturnIssueDetailService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +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/return-issue-detail") +@Validated +public class MesWmReturnIssueDetailController { + + @Resource + private MesWmReturnIssueDetailService issueDetailService; + + @Resource + private MesMdItemService itemService; + + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @Resource + private MesWmWarehouseService warehouseService; + + @Resource + private MesWmWarehouseLocationService locationService; + + @Resource + private MesWmWarehouseAreaService areaService; + + @PostMapping("/create") + @Operation(summary = "创建生产退料明细") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:create')") + public CommonResult createReturnIssueDetail(@Valid @RequestBody MesWmReturnIssueDetailSaveReqVO createReqVO) { + return success(issueDetailService.createReturnIssueDetail(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改生产退料明细") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult updateReturnIssueDetail(@Valid @RequestBody MesWmReturnIssueDetailSaveReqVO updateReqVO) { + issueDetailService.updateReturnIssueDetail(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产退料明细") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:delete')") + public CommonResult deleteReturnIssueDetail(@RequestParam("id") Long id) { + issueDetailService.deleteReturnIssueDetail(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产退料明细") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult getReturnIssueDetail(@RequestParam("id") Long id) { + MesWmReturnIssueDetailDO detail = issueDetailService.getReturnIssueDetail(id); + if (detail == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(detail)).get(0)); + } + + @GetMapping("/list-by-line") + @Operation(summary = "获得生产退料明细列表（按行编号）") + @Parameter(name = "lineId", description = "行编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult> getReturnIssueDetailListByLineId( + @RequestParam("lineId") Long lineId) { + List list = issueDetailService.getReturnIssueDetailListByLineId(lineId); + return success(buildRespVOList(list)); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmReturnIssueDetailDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + Map warehouseMap = warehouseService.getWarehouseMap( + convertSet(list, MesWmReturnIssueDetailDO::getWarehouseId)); + Map locationMap = locationService.getWarehouseLocationMap( + convertSet(list, MesWmReturnIssueDetailDO::getLocationId)); + Map areaMap = areaService.getWarehouseAreaMap( + convertSet(list, MesWmReturnIssueDetailDO::getAreaId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmReturnIssueDetailRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), + unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName())); + }); + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), + warehouse -> vo.setWarehouseName(warehouse.getName())); + MapUtils.findAndThen(locationMap, vo.getLocationId(), + location -> vo.setLocationName(location.getName())); + MapUtils.findAndThen(areaMap, vo.getAreaId(), + area -> vo.setAreaName(area.getName())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java new file mode 100644 index 0000000..f1ff52c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java @@ -0,0 +1,124 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue; + +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.returnissue.vo.line.MesWmReturnIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLineSaveReqVO; +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.returnissue.MesWmReturnIssueLineDO; +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.returnissue.MesWmReturnIssueLineService; +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/return-issue-line") +@Validated +public class MesWmReturnIssueLineController { + + @Resource + private MesWmReturnIssueLineService issueLineService; + + @Resource + private MesMdItemService itemService; + + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @PostMapping("/create") + @Operation(summary = "创建生产退料单行") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:create')") + public CommonResult createReturnIssueLine(@Valid @RequestBody MesWmReturnIssueLineSaveReqVO createReqVO) { + return success(issueLineService.createReturnIssueLine(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改生产退料单行") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')") + public CommonResult updateReturnIssueLine(@Valid @RequestBody MesWmReturnIssueLineSaveReqVO updateReqVO) { + issueLineService.updateReturnIssueLine(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产退料单行") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:delete')") + public CommonResult deleteReturnIssueLine(@RequestParam("id") Long id) { + issueLineService.deleteReturnIssueLine(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产退料单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult getReturnIssueLine(@RequestParam("id") Long id) { + MesWmReturnIssueLineDO line = issueLineService.getReturnIssueLine(id); + if (line == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得生产退料单行分页") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult> getReturnIssueLinePage( + @Valid MesWmReturnIssueLinePageReqVO pageReqVO) { + PageResult pageResult = issueLineService.getReturnIssueLinePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/list-by-issue") + @Operation(summary = "获得生产退料单行列表（按退料单编号）") + @Parameter(name = "issueId", description = "退料单编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')") + public CommonResult> getReturnIssueLineListByIssueId( + @RequestParam("issueId") Long issueId) { + List list = issueLineService.getReturnIssueLineListByIssueId(issueId); + return success(buildRespVOList(list)); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmReturnIssueLineDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmReturnIssueLineRespVO.class, vo -> { + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()); + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(), + unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName())); + }); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java new file mode 100644 index 0000000..697b0a6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.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 MesWmReturnIssuePageReqVO extends PageParam { + + @Schema(description = "退料单编号", example = "RI20250226001") + private String code; + + @Schema(description = "退料单名称", example = "生产退料") + private String name; + + @Schema(description = "工作站 ID", example = "1") + private Long workstationId; + + @Schema(description = "生产工单 ID", example = "1") + private Long workOrderId; + + @Schema(description = "退料类型", example = "RMR") + private String returnType; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "退料日期范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] returnDate; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java new file mode 100644 index 0000000..66e23cc --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java @@ -0,0 +1,48 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 生产退料单 Response VO") +@Data +public class MesWmReturnIssueRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "退料单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RI20250226001") + private String code; + + @Schema(description = "退料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产退料") + private String name; + + @Schema(description = "生产工单 ID", example = "1") + private Long workOrderId; + + @Schema(description = "生产工单编号", example = "WO20250226001") + private String workOrderCode; + + @Schema(description = "工作站 ID", example = "1") + private Long workstationId; + + @Schema(description = "工作站名称", example = "装配工作站") + private String workstationName; + + @Schema(description = "退料类型", example = "RMR") + private String returnType; + + @Schema(description = "退料日期") + private LocalDateTime returnDate; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") + private Integer status; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java new file mode 100644 index 0000000..fec4e6e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +import java.time.LocalDateTime; + +// TODO @AI：需要检查下，哪些是必传字段。然后校验下； +@Schema(description = "管理后台 - MES 生产退料单新增/修改 Request VO") +@Data +public class MesWmReturnIssueSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "退料单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RI20250226001") + @NotBlank(message = "退料单编号不能为空") + private String code; + + @Schema(description = "退料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产退料") + @NotBlank(message = "退料单名称不能为空") + private String name; + + @Schema(description = "生产工单 ID", example = "1") + private Long workOrderId; + + @Schema(description = "工作站 ID", example = "1") + private Long workstationId; + + @Schema(description = "退料类型", example = "RMR") + private String returnType; + + @Schema(description = "退料日期") + private LocalDateTime returnDate; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailRespVO.java new file mode 100644 index 0000000..cfaa844 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailRespVO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail; + +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 +public class MesWmReturnIssueDetailRespVO { + + @Schema(description = "编号", example = "1") + private Long id; + + @Schema(description = "退料单编号", example = "1") + private Long issueId; + + @Schema(description = "行编号", example = "1") + private Long lineId; + + @Schema(description = "库存记录编号", example = "1") + private Long materialStockId; + + @Schema(description = "物料编号", example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "ITEM001") + private String itemCode; + + @Schema(description = "物料名称", example = "螺丝") + private String itemName; + + @Schema(description = "规格型号", example = "M8*20") + private String specification; + + @Schema(description = "计量单位名称", example = "个") + private String unitMeasureName; + + @Schema(description = "退料数量", example = "300.00") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原材料仓库") + private String warehouseName; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A区") + private String locationName; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A01") + private String areaName; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java new file mode 100644 index 0000000..158002d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java @@ -0,0 +1,50 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 生产退料明细新增/修改 Request VO") +@Data +public class MesWmReturnIssueDetailSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "退料单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退料单行编号不能为空") + private Long lineId; + + @Schema(description = "退料单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退料单编号不能为空") + private Long issueId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料编号不能为空") + private Long itemId; + + @Schema(description = "退料数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00") + @NotNull(message = "退料数量不能为空") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLinePageReqVO.java new file mode 100644 index 0000000..065132b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 生产退料单行分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesWmReturnIssueLinePageReqVO extends PageParam { + + @Schema(description = "退料单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退料单编号不能为空") + private Long issueId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java new file mode 100644 index 0000000..e1868ad --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line; + +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 +public class MesWmReturnIssueLineRespVO { + + @Schema(description = "行 ID", example = "1") + private Long id; + + @Schema(description = "退料单 ID", example = "1") + private Long issueId; + + @Schema(description = "物料 ID", example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "M001") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + private String unitMeasureName; + + @Schema(description = "退料数量", example = "100.00") + private BigDecimal quantity; + + @Schema(description = "批次 ID", example = "1") + private Long batchId; + + @Schema(description = "是否需要质检", example = "false") + private Boolean qcFlag; + + @Schema(description = "质量状态", example = "0") + private Integer qualityStatus; + + @Schema(description = "过程检验单 ID", example = "1") + private Long ipqcId; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java new file mode 100644 index 0000000..344e08b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.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 生产退料单行 Save Request VO") +@Data +public class MesWmReturnIssueLineSaveReqVO { + + @Schema(description = "行 ID", example = "1") + private Long id; + + @Schema(description = "退料单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退料单 ID 不能为空") + private Long issueId; + + @Schema(description = "物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料 ID 不能为空") + private Long itemId; + + @Schema(description = "退料数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") + @NotNull(message = "退料数量不能为空") + @DecimalMin(value = "0", inclusive = false, message = "退料数量必须大于 0") + private BigDecimal quantity; + + @Schema(description = "批次 ID", example = "1") + private Long batchId; + + @Schema(description = "是否需要质检", example = "false") + private Boolean qcFlag; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java new file mode 100644 index 0000000..59e3531 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorPageReqVO.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.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 MesWmReturnVendorPageReqVO extends PageParam { + + @Schema(description = "退货单编号", example = "RV20250226001") + private String code; + + @Schema(description = "退货单名称", example = "供应商退货") + private String name; + + @Schema(description = "供应商 ID", example = "1") + private Long vendorId; + + @Schema(description = "状态", example = "10") + private Integer status; + + @Schema(description = "退货日期范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] returnDate; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java new file mode 100644 index 0000000..f60e3ed --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java @@ -0,0 +1,57 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 供应商退货单 Response VO") +@Data +public class MesWmReturnVendorRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RV20250226001") + private String code; + + @Schema(description = "退货单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "供应商退货") + private String name; + + @Schema(description = "采购订单编号", example = "PO20250226001") + private String purchaseOrderCode; + + @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long vendorId; + + @Schema(description = "供应商名称", example = "XX供应商") + private String vendorName; + + @Schema(description = "供应商简称", example = "XX") + private String vendorNickname; + + @Schema(description = "批次号", example = "BATCH001") + private String batchCode; + + @Schema(description = "退货日期") + private LocalDateTime returnDate; + + @Schema(description = "退货原因", example = "质量不合格") + private String returnReason; + + @Schema(description = "物流单号", example = "SF1234567890") + private String transportCode; + + @Schema(description = "物流联系电话", example = "13800138000") + private String transportTelephone; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") + private Integer status; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java new file mode 100644 index 0000000..a49b996 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorSaveReqVO.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 供应商退货单新增/修改 Request VO") +@Data +public class MesWmReturnVendorSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "RV20250226001") + @NotBlank(message = "退货单编号不能为空") + private String code; + + @Schema(description = "退货单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "供应商退货") + @NotBlank(message = "退货单名称不能为空") + private String name; + + @Schema(description = "采购订单编号", example = "PO20250226001") + private String purchaseOrderCode; + + @Schema(description = "供应商 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "供应商 ID 不能为空") + private Long vendorId; + + @Schema(description = "批次号", example = "BATCH001") + private String batchCode; + + @Schema(description = "退货日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "退货日期不能为空") + private LocalDateTime returnDate; + + @Schema(description = "退货原因", example = "质量不合格") + private String returnReason; + + @Schema(description = "物流单号", example = "SF1234567890") + private String transportCode; + + @Schema(description = "物流联系电话", example = "13800138000") + private String transportTelephone; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailRespVO.java new file mode 100644 index 0000000..c97f337 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailRespVO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail; + +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 +public class MesWmReturnVendorDetailRespVO { + + @Schema(description = "编号", example = "1") + private Long id; + + @Schema(description = "退货单编号", example = "1") + private Long returnId; + + @Schema(description = "行编号", example = "1") + private Long lineId; + + @Schema(description = "库存记录编号", example = "1") + private Long materialStockId; + + @Schema(description = "物料编号", example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "ITEM001") + private String itemCode; + + @Schema(description = "物料名称", example = "螺丝") + private String itemName; + + @Schema(description = "规格型号", example = "M8*20") + private String specification; + + @Schema(description = "计量单位名称", example = "个") + private String unitMeasureName; + + @Schema(description = "退货数量", example = "300.00") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "仓库名称", example = "原材料仓库") + private String warehouseName; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库区名称", example = "A区") + private String locationName; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "库位名称", example = "A01") + private String areaName; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java new file mode 100644 index 0000000..b2906ac --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java @@ -0,0 +1,50 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 供应商退货明细新增/修改 Request VO") +@Data +public class MesWmReturnVendorDetailSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "退货单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退货单行编号不能为空") + private Long lineId; + + @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退货单编号不能为空") + private Long returnId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料编号不能为空") + private Long itemId; + + @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00") + @NotNull(message = "退货数量不能为空") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + + @Schema(description = "仓库编号", example = "1") + private Long warehouseId; + + @Schema(description = "库区编号", example = "1") + private Long locationId; + + @Schema(description = "库位编号", example = "1") + private Long areaId; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLinePageReqVO.java new file mode 100644 index 0000000..ff4a7e9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.line; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 供应商退货单行分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesWmReturnVendorLinePageReqVO extends PageParam { + + @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退货单编号不能为空") + private Long returnId; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineRespVO.java new file mode 100644 index 0000000..f1f32fb --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineRespVO.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.line; + +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 +public class MesWmReturnVendorLineRespVO { + + @Schema(description = "行ID", example = "1") + private Long id; + + @Schema(description = "退货单ID", example = "1") + private Long returnId; + + @Schema(description = "物料ID", example = "1") + private Long itemId; + + @Schema(description = "物料编码", example = "M001") + private String itemCode; + + @Schema(description = "物料名称", example = "钢板") + private String itemName; + + @Schema(description = "规格型号", example = "10mm*100mm") + private String specification; + + @Schema(description = "计量单位名称", example = "千克") + private String unitMeasureName; + + @Schema(description = "退货数量", example = "100.00") + private BigDecimal quantity; + + @Schema(description = "批次ID", example = "1") + private Long batchId; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineSaveReqVO.java new file mode 100644 index 0000000..2235dc5 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineSaveReqVO.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.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 供应商退货单行 Save Request VO") +@Data +public class MesWmReturnVendorLineSaveReqVO { + + @Schema(description = "行ID", example = "1") + private Long id; + + @Schema(description = "退货单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "退货单ID不能为空") + private Long returnId; + + @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料ID不能为空") + private Long itemId; + + @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") + @NotNull(message = "退货数量不能为空") + @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0") + private BigDecimal quantity; + + @Schema(description = "批次ID", example = "1") + private Long batchId; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java new file mode 100644 index 0000000..5ef8a35 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue; + +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 cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum; +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_return_issue") +@KeySequence("mes_wm_return_issue_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmReturnIssueDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 退料单编号 + */ + private String code; + /** + * 退料单名称 + */ + private String name; + /** + * 生产工单 ID + * + * 关联 {@link MesProWorkOrderDO#getId()} + */ + private Long workOrderId; + /** + * 工作站 ID + * + * 关联 {@link MesMdWorkstationDO#getId()} + */ + private Long workstationId; + // TODO @AI：可以改成 type 字段；简化； + /** + * 退料类型 + * + * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_WM_RETURN_ISSUE_TYPE} + */ + private String returnType; + /** + * 退料日期 + */ + private LocalDateTime returnDate; + /** + * 状态 + * + * 枚举 {@link MesWmReturnIssueStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDetailDO.java new file mode 100644 index 0000000..64fd54e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDetailDO.java @@ -0,0 +1,93 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue; + +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.wm.materialstock.MesWmMaterialStockDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +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_return_issue_detail") +@KeySequence("mes_wm_return_issue_detail_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmReturnIssueDetailDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 退料单 ID + * + * 关联 {@link MesWmReturnIssueDO#getId()} + */ + private Long issueId; + /** + * 行 ID + * + * 关联 {@link MesWmReturnIssueLineDO#getId()} + */ + private Long lineId; + /** + * 库存记录 ID + * + * 关联 {@link MesWmMaterialStockDO#getId()} + */ + private Long materialStockId; + /** + * 物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 退料数量 + */ + private BigDecimal quantity; + /** + * 批次 ID + */ + private Long batchId; + /** + * 批次号 + */ + private String batchCode; + /** + * 仓库 ID + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区 ID + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位 ID + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java new file mode 100644 index 0000000..d4fcbde --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java @@ -0,0 +1,75 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +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_return_issue_line") +@KeySequence("mes_wm_return_issue_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmReturnIssueLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 退料单 ID + * + * 关联 {@link MesWmReturnIssueDO#getId()} + */ + private Long issueId; + /** + * 库存记录 ID + */ + private Long materialStockId; + /** + * 物料 ID + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 退料数量 + */ + private BigDecimal quantity; + /** + * 批次 ID + */ + private Long batchId; + /** + * 过程检验单 ID + */ + private Long ipqcId; + /** + * 是否需要质检 + */ + private Boolean qcFlag; + // TODO @AI：额外加个枚举类； + // TODO @芋艿：是这些么？ + /** + * 质量状态 + * + * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_WM_QUALITY_STATUS} + */ + private Integer qualityStatus; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueDetailMapper.java new file mode 100644 index 0000000..8ec059e --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueDetailMapper.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 生产退料明细 Mapper + */ +@Mapper +public interface MesWmReturnIssueDetailMapper extends BaseMapperX { + + default List selectListByLineId(Long lineId) { + return selectList(MesWmReturnIssueDetailDO::getLineId, lineId); + } + + default List selectListByIssueId(Long issueId) { + return selectList(MesWmReturnIssueDetailDO::getIssueId, issueId); + } + + default void deleteByIssueId(Long issueId) { + delete(MesWmReturnIssueDetailDO::getIssueId, issueId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueLineMapper.java new file mode 100644 index 0000000..03df6ba --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueLineMapper.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue; + +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.returnissue.vo.line.MesWmReturnIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 生产退料单行 Mapper + */ +@Mapper +public interface MesWmReturnIssueLineMapper extends BaseMapperX { + + default PageResult selectPage(MesWmReturnIssueLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmReturnIssueLineDO::getIssueId, reqVO.getIssueId()) + .orderByDesc(MesWmReturnIssueLineDO::getId)); + } + + default List selectListByIssueId(Long issueId) { + return selectList(MesWmReturnIssueLineDO::getIssueId, issueId); + } + + default void deleteByIssueId(Long issueId) { + delete(MesWmReturnIssueLineDO::getIssueId, issueId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java new file mode 100644 index 0000000..6fbc801 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue; + +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.returnissue.vo.MesWmReturnIssuePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 生产退料单 Mapper + */ +@Mapper +public interface MesWmReturnIssueMapper extends BaseMapperX { + + default PageResult selectPage(MesWmReturnIssuePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesWmReturnIssueDO::getCode, reqVO.getCode()) + .likeIfPresent(MesWmReturnIssueDO::getName, reqVO.getName()) + .eqIfPresent(MesWmReturnIssueDO::getWorkstationId, reqVO.getWorkstationId()) + .eqIfPresent(MesWmReturnIssueDO::getWorkOrderId, reqVO.getWorkOrderId()) + .eqIfPresent(MesWmReturnIssueDO::getReturnType, reqVO.getReturnType()) + .eqIfPresent(MesWmReturnIssueDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesWmReturnIssueDO::getReturnDate, reqVO.getReturnDate()) + .orderByDesc(MesWmReturnIssueDO::getId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnIssueStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnIssueStatusEnum.java new file mode 100644 index 0000000..1acbf1c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnIssueStatusEnum.java @@ -0,0 +1,57 @@ +package cn.iocoder.yudao.module.mes.enums.wm; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 生产退料单状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesWmReturnIssueStatusEnum implements ArrayValuable { + + // TODO @AI：参考 /Users/yunai/Java/yudao-all-in-one/ruoyi-vue-pro/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java 增加注释 + /** + * 草稿 + */ + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), + /** + * 待入库（已提交，等待仓库上架入库） + */ + APPROVING(MesOrderStatusConstants.APPROVING, "待入库"), + /** + * 已入库（上架完成，等待最终确认） + */ + APPROVED(MesOrderStatusConstants.APPROVED, "已入库"), + /** + * 已完成 + */ + FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), + /** + * 已取消 + */ + CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmReturnIssueStatusEnum::getStatus).toArray(Integer[]::new); + + /** + * 状态值 + */ + private final Integer status; + /** + * 状态名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnVendorStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnVendorStatusEnum.java new file mode 100644 index 0000000..29b9de1 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnVendorStatusEnum.java @@ -0,0 +1,68 @@ +package cn.iocoder.yudao.module.mes.enums.wm; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorSaveReqVO; +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; +import cn.iocoder.yudao.module.mes.service.wm.returnvendor.MesWmReturnVendorService; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 供应商退货单状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesWmReturnVendorStatusEnum implements ArrayValuable { + + /** + * 草稿 + * + * 对应方法：{@link MesWmReturnVendorService#createReturnVendor(MesWmReturnVendorSaveReqVO)} + */ + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), + /** + * 待拣货 + * + * 对应方法：{@link MesWmReturnVendorService#submitReturnVendor(Long)} + */ + APPROVING(MesOrderStatusConstants.APPROVING, "待拣货"), + /** + * 待执行退货 + * + * 对应方法：{@link MesWmReturnVendorService#stockReturnVendor(Long)} + */ + APPROVED(MesOrderStatusConstants.APPROVED, "待执行退货"), + /** + * 已完成 + * + * 对应方法：{@link MesWmReturnVendorService#finishReturnVendor(Long)} + */ + FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), + /** + * 已取消 + * + * 对应方法：{@link MesWmReturnVendorService#cancelReturnVendor(Long)} + */ + CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmReturnVendorStatusEnum::getStatus).toArray(Integer[]::new); + + /** + * 状态值 + */ + private final Integer status; + /** + * 状态名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailService.java new file mode 100644 index 0000000..e1f051f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailService.java @@ -0,0 +1,67 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.MesWmReturnIssueDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 生产退料明细 Service 接口 + */ +public interface MesWmReturnIssueDetailService { + + /** + * 创建生产退料明细 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createReturnIssueDetail(@Valid MesWmReturnIssueDetailSaveReqVO createReqVO); + + /** + * 更新生产退料明细 + * + * @param updateReqVO 更新信息 + */ + void updateReturnIssueDetail(@Valid MesWmReturnIssueDetailSaveReqVO updateReqVO); + + /** + * 删除生产退料明细 + * + * @param id 编号 + */ + void deleteReturnIssueDetail(Long id); + + /** + * 获得生产退料明细 + * + * @param id 编号 + * @return 生产退料明细 + */ + MesWmReturnIssueDetailDO getReturnIssueDetail(Long id); + + /** + * 根据行 ID 获取明细列表 + * + * @param lineId 行 ID + * @return 明细列表 + */ + List getReturnIssueDetailListByLineId(Long lineId); + + /** + * 根据退料单 ID 获取明细列表 + * + * @param issueId 退料单 ID + * @return 明细列表 + */ + List getReturnIssueDetailListByIssueId(Long issueId); + + /** + * 根据退料单 ID 删除明细 + * + * @param issueId 退料单 ID + */ + void deleteReturnIssueDetailByIssueId(Long issueId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java new file mode 100644 index 0000000..e951dcb --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java @@ -0,0 +1,90 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.MesWmReturnIssueDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueDetailMapper; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_ISSUE_DETAIL_NOT_EXISTS; + +/** + * MES 生产退料明细 Service 实现类 + */ +@Service +@Validated +public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetailService { + + @Resource + private MesWmReturnIssueDetailMapper issueDetailMapper; + + @Resource + @Lazy + private MesWmReturnIssueLineService issueLineService; + + @Override + public Long createReturnIssueDetail(MesWmReturnIssueDetailSaveReqVO createReqVO) { + // 校验父数据存在 + issueLineService.validateReturnIssueLineExists(createReqVO.getLineId()); + // TODO @AI：校验物料存在 + + // 插入 + MesWmReturnIssueDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnIssueDetailDO.class); + issueDetailMapper.insert(detail); + return detail.getId(); + } + + @Override + public void updateReturnIssueDetail(MesWmReturnIssueDetailSaveReqVO updateReqVO) { + // 校验存在 + validateReturnIssueDetailExists(updateReqVO.getId()); + // 校验父数据存在 + issueLineService.validateReturnIssueLineExists(updateReqVO.getLineId()); + // TODO @AI：校验物料存在 + + // 更新 + MesWmReturnIssueDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDetailDO.class); + issueDetailMapper.updateById(updateObj); + } + + @Override + public void deleteReturnIssueDetail(Long id) { + // 校验存在 + validateReturnIssueDetailExists(id); + // 删除 + issueDetailMapper.deleteById(id); + } + + @Override + public MesWmReturnIssueDetailDO getReturnIssueDetail(Long id) { + return issueDetailMapper.selectById(id); + } + + @Override + public List getReturnIssueDetailListByLineId(Long lineId) { + return issueDetailMapper.selectListByLineId(lineId); + } + + @Override + public List getReturnIssueDetailListByIssueId(Long issueId) { + return issueDetailMapper.selectListByIssueId(issueId); + } + + @Override + public void deleteReturnIssueDetailByIssueId(Long issueId) { + issueDetailMapper.deleteByIssueId(issueId); + } + + private void validateReturnIssueDetailExists(Long id) { + if (issueDetailMapper.selectById(id) == null) { + throw exception(WM_RETURN_ISSUE_DETAIL_NOT_EXISTS); + } + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineService.java new file mode 100644 index 0000000..a785de9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineService.java @@ -0,0 +1,77 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 生产退料单行 Service 接口 + */ +public interface MesWmReturnIssueLineService { + + /** + * 创建生产退料单行 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createReturnIssueLine(@Valid MesWmReturnIssueLineSaveReqVO createReqVO); + + /** + * 更新生产退料单行 + * + * @param updateReqVO 更新信息 + */ + void updateReturnIssueLine(@Valid MesWmReturnIssueLineSaveReqVO updateReqVO); + + /** + * 删除生产退料单行 + * + * @param id 编号 + */ + void deleteReturnIssueLine(Long id); + + /** + * 获得生产退料单行 + * + * @param id 编号 + * @return 生产退料单行 + */ + MesWmReturnIssueLineDO getReturnIssueLine(Long id); + + /** + * 获得生产退料单行分页 + * + * @param pageReqVO 分页查询 + * @return 生产退料单行分页 + */ + PageResult getReturnIssueLinePage(MesWmReturnIssueLinePageReqVO pageReqVO); + + /** + * 根据退料单 ID 获取行列表 + * + * @param issueId 退料单 ID + * @return 行列表 + */ + List getReturnIssueLineListByIssueId(Long issueId); + + /** + * 根据退料单 ID 删除行 + * + * @param issueId 退料单 ID + */ + void deleteReturnIssueLineByIssueId(Long issueId); + + /** + * 校验生产退料单行是否存在 + * + * @param id 编号 + * @return 生产退料单行 + */ + MesWmReturnIssueLineDO validateReturnIssueLineExists(Long id); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java new file mode 100644 index 0000000..c4dde2b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java @@ -0,0 +1,110 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +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.returnissue.vo.line.MesWmReturnIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueLineMapper; +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_ISSUE_LINE_NOT_EXISTS; + +/** + * MES 生产退料单行 Service 实现类 + */ +@Service +@Validated +public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineService { + + @Resource + private MesWmReturnIssueLineMapper issueLineMapper; + + @Resource + @Lazy + private MesWmReturnIssueService issueService; + @Resource + private MesMdItemService itemService; + + @Override + public Long createReturnIssueLine(MesWmReturnIssueLineSaveReqVO createReqVO) { + // 校验父数据存在 + MesWmReturnIssueDO issue = issueService.validateReturnIssueExists(createReqVO.getIssueId()); + // 校验物料存在 + itemService.validateItemExists(createReqVO.getItemId()); + + // 插入 + MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class); + // 质量状态自动赋值 + // TODO @AI：这里需要在 review 下 @芋艿； + if (Boolean.TRUE.equals(createReqVO.getQcFlag())) { + line.setQualityStatus(0); // 待检 + } else if ("RMR".equals(issue.getReturnType())) { + line.setQualityStatus(1); // 合格（余料退回直接合格） + } else { + line.setQualityStatus(2); // 不合格 + } + issueLineMapper.insert(line); + return line.getId(); + } + + @Override + public void updateReturnIssueLine(MesWmReturnIssueLineSaveReqVO updateReqVO) { + // 校验存在 + validateReturnIssueLineExists(updateReqVO.getId()); + // 校验父数据存在 + issueService.validateReturnIssueExists(updateReqVO.getIssueId()); + // 校验物料存在 + itemService.validateItemExists(updateReqVO.getItemId()); + + // 更新 + MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class); + issueLineMapper.updateById(updateObj); + } + + @Override + public void deleteReturnIssueLine(Long id) { + // 校验存在 + validateReturnIssueLineExists(id); + // 删除 + issueLineMapper.deleteById(id); + } + + @Override + public MesWmReturnIssueLineDO getReturnIssueLine(Long id) { + return issueLineMapper.selectById(id); + } + + @Override + public PageResult getReturnIssueLinePage(MesWmReturnIssueLinePageReqVO pageReqVO) { + return issueLineMapper.selectPage(pageReqVO); + } + + @Override + public List getReturnIssueLineListByIssueId(Long issueId) { + return issueLineMapper.selectListByIssueId(issueId); + } + + @Override + public void deleteReturnIssueLineByIssueId(Long issueId) { + issueLineMapper.deleteByIssueId(issueId); + } + + @Override + public MesWmReturnIssueLineDO validateReturnIssueLineExists(Long id) { + MesWmReturnIssueLineDO line = issueLineMapper.selectById(id); + if (line == null) { + throw exception(WM_RETURN_ISSUE_LINE_NOT_EXISTS); + } + return line; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueService.java new file mode 100644 index 0000000..7eff140 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueService.java @@ -0,0 +1,96 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO; +import jakarta.validation.Valid; + +/** + * MES 生产退料单 Service 接口 + */ +public interface MesWmReturnIssueService { + + /** + * 创建生产退料单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createReturnIssue(@Valid MesWmReturnIssueSaveReqVO createReqVO); + + /** + * 修改生产退料单 + * + * @param updateReqVO 修改信息 + */ + void updateReturnIssue(@Valid MesWmReturnIssueSaveReqVO updateReqVO); + + /** + * 删除生产退料单 + * + * @param id 编号 + */ + void deleteReturnIssue(Long id); + + /** + * 获得生产退料单 + * + * @param id 编号 + * @return 生产退料单 + */ + MesWmReturnIssueDO getReturnIssue(Long id); + + /** + * 获得生产退料单分页 + * + * @param pageReqVO 分页参数 + * @return 生产退料单分页 + */ + PageResult getReturnIssuePage(MesWmReturnIssuePageReqVO pageReqVO); + + /** + * 校验生产退料单是否存在 + * + * @param id 编号 + * @return 生产退料单 + */ + MesWmReturnIssueDO validateReturnIssueExists(Long id); + + /** + * 提交生产退料单（草稿 → 待入库） + * + * @param id 编号 + */ + void submitReturnIssue(Long id); + + /** + * 入库上架（待入库 → 已入库） + * + * @param id 编号 + */ + void stockReturnIssue(Long id); + + /** + * 完成退料（已入库 → 已完成），更新库存台账 + * + * @param id 编号 + */ + void finishReturnIssue(Long id); + + /** + * 取消生产退料单（任意非已完成/已取消状态 → 已取消） + * + * @param id 编号 + */ + void cancelReturnIssue(Long id); + + /** + * 校验生产退料单的数量：每行明细数量之和是否等于行退料数量 + * + * @param id 编号 + * @return 是否全部一致 + */ + Boolean checkReturnIssueQuantity(Long id); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java new file mode 100644 index 0000000..1295d5a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java @@ -0,0 +1,211 @@ +package cn.iocoder.yudao.module.mes.service.wm.returnissue; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueMapper; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum; +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.math.BigDecimal; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 生产退料单 Service 实现类 + */ +@Service +@Validated +public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService { + + @Resource + private MesWmReturnIssueMapper issueMapper; + + @Resource + private MesWmReturnIssueLineService issueLineService; + @Resource + private MesWmReturnIssueDetailService issueDetailService; + @Resource + private MesMdWorkstationService workstationService; + @Resource + private MesProWorkOrderService workOrderService; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createReturnIssue(MesWmReturnIssueSaveReqVO createReqVO) { + // 1. 校验关联数据（workOrderId 非必填） + if (createReqVO.getWorkOrderId() != null) { + workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId()); + } + if (createReqVO.getWorkstationId() != null) { + workstationService.validateWorkstationExists(createReqVO.getWorkstationId()); + } + + // 2. 插入主表 + MesWmReturnIssueDO issue = BeanUtils.toBean(createReqVO, MesWmReturnIssueDO.class); + issue.setStatus(MesWmReturnIssueStatusEnum.PREPARE.getStatus()); + issueMapper.insert(issue); + return issue.getId(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateReturnIssue(MesWmReturnIssueSaveReqVO updateReqVO) { + // 1.1 校验存在 + 准备中状态 + validateReturnIssueExistsAndPrepare(updateReqVO.getId()); + // 1.2 校验关联数据 + if (updateReqVO.getWorkOrderId() != null) { + workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId()); + } + if (updateReqVO.getWorkstationId() != null) { + workstationService.validateWorkstationExists(updateReqVO.getWorkstationId()); + } + + // 2. 更新主表 + MesWmReturnIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDO.class); + issueMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteReturnIssue(Long id) { + // 1. 校验存在 + 准备中状态 + validateReturnIssueExistsAndPrepare(id); + + // 2.1 级联删除明细 + issueDetailService.deleteReturnIssueDetailByIssueId(id); + // 2.2 级联删除行 + issueLineService.deleteReturnIssueLineByIssueId(id); + // 2.3 删除主表 + issueMapper.deleteById(id); + } + + @Override + public MesWmReturnIssueDO getReturnIssue(Long id) { + return issueMapper.selectById(id); + } + + @Override + public PageResult getReturnIssuePage(MesWmReturnIssuePageReqVO pageReqVO) { + return issueMapper.selectPage(pageReqVO); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void submitReturnIssue(Long id) { + // 校验存在 + 草稿状态 + validateReturnIssueExistsAndPrepare(id); + // 校验至少有一条行 + List lines = issueLineService.getReturnIssueLineListByIssueId(id); + if (CollUtil.isEmpty(lines)) { + throw exception(WM_RETURN_ISSUE_NO_LINE); + } + + // 提交（草稿 → 待入库） + issueMapper.updateById(new MesWmReturnIssueDO() + .setId(id).setStatus(MesWmReturnIssueStatusEnum.APPROVING.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void stockReturnIssue(Long id) { + // 校验存在 + MesWmReturnIssueDO issue = validateReturnIssueExists(id); + if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.APPROVING.getStatus(), issue.getStatus())) { + throw exception(WM_RETURN_ISSUE_STATUS_INVALID); + } + // 入库上架（待入库 → 已入库） + issueMapper.updateById(new MesWmReturnIssueDO() + .setId(id).setStatus(MesWmReturnIssueStatusEnum.APPROVED.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void finishReturnIssue(Long id) { + // 校验存在 + MesWmReturnIssueDO issue = validateReturnIssueExists(id); + if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.APPROVED.getStatus(), issue.getStatus())) { + throw exception(WM_RETURN_ISSUE_STATUS_INVALID); + } + + // 遍历所有明细，更新库存台账（增加库存，与领料出库相反） + // TODO @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄； + List details = issueDetailService.getReturnIssueDetailListByIssueId(id); + for (MesWmReturnIssueDetailDO detail : details) { + // materialStockService.increaseStock( + // detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), + // detail.getBatchId(), detail.getQuantity(), issue.getWorkOrderId(), null, null); + } + + // 更新退料单状态 + issueMapper.updateById(new MesWmReturnIssueDO() + .setId(id).setStatus(MesWmReturnIssueStatusEnum.FINISHED.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void cancelReturnIssue(Long id) { + // 校验存在 + MesWmReturnIssueDO issue = validateReturnIssueExists(id); + // 已完成和已取消不允许取消 + if (ObjectUtils.equalsAny(issue.getStatus(), + MesWmReturnIssueStatusEnum.FINISHED.getStatus(), + MesWmReturnIssueStatusEnum.CANCELED.getStatus())) { + throw exception(WM_RETURN_ISSUE_CANCEL_NOT_ALLOWED); + } + + // 取消 + issueMapper.updateById(new MesWmReturnIssueDO() + .setId(id).setStatus(MesWmReturnIssueStatusEnum.CANCELED.getStatus())); + } + + @Override + public Boolean checkReturnIssueQuantity(Long id) { + List lines = issueLineService.getReturnIssueLineListByIssueId(id); + for (MesWmReturnIssueLineDO line : lines) { + List details = issueDetailService.getReturnIssueDetailListByLineId(line.getId()); + BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, + MesWmReturnIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); + if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) { + return false; + } + } + return true; + } + + @Override + public MesWmReturnIssueDO validateReturnIssueExists(Long id) { + MesWmReturnIssueDO issue = issueMapper.selectById(id); + if (issue == null) { + throw exception(WM_RETURN_ISSUE_NOT_EXISTS); + } + return issue; + } + + /** + * 校验生产退料单存在且为准备中状态 + */ + private MesWmReturnIssueDO validateReturnIssueExistsAndPrepare(Long id) { + MesWmReturnIssueDO issue = validateReturnIssueExists(id); + if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.PREPARE.getStatus(), issue.getStatus())) { + throw exception(WM_RETURN_ISSUE_STATUS_INVALID); + } + return issue; + } + +}