diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java new file mode 100644 index 0000000..0008b06 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java @@ -0,0 +1,134 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO; +import cn.iocoder.yudao.module.mes.service.wm.miscissue.MesWmMiscIssueService; +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 static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - MES 杂项出库单") +@RestController +@RequestMapping("/mes/wm/misc-issue") +@Validated +public class MesWmMiscIssueController { + + @Resource + private MesWmMiscIssueService miscIssueService; + + @PostMapping("/create") + @Operation(summary = "创建杂项出库单") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:create')") + public CommonResult createMiscIssue(@Valid @RequestBody MesWmMiscIssueSaveReqVO createReqVO) { + return success(miscIssueService.createMiscIssue(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改杂项出库单") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:update')") + public CommonResult updateMiscIssue(@Valid @RequestBody MesWmMiscIssueSaveReqVO updateReqVO) { + miscIssueService.updateMiscIssue(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除杂项出库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:delete')") + public CommonResult deleteMiscIssue(@RequestParam("id") Long id) { + miscIssueService.deleteMiscIssue(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得杂项出库单") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')") + public CommonResult getMiscIssue(@RequestParam("id") Long id) { + MesWmMiscIssueDO issue = miscIssueService.getMiscIssue(id); + if (issue == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(issue)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得杂项出库单分页") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')") + public CommonResult> getMiscIssuePage( + @Valid MesWmMiscIssuePageReqVO pageReqVO) { + PageResult pageResult = miscIssueService.getMiscIssuePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出杂项出库单 Excel") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMiscIssueExcel(@Valid MesWmMiscIssuePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult pageResult = miscIssueService.getMiscIssuePage(pageReqVO); + ExcelUtils.write(response, "杂项出库单.xls", "数据", MesWmMiscIssueRespVO.class, + buildRespVOList(pageResult.getList())); + } + + @PutMapping("/submit") + @Operation(summary = "提交杂项出库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:update')") + public CommonResult submitMiscIssue(@RequestParam("id") Long id) { + miscIssueService.submitMiscIssue(id); + return success(true); + } + + @PutMapping("/finish") + @Operation(summary = "执行出库") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:finish')") + public CommonResult finishMiscIssue(@RequestParam("id") Long id) { + miscIssueService.finishMiscIssue(id); + return success(true); + } + + @PutMapping("/cancel") + @Operation(summary = "取消杂项出库单") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:update')") + public CommonResult cancelMiscIssue(@RequestParam("id") Long id) { + miscIssueService.cancelMiscIssue(id); + return success(true); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + return BeanUtils.toBean(list, MesWmMiscIssueRespVO.class); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueLineController.java new file mode 100644 index 0000000..6191f5b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueLineController.java @@ -0,0 +1,114 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue; + +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.miscissue.vo.line.MesWmMiscIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMiscIssueLineRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMiscIssueLineSaveReqVO; +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.miscissue.MesWmMiscIssueLineDO; +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.miscissue.MesWmMiscIssueLineService; +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/misc-issue-line") +@Validated +public class MesWmMiscIssueLineController { + + @Resource + private MesWmMiscIssueLineService miscIssueLineService; + + @Resource + private MesMdItemService itemService; + + @Resource + private MesMdUnitMeasureService unitMeasureService; + + @PostMapping("/create") + @Operation(summary = "创建杂项出库单行") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:create')") + public CommonResult createMiscIssueLine(@Valid @RequestBody MesWmMiscIssueLineSaveReqVO createReqVO) { + return success(miscIssueLineService.createMiscIssueLine(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "修改杂项出库单行") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:update')") + public CommonResult updateMiscIssueLine(@Valid @RequestBody MesWmMiscIssueLineSaveReqVO updateReqVO) { + miscIssueLineService.updateMiscIssueLine(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除杂项出库单行") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:delete')") + public CommonResult deleteMiscIssueLine(@RequestParam("id") Long id) { + miscIssueLineService.deleteMiscIssueLine(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得杂项出库单行") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')") + public CommonResult getMiscIssueLine(@RequestParam("id") Long id) { + MesWmMiscIssueLineDO line = miscIssueLineService.getMiscIssueLine(id); + if (line == null) { + return success(null); + } + return success(buildRespVOList(Collections.singletonList(line)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得杂项出库单行分页") + @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')") + public CommonResult> getMiscIssueLinePage( + @Valid MesWmMiscIssueLinePageReqVO pageReqVO) { + PageResult pageResult = miscIssueLineService.getMiscIssueLinePage(pageReqVO); + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + // ==================== 拼接 VO ==================== + + private List buildRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 获得关联数据 + Map itemMap = itemService.getItemMap( + convertSet(list, MesWmMiscIssueLineDO::getItemId)); + Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId)); + // 2. 构建结果 + return BeanUtils.toBean(list, MesWmMiscIssueLineRespVO.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/miscissue/vo/MesWmMiscIssuePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssuePageReqVO.java new file mode 100644 index 0000000..ef9ecfc --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssuePageReqVO.java @@ -0,0 +1,34 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.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 MesWmMiscIssuePageReqVO extends PageParam { + + @Schema(description = "出库单编号", example = "MI20260302001") + private String code; + + @Schema(description = "出库单名称", example = "库存调整出库") + private String name; + + @Schema(description = "杂项类型", example = "STOCK_ADJUSTMENT") + private String type; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "出库日期范围") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] issueDate; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java new file mode 100644 index 0000000..3b3e6a8 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 杂项出库单 Response VO") +@Data +public class MesWmMiscIssueRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "出库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "MI20260302001") + private String code; + + @Schema(description = "出库单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "库存调整出库") + private String name; + + @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "STOCK_ADJUSTMENT") + private String type; + + @Schema(description = "来源单据ID", example = "1") + private Long sourceDocId; + + @Schema(description = "来源单据编号", example = "DOC20260302001") + private String sourceDocCode; + + @Schema(description = "来源单据类型", example = "PURCHASE_ORDER") + private String sourceDocType; + + @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime issueDate; + + @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/miscissue/vo/MesWmMiscIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java new file mode 100644 index 0000000..53fc1af --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.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 MesWmMiscIssueSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "出库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "MI20260302001") + @NotBlank(message = "出库单编号不能为空") + private String code; + + @Schema(description = "出库单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "库存调整出库") + @NotBlank(message = "出库单名称不能为空") + private String name; + + @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "STOCK_ADJUSTMENT") + @NotBlank(message = "杂项类型不能为空") + private String type; + + @Schema(description = "来源单据ID", example = "1") + private Long sourceDocId; + + @Schema(description = "来源单据编号", example = "DOC20260302001") + private String sourceDocCode; + + @Schema(description = "来源单据类型", example = "PURCHASE_ORDER") + private String sourceDocType; + + @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "出库日期不能为空") + private LocalDateTime issueDate; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLinePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLinePageReqVO.java new file mode 100644 index 0000000..ba361e6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLinePageReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.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 MesWmMiscIssueLinePageReqVO 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/miscissue/vo/line/MesWmMiscIssueLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineRespVO.java new file mode 100644 index 0000000..d9ad710 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineRespVO.java @@ -0,0 +1,61 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.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 MesWmMiscIssueLineRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "出库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long issueId; + + @Schema(description = "来源单据行ID", example = "1") + private Long sourceDocLineId; + + @Schema(description = "库存记录ID", example = "1") + private Long materialStockId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, 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 = "批次编号", example = "1") + private Long batchId; + + @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; + + @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/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java new file mode 100644 index 0000000..7d52914 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/line/MesWmMiscIssueLineSaveReqVO.java @@ -0,0 +1,51 @@ +package cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - MES 杂项出库单行新增/修改 Request VO") +@Data +public class MesWmMiscIssueLineSaveReqVO { + + @Schema(description = "编号", example = "1024") + private Long id; + + @Schema(description = "出库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "出库单编号不能为空") + private Long issueId; + + @Schema(description = "来源单据行ID", example = "1") + private Long sourceDocLineId; + + @Schema(description = "库存记录ID", example = "1") + private Long materialStockId; + + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "物料编号不能为空") + private Long itemId; + + @Schema(description = "出库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") + @NotNull(message = "出库数量不能为空") + @DecimalMin(value = "0.01", message = "出库数量必须大于0") + private BigDecimal quantity; + + @Schema(description = "批次编号", example = "1") + private Long batchId; + + @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/dal/dataobject/wm/miscissue/MesWmMiscIssueDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscissue/MesWmMiscIssueDO.java new file mode 100644 index 0000000..b0210e5 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscissue/MesWmMiscIssueDO.java @@ -0,0 +1,71 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmMiscIssueStatusEnum; +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_misc_issue") +@KeySequence("mes_wm_misc_issue_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmMiscIssueDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 出库单编号 + */ + private String code; + /** + * 出库单名称 + */ + private String name; + // TODO @AI:字典;需要写在 dict constants 里; + /** + * 杂项类型 + */ + private String type; + // TODO @芋艿:这里还没定,关联哪些; + /** + * 来源单据ID + */ + private Long sourceDocId; + /** + * 来源单据编号 + */ + private String sourceDocCode; + /** + * 来源单据类型 + */ + private String sourceDocType; + /** + * 出库日期 + */ + private LocalDateTime issueDate; + /** + * 状态 + * + * 枚举 {@link MesWmMiscIssueStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscissue/MesWmMiscIssueLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscissue/MesWmMiscIssueLineDO.java new file mode 100644 index 0000000..5e0b984 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/miscissue/MesWmMiscIssueLineDO.java @@ -0,0 +1,84 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue; + +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.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_misc_issue_line") +@KeySequence("mes_wm_misc_issue_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmMiscIssueLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 出库单编号 + * + * 关联 {@link MesWmMiscIssueDO#getId()} + */ + private Long issueId; + /** + * 来源单据行ID + */ + private Long sourceDocLineId; + /** + * 库存记录ID + */ + private Long materialStockId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 出库数量 + */ + private BigDecimal quantity; + /** + * 批次编号 + */ + private Long batchId; + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueLineMapper.java new file mode 100644 index 0000000..3f6d99f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueLineMapper.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.miscissue; + +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.miscissue.vo.line.MesWmMiscIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueLineDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 杂项出库单行 Mapper + */ +@Mapper +public interface MesWmMiscIssueLineMapper extends BaseMapperX { + + default PageResult selectPage(MesWmMiscIssueLinePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(MesWmMiscIssueLineDO::getIssueId, reqVO.getIssueId()) + .orderByDesc(MesWmMiscIssueLineDO::getId)); + } + + default List selectListByIssueId(Long issueId) { + return selectList(MesWmMiscIssueLineDO::getIssueId, issueId); + } + + default void deleteByIssueId(Long issueId) { + delete(MesWmMiscIssueLineDO::getIssueId, issueId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueMapper.java new file mode 100644 index 0000000..6715657 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/miscissue/MesWmMiscIssueMapper.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.miscissue; + +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.miscissue.vo.MesWmMiscIssuePageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 杂项出库单 Mapper + */ +@Mapper +public interface MesWmMiscIssueMapper extends BaseMapperX { + + default PageResult selectPage(MesWmMiscIssuePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesWmMiscIssueDO::getCode, reqVO.getCode()) + .likeIfPresent(MesWmMiscIssueDO::getName, reqVO.getName()) + .eqIfPresent(MesWmMiscIssueDO::getType, reqVO.getType()) + .eqIfPresent(MesWmMiscIssueDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesWmMiscIssueDO::getIssueDate, reqVO.getIssueDate()) + .orderByDesc(MesWmMiscIssueDO::getId)); + } + + default MesWmMiscIssueDO selectByCode(String code) { + return selectOne(MesWmMiscIssueDO::getCode, code); + } + + default List selectListByStatus(Integer status) { + return selectList(MesWmMiscIssueDO::getStatus, status); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 3d6aa0b..f137960 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -352,11 +352,14 @@ public interface ErrorCodeConstants { ErrorCode WM_MATERIAL_REQUEST_STATUS_INVALID = new ErrorCode(1_040_706_001, "领料申请单状态不正确,无法执行该操作"); ErrorCode WM_MATERIAL_REQUEST_LINE_NOT_EXISTS = new ErrorCode(1_040_706_100, "领料申请单行不存在"); - // ========== MES 仓库管理-外协出库单(1-040-707-000) ========== - ErrorCode WM_OUTSOURCE_ISSUE_NOT_EXISTS = new ErrorCode(1_040_707_000, "外协出库单不存在"); - ErrorCode WM_OUTSOURCE_ISSUE_STATUS_INVALID = new ErrorCode(1_040_707_001, "外协出库单状态不正确,无法执行该操作"); - ErrorCode WM_OUTSOURCE_ISSUE_QUANTITY_MISMATCH = new ErrorCode(1_040_707_002, "出库单行数量与明细数量不一致"); - ErrorCode WM_OUTSOURCE_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_707_100, "外协出库单行不存在"); + // ========== MES 仓库管理-外协发料单(1-040-707-000) ========== + ErrorCode WM_OUTSOURCE_ISSUE_NOT_EXISTS = new ErrorCode(1_040_707_000, "外协发料单不存在"); + ErrorCode WM_OUTSOURCE_ISSUE_CODE_DUPLICATE = new ErrorCode(1_040_707_001, "外协发料单编码已存在"); + ErrorCode WM_OUTSOURCE_ISSUE_STATUS_NOT_PREPARE = new ErrorCode(1_040_707_002, "只有草稿状态才允许此操作"); + ErrorCode WM_OUTSOURCE_ISSUE_NO_LINE = new ErrorCode(1_040_707_003, "至少需要一条发料行"); + ErrorCode WM_OUTSOURCE_ISSUE_QUANTITY_MISMATCH = new ErrorCode(1_040_707_004, "发料单行数量与明细数量不一致"); + ErrorCode WM_OUTSOURCE_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_707_100, "外协发料单行不存在"); + ErrorCode WM_OUTSOURCE_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_707_200, "外协发料单明细不存在"); // ========== MES 仓库管理-生产领料出库单(1-040-708-000) ========== ErrorCode WM_PRODUCTION_ISSUE_NOT_EXISTS = new ErrorCode(1_040_708_000, "生产领料出库单不存在"); @@ -414,6 +417,17 @@ public interface ErrorCodeConstants { ErrorCode WM_PRODUCT_RECPT_LINE_NOT_EXISTS = new ErrorCode(1_040_712_100, "产品收货单行不存在"); ErrorCode WM_PRODUCT_RECPT_DETAIL_NOT_EXISTS = new ErrorCode(1_040_712_200, "产品收货明细不存在"); + // ========== MES 仓库管理-外协入库单(1-040-713-000) ========== + ErrorCode WM_OUTSOURCE_RECEIPT_NOT_EXISTS = new ErrorCode(1_040_713_000, "外协入库单不存在"); + ErrorCode WM_OUTSOURCE_RECEIPT_CODE_DUPLICATE = new ErrorCode(1_040_713_001, "外协入库单编码已存在"); + ErrorCode WM_OUTSOURCE_RECEIPT_STATUS_NOT_PREPARE = new ErrorCode(1_040_713_002, "只有草稿状态才允许此操作"); + ErrorCode WM_OUTSOURCE_RECEIPT_NO_LINE = new ErrorCode(1_040_713_003, "至少需要一条行项目"); + ErrorCode WM_OUTSOURCE_RECEIPT_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_713_004, "明细上架总数与行入库数量不匹配"); + ErrorCode WM_OUTSOURCE_RECEIPT_STATUS_ERROR = new ErrorCode(1_040_713_005, "入库单状态不正确"); + ErrorCode WM_OUTSOURCE_RECEIPT_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_713_006, "已完成或已取消的入库单不允许取消"); + ErrorCode WM_OUTSOURCE_RECEIPT_LINE_NOT_EXISTS = new ErrorCode(1_040_713_100, "外协入库单行不存在"); + ErrorCode WM_OUTSOURCE_RECEIPT_DETAIL_NOT_EXISTS = new ErrorCode(1_040_713_200, "外协入库明细不存在"); + // ========== MES 仓库管理-销售退货单(1-040-713-000) ========== ErrorCode WM_RETURN_SALES_NOT_EXISTS = new ErrorCode(1_040_713_000, "销售退货单不存在"); ErrorCode WM_RETURN_SALES_CODE_DUPLICATE = new ErrorCode(1_040_713_001, "销售退货单编码已存在"); @@ -442,6 +456,16 @@ public interface ErrorCodeConstants { ErrorCode WM_PRODUCT_SALES_DETAIL_NOT_EXISTS = new ErrorCode(1_040_714_012, "销售出库明细不存在"); ErrorCode WM_PRODUCT_SALES_STOCK_INSUFFICIENT = new ErrorCode(1_040_714_013, "库存不足,无法拣货"); + // ========== MES 仓库管理-杂项出库单(1-040-715-000) ========== + ErrorCode WM_MISC_ISSUE_NOT_EXISTS = new ErrorCode(1_040_715_000, "杂项出库单不存在"); + ErrorCode WM_MISC_ISSUE_CODE_DUPLICATE = new ErrorCode(1_040_715_001, "杂项出库单编码已存在"); + ErrorCode WM_MISC_ISSUE_STATUS_INVALID = new ErrorCode(1_040_715_002, "杂项出库单状态不正确,无法执行该操作"); + ErrorCode WM_MISC_ISSUE_NO_LINE = new ErrorCode(1_040_715_003, "杂项出库单至少需要一条行数据"); + ErrorCode WM_MISC_ISSUE_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_715_004, "杂项出库单已完成或已取消,无法取消"); + ErrorCode WM_MISC_ISSUE_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_715_005, "杂项出库单行数量与明细数量不一致"); + ErrorCode WM_MISC_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_715_100, "杂项出库单行不存在"); + ErrorCode WM_MISC_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_715_200, "杂项出库单明细不存在"); + // ========== MES 仓库管理-发货通知单(1-040-720-000) ========== ErrorCode WM_SALES_NOTICE_NOT_EXISTS = new ErrorCode(1_040_720_000, "发货通知单不存在"); ErrorCode WM_SALES_NOTICE_CODE_DUPLICATE = new ErrorCode(1_040_720_001, "通知单编号重复"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMiscIssueStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMiscIssueStatusEnum.java new file mode 100644 index 0000000..0ee114c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMiscIssueStatusEnum.java @@ -0,0 +1,52 @@ +package cn.iocoder.yudao.module.mes.enums.wm; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 杂项出库单状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesWmMiscIssueStatusEnum 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/MesWmProductSalesStatusEnum.java,关联 orderstatus;然后有“对应方法” + /** + * 草稿 + */ + PREPARE(0, "草稿"), + /** + * 待执行出库 + */ + APPROVED(1, "待执行出库"), + /** + * 已完成 + */ + FINISHED(2, "已完成"), + /** + * 已取消 + */ + CANCELED(3, "已取消"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmMiscIssueStatusEnum::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/miscissue/MesWmMiscIssueLineService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineService.java new file mode 100644 index 0000000..8bd7cfb --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineService.java @@ -0,0 +1,69 @@ +package cn.iocoder.yudao.module.mes.service.wm.miscissue; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMiscIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMiscIssueLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueLineDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 杂项出库单行 Service 接口 + */ +public interface MesWmMiscIssueLineService { + + /** + * 创建杂项出库单行 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMiscIssueLine(@Valid MesWmMiscIssueLineSaveReqVO createReqVO); + + /** + * 修改杂项出库单行 + * + * @param updateReqVO 修改信息 + */ + void updateMiscIssueLine(@Valid MesWmMiscIssueLineSaveReqVO updateReqVO); + + /** + * 删除杂项出库单行(级联删除明细) + * + * @param id 编号 + */ + void deleteMiscIssueLine(Long id); + + /** + * 获得杂项出库单行 + * + * @param id 编号 + * @return 杂项出库单行 + */ + MesWmMiscIssueLineDO getMiscIssueLine(Long id); + + /** + * 获得杂项出库单行分页 + * + * @param pageReqVO 分页参数 + * @return 杂项出库单行分页 + */ + PageResult getMiscIssueLinePage(MesWmMiscIssueLinePageReqVO pageReqVO); + + /** + * 按出库单编号获得行列表 + * + * @param issueId 出库单编号 + * @return 行列表 + */ + List getMiscIssueLineListByIssueId(Long issueId); + + /** + * 按出库单编号批量删除行 + * + * @param issueId 出库单编号 + */ + void deleteMiscIssueLineByIssueId(Long issueId); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineServiceImpl.java new file mode 100644 index 0000000..9d6b283 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineServiceImpl.java @@ -0,0 +1,99 @@ +package cn.iocoder.yudao.module.mes.service.wm.miscissue; + +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.miscissue.vo.line.MesWmMiscIssueLinePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.line.MesWmMiscIssueLineSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.miscissue.MesWmMiscIssueLineMapper; +import jakarta.annotation.Resource; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.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 MesWmMiscIssueLineServiceImpl implements MesWmMiscIssueLineService { + + @Resource + private MesWmMiscIssueLineMapper miscIssueLineMapper; + + @Resource + @Lazy + private MesWmMiscIssueService miscIssueService; + + @Override + public Long createMiscIssueLine(MesWmMiscIssueLineSaveReqVO createReqVO) { + // 校验父单据存在且为可编辑状态 + miscIssueService.validateMiscIssueEditable(createReqVO.getIssueId()); + // TODO AI:item 存在; + // TODO @AI:校验 areaid 等字段存在;areaservice 有统一方法; + + // 新增 + MesWmMiscIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmMiscIssueLineDO.class); + miscIssueLineMapper.insert(line); + return line.getId(); + } + + @Override + public void updateMiscIssueLine(MesWmMiscIssueLineSaveReqVO updateReqVO) { + // 校验存在 + MesWmMiscIssueLineDO line = validateMiscIssueLineExists(updateReqVO.getId()); + // 校验父单据存在且为可编辑状态 + miscIssueService.validateMiscIssueEditable(line.getIssueId()); + // TODO AI:item 存在; + // TODO @AI:校验 areaid 等字段存在;areaservice 有统一方法; + + // 更新 + MesWmMiscIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMiscIssueLineDO.class); + miscIssueLineMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteMiscIssueLine(Long id) { + // 校验存在 + validateMiscIssueLineExists(id); + + // 删除 + miscIssueLineMapper.deleteById(id); + } + + @Override + public MesWmMiscIssueLineDO getMiscIssueLine(Long id) { + return miscIssueLineMapper.selectById(id); + } + + @Override + public PageResult getMiscIssueLinePage(MesWmMiscIssueLinePageReqVO pageReqVO) { + return miscIssueLineMapper.selectPage(pageReqVO); + } + + @Override + public List getMiscIssueLineListByIssueId(Long issueId) { + return miscIssueLineMapper.selectListByIssueId(issueId); + } + + @Override + public void deleteMiscIssueLineByIssueId(Long issueId) { + miscIssueLineMapper.deleteByIssueId(issueId); + } + + private MesWmMiscIssueLineDO validateMiscIssueLineExists(Long id) { + MesWmMiscIssueLineDO line = miscIssueLineMapper.selectById(id); + if (line == null) { + throw exception(WM_MISC_ISSUE_LINE_NOT_EXISTS); + } + return line; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java new file mode 100644 index 0000000..36971d7 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueService.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.mes.service.wm.miscissue; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO; +import jakarta.validation.Valid; + +/** + * MES 杂项出库单 Service 接口 + */ +public interface MesWmMiscIssueService { + + /** + * 创建杂项出库单 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMiscIssue(@Valid MesWmMiscIssueSaveReqVO createReqVO); + + /** + * 修改杂项出库单 + * + * @param updateReqVO 修改信息 + */ + void updateMiscIssue(@Valid MesWmMiscIssueSaveReqVO updateReqVO); + + /** + * 删除杂项出库单(级联删除行+明细) + * + * @param id 编号 + */ + void deleteMiscIssue(Long id); + + /** + * 获得杂项出库单 + * + * @param id 编号 + * @return 杂项出库单 + */ + MesWmMiscIssueDO getMiscIssue(Long id); + + /** + * 获得杂项出库单分页 + * + * @param pageReqVO 分页参数 + * @return 杂项出库单分页 + */ + PageResult getMiscIssuePage(MesWmMiscIssuePageReqVO pageReqVO); + + /** + * 提交杂项出库单(草稿 → 待执行出库) + * + * @param id 编号 + */ + void submitMiscIssue(Long id); + + /** + * 执行出库(待执行出库 → 已完成),扣减库存 + * + * @param id 编号 + */ + void finishMiscIssue(Long id); + + /** + * 取消杂项出库单(任意非已完成/已取消状态 → 已取消) + * + * @param id 编号 + */ + void cancelMiscIssue(Long id); + + /** + * 校验杂项出库单存在且处于可编辑状态(草稿) + * + * @param id 编号 + * @return 杂项出库单 + */ + MesWmMiscIssueDO validateMiscIssueEditable(Long id); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java new file mode 100644 index 0000000..08eced1 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java @@ -0,0 +1,185 @@ +package cn.iocoder.yudao.module.mes.service.wm.miscissue; + +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.miscissue.vo.MesWmMiscIssuePageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscissue.MesWmMiscIssueLineDO; +import cn.iocoder.yudao.module.mes.dal.mysql.wm.miscissue.MesWmMiscIssueMapper; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmMiscIssueStatusEnum; +import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +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 +@Slf4j +public class MesWmMiscIssueServiceImpl implements MesWmMiscIssueService { + + @Resource + private MesWmMiscIssueMapper miscIssueMapper; + + @Resource + private MesWmMiscIssueLineService miscIssueLineService; + + @Resource + private MesWmMaterialStockService materialStockService; + + @Override + public Long createMiscIssue(MesWmMiscIssueSaveReqVO createReqVO) { + // 校验编码唯一 + validateCodeUnique(null, createReqVO.getCode()); + + // 插入 + MesWmMiscIssueDO issue = BeanUtils.toBean(createReqVO, MesWmMiscIssueDO.class); + issue.setStatus(MesWmMiscIssueStatusEnum.PREPARE.getStatus()); + miscIssueMapper.insert(issue); + return issue.getId(); + } + + @Override + public void updateMiscIssue(MesWmMiscIssueSaveReqVO updateReqVO) { + // 校验存在 + 草稿状态 + validateMiscIssueExistsAndDraft(updateReqVO.getId()); + // 校验编码唯一 + validateCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + + // 更新 + MesWmMiscIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmMiscIssueDO.class); + miscIssueMapper.updateById(updateObj); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteMiscIssue(Long id) { + // 校验存在 + 草稿状态 + validateMiscIssueExistsAndDraft(id); + + // 级联删除行 + miscIssueLineService.deleteMiscIssueLineByIssueId(id); + // 删除 + miscIssueMapper.deleteById(id); + } + + @Override + public MesWmMiscIssueDO getMiscIssue(Long id) { + return miscIssueMapper.selectById(id); + } + + @Override + public PageResult getMiscIssuePage(MesWmMiscIssuePageReqVO pageReqVO) { + return miscIssueMapper.selectPage(pageReqVO); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void submitMiscIssue(Long id) { + // 校验存在 + 草稿状态 + validateMiscIssueExistsAndDraft(id); + // 校验至少有一条行 + List lines = miscIssueLineService.getMiscIssueLineListByIssueId(id); + if (CollUtil.isEmpty(lines)) { + throw exception(WM_MISC_ISSUE_NO_LINE); + } + + // 提交(草稿 → 待执行出库) + miscIssueMapper.updateById(new MesWmMiscIssueDO() + .setId(id).setStatus(MesWmMiscIssueStatusEnum.APPROVED.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void finishMiscIssue(Long id) { + // 校验存在 + MesWmMiscIssueDO issue = validateMiscIssueExists(id); + if (ObjUtil.notEqual(MesWmMiscIssueStatusEnum.APPROVED.getStatus(), issue.getStatus())) { + throw exception(WM_MISC_ISSUE_STATUS_INVALID); + } + + // 遍历所有行,扣减库存 + // TODO @AI:需要实现 materialStockService.decreaseStock 方法来扣减库存 + List lines = miscIssueLineService.getMiscIssueLineListByIssueId(id); + for (MesWmMiscIssueLineDO line : lines) { + // materialStockService.decreaseStock( + // line.getItemId(), line.getWarehouseId(), line.getLocationId(), line.getAreaId(), + // line.getBatchId(), line.getQuantity()); + log.warn("[finishMiscIssue][杂项出库单({}) 行({}) 需要扣减库存,但 decreaseStock 方法尚未实现]", id, line.getId()); + } + + // 更新出库单状态(待执行出库 → 已完成) + miscIssueMapper.updateById(new MesWmMiscIssueDO() + .setId(id).setStatus(MesWmMiscIssueStatusEnum.FINISHED.getStatus())); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void cancelMiscIssue(Long id) { + // 校验存在 + MesWmMiscIssueDO issue = validateMiscIssueExists(id); + // 已完成和已取消不允许取消 + if (ObjectUtils.equalsAny(issue.getStatus(), + MesWmMiscIssueStatusEnum.FINISHED.getStatus(), + MesWmMiscIssueStatusEnum.CANCELED.getStatus())) { + throw exception(WM_MISC_ISSUE_CANCEL_NOT_ALLOWED); + } + // 取消 + miscIssueMapper.updateById(new MesWmMiscIssueDO() + .setId(id).setStatus(MesWmMiscIssueStatusEnum.CANCELED.getStatus())); + } + + @Override + public MesWmMiscIssueDO validateMiscIssueEditable(Long id) { + MesWmMiscIssueDO issue = validateMiscIssueExists(id); + if (ObjUtil.notEqual(issue.getStatus(), MesWmMiscIssueStatusEnum.PREPARE.getStatus())) { + throw exception(WM_MISC_ISSUE_STATUS_INVALID); + } + return issue; + } + + private MesWmMiscIssueDO validateMiscIssueExists(Long id) { + MesWmMiscIssueDO issue = miscIssueMapper.selectById(id); + if (issue == null) { + throw exception(WM_MISC_ISSUE_NOT_EXISTS); + } + return issue; + } + + /** + * 校验杂项出库单存在且为草稿状态 + */ + private MesWmMiscIssueDO validateMiscIssueExistsAndDraft(Long id) { + MesWmMiscIssueDO issue = validateMiscIssueExists(id); + if (ObjUtil.notEqual(MesWmMiscIssueStatusEnum.PREPARE.getStatus(), issue.getStatus())) { + throw exception(WM_MISC_ISSUE_STATUS_INVALID); + } + return issue; + } + + private void validateCodeUnique(Long id, String code) { + MesWmMiscIssueDO issue = miscIssueMapper.selectByCode(code); + if (issue == null) { + return; + } + if (ObjUtil.notEqual(id, issue.getId())) { + throw exception(WM_MISC_ISSUE_CODE_DUPLICATE); + } + } + +}