BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 305753a0091ac1c6a94d3079a8c1d35a31cb7bac

Authored by YunaiV
1 parent bc02877b

✨ feat(mes): 添加生产入库单及相关功能 

新增生产入库单的相关数据结构、API 接口和服务实现，包括入库单、入库明细及其 CRUD 操作。此功能支持生产入库管理，提升仓库管理效率。

- 添加生产入库单相关的请求和响应 VO
- 实现生产入库单的服务接口
- 增加生产入库单行的 CRUD 操作
- 更新相关的数据库映射和查询逻辑
Inline Side-by-side
Showing 28 changed files with 1853 additions and 0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/MesWmProductProduceController.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
  5 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  7 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  8 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  9 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  10 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  11 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProducePageReqVO;
  12 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProduceRespVO;
  13 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProduceSaveReqVO;
  14 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
  15 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
  16 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
  17 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
  18 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
  19 +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
  20 +import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
  21 +import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
  22 +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
  23 +import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
  24 +import io.swagger.v3.oas.annotations.Operation;
  25 +import io.swagger.v3.oas.annotations.Parameter;
  26 +import io.swagger.v3.oas.annotations.tags.Tag;
  27 +import jakarta.annotation.Resource;
  28 +import jakarta.servlet.http.HttpServletResponse;
  29 +import jakarta.validation.Valid;
  30 +import org.springframework.security.access.prepost.PreAuthorize;
  31 +import org.springframework.validation.annotation.Validated;
  32 +import org.springframework.web.bind.annotation.*;
  33 +
  34 +import java.io.IOException;
  35 +import java.util.Collections;
  36 +import java.util.List;
  37 +import java.util.Map;
  38 +
  39 +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
  40 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  41 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  42 +
  43 +@Tag(name = "管理后台 - MES 生产入库单")
  44 +@RestController
  45 +@RequestMapping("/mes/wm/product-produce")
  46 +@Validated
  47 +public class MesWmProductProduceController {
  48 +
  49 + @Resource
  50 + private MesWmProductProduceService produceService;
  51 + @Resource
  52 + private MesMdWorkstationService workstationService;
  53 + @Resource
  54 + private MesProWorkOrderService workOrderService;
  55 + @Resource
  56 + private MesProProcessService processService;
  57 + @Resource
  58 + private MesProTaskService taskService;
  59 +
  60 + @PostMapping("/create")
  61 + @Operation(summary = "创建生产入库单")
  62 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:create')")
  63 + public CommonResult<Long> createProductProduce(@Valid @RequestBody MesWmProductProduceSaveReqVO createReqVO) {
  64 + return success(produceService.createProductProduce(createReqVO));
  65 + }
  66 +
  67 + @PutMapping("/update")
  68 + @Operation(summary = "修改生产入库单")
  69 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:update')")
  70 + public CommonResult<Boolean> updateProductProduce(@Valid @RequestBody MesWmProductProduceSaveReqVO updateReqVO) {
  71 + produceService.updateProductProduce(updateReqVO);
  72 + return success(true);
  73 + }
  74 +
  75 + @DeleteMapping("/delete")
  76 + @Operation(summary = "删除生产入库单")
  77 + @Parameter(name = "id", description = "编号", required = true)
  78 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:delete')")
  79 + public CommonResult<Boolean> deleteProductProduce(@RequestParam("id") Long id) {
  80 + produceService.deleteProductProduce(id);
  81 + return success(true);
  82 + }
  83 +
  84 + @GetMapping("/get")
  85 + @Operation(summary = "获得生产入库单")
  86 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  87 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  88 + public CommonResult<MesWmProductProduceRespVO> getProductProduce(@RequestParam("id") Long id) {
  89 + MesWmProductProduceDO produce = produceService.getProductProduce(id);
  90 + if (produce == null) {
  91 + return success(null);
  92 + }
  93 + return success(buildRespVOList(Collections.singletonList(produce)).get(0));
  94 + }
  95 +
  96 + @GetMapping("/page")
  97 + @Operation(summary = "获得生产入库单分页")
  98 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  99 + public CommonResult<PageResult<MesWmProductProduceRespVO>> getProductProducePage(
  100 + @Valid MesWmProductProducePageReqVO pageReqVO) {
  101 + PageResult<MesWmProductProduceDO> pageResult = produceService.getProductProducePage(pageReqVO);
  102 + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
  103 + }
  104 +
  105 + @GetMapping("/export-excel")
  106 + @Operation(summary = "导出生产入库单 Excel")
  107 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:export')")
  108 + @ApiAccessLog(operateType = EXPORT)
  109 + public void exportProductProduceExcel(@Valid MesWmProductProducePageReqVO pageReqVO,
  110 + HttpServletResponse response) throws IOException {
  111 + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
  112 + PageResult<MesWmProductProduceDO> pageResult = produceService.getProductProducePage(pageReqVO);
  113 + ExcelUtils.write(response, "生产入库单.xls", "数据", MesWmProductProduceRespVO.class,
  114 + buildRespVOList(pageResult.getList()));
  115 + }
  116 +
  117 + @PutMapping("/finish")
  118 + @Operation(summary = "完成生产入库单")
  119 + @Parameter(name = "id", description = "编号", required = true)
  120 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:update-status')")
  121 + public CommonResult<Boolean> finishProductProduce(@RequestParam("id") Long id) {
  122 + produceService.finishProductProduce(id);
  123 + return success(true);
  124 + }
  125 +
  126 + @PutMapping("/cancel")
  127 + @Operation(summary = "取消生产入库单")
  128 + @Parameter(name = "id", description = "编号", required = true)
  129 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:update-status')")
  130 + public CommonResult<Boolean> cancelProductProduce(@RequestParam("id") Long id) {
  131 + produceService.cancelProductProduce(id);
  132 + return success(true);
  133 + }
  134 +
  135 + @GetMapping("/check-quantity")
  136 + @Operation(summary = "校验生产入库单数量", description = "校验每行明细数量之和是否等于行入库数量")
  137 + @Parameter(name = "id", description = "编号", required = true)
  138 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  139 + public CommonResult<Boolean> checkProductProduceQuantity(@RequestParam("id") Long id) {
  140 + return success(produceService.checkProductProduceQuantity(id));
  141 + }
  142 +
  143 + // ==================== 拼接 VO ====================
  144 +
  145 + private List<MesWmProductProduceRespVO> buildRespVOList(List<MesWmProductProduceDO> list) {
  146 + if (CollUtil.isEmpty(list)) {
  147 + return Collections.emptyList();
  148 + }
  149 + // 1. 获得关联数据
  150 + Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
  151 + convertSet(list, MesWmProductProduceDO::getWorkstationId));
  152 + Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
  153 + convertSet(list, MesWmProductProduceDO::getWorkOrderId));
  154 + Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
  155 + convertSet(list, MesWmProductProduceDO::getProcessId));
  156 + Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
  157 + convertSet(list, MesWmProductProduceDO::getTaskId));
  158 + // 2. 构建结果
  159 + return BeanUtils.toBean(list, MesWmProductProduceRespVO.class, vo -> {
  160 + // 2.1 填充工作站名称
  161 + MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
  162 + workstation -> vo.setWorkstationName(workstation.getName()));
  163 + // 2.2 填充工单编号
  164 + MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
  165 + workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
  166 + // 2.3 填充工序名称
  167 + MapUtils.findAndThen(processMap, vo.getProcessId(),
  168 + process -> vo.setProcessName(process.getName()));
  169 + // 2.4 填充任务编号
  170 + MapUtils.findAndThen(taskMap, vo.getTaskId(),
  171 + task -> vo.setTaskCode(task.getCode()));
  172 + });
  173 + }
  174 +
  175 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/MesWmProductProduceDetailController.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  6 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  7 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail.MesWmProductProduceDetailRespVO;
  8 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail.MesWmProductProduceDetailSaveReqVO;
  9 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  10 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
  11 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
  12 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
  14 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
  15 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  16 +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
  17 +import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceDetailService;
  18 +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
  19 +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
  20 +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
  21 +import io.swagger.v3.oas.annotations.Operation;
  22 +import io.swagger.v3.oas.annotations.Parameter;
  23 +import io.swagger.v3.oas.annotations.tags.Tag;
  24 +import jakarta.annotation.Resource;
  25 +import jakarta.validation.Valid;
  26 +import org.springframework.security.access.prepost.PreAuthorize;
  27 +import org.springframework.validation.annotation.Validated;
  28 +import org.springframework.web.bind.annotation.*;
  29 +
  30 +import java.util.Collections;
  31 +import java.util.List;
  32 +import java.util.Map;
  33 +
  34 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  35 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  36 +
  37 +@Tag(name = "管理后台 - MES 生产入库明细")
  38 +@RestController
  39 +@RequestMapping("/mes/wm/product-produce-detail")
  40 +@Validated
  41 +public class MesWmProductProduceDetailController {
  42 +
  43 + @Resource
  44 + private MesWmProductProduceDetailService produceDetailService;
  45 +
  46 + @Resource
  47 + private MesMdItemService itemService;
  48 +
  49 + @Resource
  50 + private MesMdUnitMeasureService unitMeasureService;
  51 +
  52 + @Resource
  53 + private MesWmWarehouseService warehouseService;
  54 +
  55 + @Resource
  56 + private MesWmWarehouseLocationService locationService;
  57 +
  58 + @Resource
  59 + private MesWmWarehouseAreaService areaService;
  60 +
  61 + @PostMapping("/create")
  62 + @Operation(summary = "创建生产入库明细")
  63 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:create')")
  64 + public CommonResult<Long> createProductProduceDetail(@Valid @RequestBody MesWmProductProduceDetailSaveReqVO createReqVO) {
  65 + return success(produceDetailService.createProductProduceDetail(createReqVO));
  66 + }
  67 +
  68 + @PutMapping("/update")
  69 + @Operation(summary = "修改生产入库明细")
  70 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:update')")
  71 + public CommonResult<Boolean> updateProductProduceDetail(@Valid @RequestBody MesWmProductProduceDetailSaveReqVO updateReqVO) {
  72 + produceDetailService.updateProductProduceDetail(updateReqVO);
  73 + return success(true);
  74 + }
  75 +
  76 + @DeleteMapping("/delete")
  77 + @Operation(summary = "删除生产入库明细")
  78 + @Parameter(name = "id", description = "编号", required = true)
  79 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:delete')")
  80 + public CommonResult<Boolean> deleteProductProduceDetail(@RequestParam("id") Long id) {
  81 + produceDetailService.deleteProductProduceDetail(id);
  82 + return success(true);
  83 + }
  84 +
  85 + @GetMapping("/get")
  86 + @Operation(summary = "获得生产入库明细")
  87 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  88 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  89 + public CommonResult<MesWmProductProduceDetailRespVO> getProductProduceDetail(@RequestParam("id") Long id) {
  90 + MesWmProductProduceDetailDO detail = produceDetailService.getProductProduceDetail(id);
  91 + if (detail == null) {
  92 + return success(null);
  93 + }
  94 + return success(buildRespVOList(Collections.singletonList(detail)).get(0));
  95 + }
  96 +
  97 + @GetMapping("/list-by-line")
  98 + @Operation(summary = "获得生产入库明细列表（按行编号）")
  99 + @Parameter(name = "lineId", description = "行编号", required = true, example = "1024")
  100 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  101 + public CommonResult<List<MesWmProductProduceDetailRespVO>> getProductProduceDetailListByLineId(
  102 + @RequestParam("lineId") Long lineId) {
  103 + List<MesWmProductProduceDetailDO> list = produceDetailService.getProductProduceDetailListByLineId(lineId);
  104 + return success(buildRespVOList(list));
  105 + }
  106 +
  107 + // ==================== 拼接 VO ====================
  108 +
  109 + private List<MesWmProductProduceDetailRespVO> buildRespVOList(List<MesWmProductProduceDetailDO> list) {
  110 + if (CollUtil.isEmpty(list)) {
  111 + return Collections.emptyList();
  112 + }
  113 + // 1. 获得关联数据
  114 + Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
  115 + convertSet(list, MesWmProductProduceDetailDO::getItemId));
  116 + Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
  117 + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
  118 + Map<Long, MesWmWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(
  119 + convertSet(list, MesWmProductProduceDetailDO::getWarehouseId));
  120 + Map<Long, MesWmWarehouseLocationDO> locationMap = locationService.getWarehouseLocationMap(
  121 + convertSet(list, MesWmProductProduceDetailDO::getLocationId));
  122 + Map<Long, MesWmWarehouseAreaDO> areaMap = areaService.getWarehouseAreaMap(
  123 + convertSet(list, MesWmProductProduceDetailDO::getAreaId));
  124 + // 2. 构建结果
  125 + return BeanUtils.toBean(list, MesWmProductProduceDetailRespVO.class, vo -> {
  126 + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
  127 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
  128 + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
  129 + unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
  130 + });
  131 + MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),
  132 + warehouse -> vo.setWarehouseName(warehouse.getName()));
  133 + MapUtils.findAndThen(locationMap, vo.getLocationId(),
  134 + location -> vo.setLocationName(location.getName()));
  135 + MapUtils.findAndThen(areaMap, vo.getAreaId(),
  136 + area -> vo.setAreaName(area.getName()));
  137 + });
  138 + }
  139 +
  140 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/MesWmProductProduceLineController.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  8 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLinePageReqVO;
  9 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLineRespVO;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLineSaveReqVO;
  11 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  12 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
  14 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  15 +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
  16 +import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
  17 +import io.swagger.v3.oas.annotations.Operation;
  18 +import io.swagger.v3.oas.annotations.Parameter;
  19 +import io.swagger.v3.oas.annotations.tags.Tag;
  20 +import jakarta.annotation.Resource;
  21 +import jakarta.validation.Valid;
  22 +import org.springframework.security.access.prepost.PreAuthorize;
  23 +import org.springframework.validation.annotation.Validated;
  24 +import org.springframework.web.bind.annotation.*;
  25 +
  26 +import java.util.Collections;
  27 +import java.util.List;
  28 +import java.util.Map;
  29 +
  30 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  32 +
  33 +@Tag(name = "管理后台 - MES 生产入库单行")
  34 +@RestController
  35 +@RequestMapping("/mes/wm/product-produce-line")
  36 +@Validated
  37 +public class MesWmProductProduceLineController {
  38 +
  39 + @Resource
  40 + private MesWmProductProduceLineService produceLineService;
  41 +
  42 + @Resource
  43 + private MesMdItemService itemService;
  44 +
  45 + @Resource
  46 + private MesMdUnitMeasureService unitMeasureService;
  47 +
  48 + @PostMapping("/create")
  49 + @Operation(summary = "创建生产入库单行")
  50 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:create')")
  51 + public CommonResult<Long> createProductProduceLine(@Valid @RequestBody MesWmProductProduceLineSaveReqVO createReqVO) {
  52 + return success(produceLineService.createProductProduceLine(createReqVO));
  53 + }
  54 +
  55 + @PutMapping("/update")
  56 + @Operation(summary = "修改生产入库单行")
  57 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:update')")
  58 + public CommonResult<Boolean> updateProductProduceLine(@Valid @RequestBody MesWmProductProduceLineSaveReqVO updateReqVO) {
  59 + produceLineService.updateProductProduceLine(updateReqVO);
  60 + return success(true);
  61 + }
  62 +
  63 + @DeleteMapping("/delete")
  64 + @Operation(summary = "删除生产入库单行")
  65 + @Parameter(name = "id", description = "编号", required = true)
  66 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:delete')")
  67 + public CommonResult<Boolean> deleteProductProduceLine(@RequestParam("id") Long id) {
  68 + produceLineService.deleteProductProduceLine(id);
  69 + return success(true);
  70 + }
  71 +
  72 + @GetMapping("/get")
  73 + @Operation(summary = "获得生产入库单行")
  74 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  75 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  76 + public CommonResult<MesWmProductProduceLineRespVO> getProductProduceLine(@RequestParam("id") Long id) {
  77 + MesWmProductProduceLineDO line = produceLineService.getProductProduceLine(id);
  78 + if (line == null) {
  79 + return success(null);
  80 + }
  81 + return success(buildRespVOList(Collections.singletonList(line)).get(0));
  82 + }
  83 +
  84 + @GetMapping("/page")
  85 + @Operation(summary = "获得生产入库单行分页")
  86 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  87 + public CommonResult<PageResult<MesWmProductProduceLineRespVO>> getProductProduceLinePage(
  88 + @Valid MesWmProductProduceLinePageReqVO pageReqVO) {
  89 + PageResult<MesWmProductProduceLineDO> pageResult = produceLineService.getProductProduceLinePage(pageReqVO);
  90 + return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
  91 + }
  92 +
  93 + @GetMapping("/list-by-produce")
  94 + @Operation(summary = "获得生产入库单行列表（按入库单编号）")
  95 + @Parameter(name = "produceId", description = "入库单编号", required = true, example = "1024")
  96 + @PreAuthorize("@ss.hasPermission('mes:wm-product-produce:query')")
  97 + public CommonResult<List<MesWmProductProduceLineRespVO>> getProductProduceLineListByProduceId(
  98 + @RequestParam("produceId") Long produceId) {
  99 + List<MesWmProductProduceLineDO> list = produceLineService.getProductProduceLineListByProduceId(produceId);
  100 + return success(buildRespVOList(list));
  101 + }
  102 +
  103 + // ==================== 拼接 VO ====================
  104 +
  105 + private List<MesWmProductProduceLineRespVO> buildRespVOList(List<MesWmProductProduceLineDO> list) {
  106 + if (CollUtil.isEmpty(list)) {
  107 + return Collections.emptyList();
  108 + }
  109 + // 1. 获得关联数据
  110 + Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
  111 + convertSet(list, MesWmProductProduceLineDO::getItemId));
  112 + Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
  113 + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
  114 + // 2. 构建结果
  115 + return BeanUtils.toBean(list, MesWmProductProduceLineRespVO.class, vo -> {
  116 + MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
  117 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
  118 + MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
  119 + unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
  120 + });
  121 + });
  122 + }
  123 +
  124 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/MesWmProductProducePageReqVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +import java.time.LocalDateTime;
  10 +
  11 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  12 +
  13 +@Schema(description = "管理后台 - MES 生产入库单分页 Request VO")
  14 +@Data
  15 +@EqualsAndHashCode(callSuper = true)
  16 +public class MesWmProductProducePageReqVO extends PageParam {
  17 +
  18 + @Schema(description = "生产工单ID", example = "1")
  19 + private Long workOrderId;
  20 +
  21 + @Schema(description = "工作站ID", example = "1")
  22 + private Long workstationId;
  23 +
  24 + @Schema(description = "工序ID", example = "1")
  25 + private Long processId;
  26 +
  27 + @Schema(description = "状态", example = "10")
  28 + private Integer status;
  29 +
  30 + @Schema(description = "入库日期范围")
  31 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  32 + private LocalDateTime[] produceDate;
  33 +
  34 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/MesWmProductProduceRespVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "管理后台 - MES 生产入库单 Response VO")
  9 +@Data
  10 +public class MesWmProductProduceRespVO {
  11 +
  12 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  13 + private Long id;
  14 +
  15 + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  16 + private Long workOrderId;
  17 +
  18 + @Schema(description = "生产工单编号", example = "WO20250226001")
  19 + private String workOrderCode;
  20 +
  21 + @Schema(description = "报工单 ID", example = "1")
  22 + private Long feedbackId;
  23 +
  24 + @Schema(description = "生产任务 ID", example = "1")
  25 + private Long taskId;
  26 +
  27 + @Schema(description = "生产任务编号", example = "TASK20250226001")
  28 + private String taskCode;
  29 +
  30 + @Schema(description = "工作站 ID", example = "1")
  31 + private Long workstationId;
  32 +
  33 + @Schema(description = "工作站名称", example = "装配工作站")
  34 + private String workstationName;
  35 +
  36 + @Schema(description = "工序 ID", example = "1")
  37 + private Long processId;
  38 +
  39 + @Schema(description = "工序名称", example = "组装工序")
  40 + private String processName;
  41 +
  42 + @Schema(description = "入库日期")
  43 + private LocalDateTime produceDate;
  44 +
  45 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  46 + private Integer status;
  47 +
  48 + @Schema(description = "备注", example = "备注")
  49 + private String remark;
  50 +
  51 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  52 + private LocalDateTime createTime;
  53 +
  54 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/MesWmProductProduceSaveReqVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.NotNull;
  5 +import lombok.Data;
  6 +
  7 +import java.time.LocalDateTime;
  8 +
  9 +@Schema(description = "管理后台 - MES 生产入库单新增/修改 Request VO")
  10 +@Data
  11 +public class MesWmProductProduceSaveReqVO {
  12 +
  13 + @Schema(description = "编号", example = "1024")
  14 + private Long id;
  15 +
  16 + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  17 + @NotNull(message = "生产工单 ID 不能为空")
  18 + private Long workOrderId;
  19 +
  20 + @Schema(description = "报工单 ID", example = "1")
  21 + private Long feedbackId;
  22 +
  23 + @Schema(description = "生产任务 ID", example = "1")
  24 + private Long taskId;
  25 +
  26 + @Schema(description = "工作站 ID", example = "1")
  27 + private Long workstationId;
  28 +
  29 + @Schema(description = "工序 ID", example = "1")
  30 + private Long processId;
  31 +
  32 + @Schema(description = "入库日期")
  33 + private LocalDateTime produceDate;
  34 +
  35 + @Schema(description = "备注", example = "备注")
  36 + private String remark;
  37 +
  38 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/detail/MesWmProductProduceDetailRespVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.math.BigDecimal;
  7 +import java.time.LocalDateTime;
  8 +
  9 +@Schema(description = "管理后台 - MES 生产入库明细 Response VO")
  10 +@Data
  11 +public class MesWmProductProduceDetailRespVO {
  12 +
  13 + @Schema(description = "编号", example = "1")
  14 + private Long id;
  15 +
  16 + @Schema(description = "入库单编号", example = "1")
  17 + private Long produceId;
  18 +
  19 + @Schema(description = "行编号", example = "1")
  20 + private Long lineId;
  21 +
  22 + @Schema(description = "物料编号", example = "1")
  23 + private Long itemId;
  24 +
  25 + @Schema(description = "物料编码", example = "ITEM001")
  26 + private String itemCode;
  27 +
  28 + @Schema(description = "物料名称", example = "螺丝")
  29 + private String itemName;
  30 +
  31 + @Schema(description = "规格型号", example = "M8*20")
  32 + private String specification;
  33 +
  34 + @Schema(description = "计量单位名称", example = "个")
  35 + private String unitMeasureName;
  36 +
  37 + @Schema(description = "入库数量", example = "300.00")
  38 + private BigDecimal quantity;
  39 +
  40 + @Schema(description = "批次编号", example = "1")
  41 + private Long batchId;
  42 +
  43 + @Schema(description = "批次号", example = "BATCH20260101001")
  44 + private String batchCode;
  45 +
  46 + @Schema(description = "仓库编号", example = "1")
  47 + private Long warehouseId;
  48 +
  49 + @Schema(description = "仓库名称", example = "成品仓库")
  50 + private String warehouseName;
  51 +
  52 + @Schema(description = "库区编号", example = "1")
  53 + private Long locationId;
  54 +
  55 + @Schema(description = "库区名称", example = "A区")
  56 + private String locationName;
  57 +
  58 + @Schema(description = "库位编号", example = "1")
  59 + private Long areaId;
  60 +
  61 + @Schema(description = "库位名称", example = "A01")
  62 + private String areaName;
  63 +
  64 + @Schema(description = "备注", example = "备注")
  65 + private String remark;
  66 +
  67 + @Schema(description = "创建时间")
  68 + private LocalDateTime createTime;
  69 +
  70 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/detail/MesWmProductProduceDetailSaveReqVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.NotNull;
  5 +import lombok.Data;
  6 +
  7 +import java.math.BigDecimal;
  8 +
  9 +@Schema(description = "管理后台 - MES 生产入库明细新增/修改 Request VO")
  10 +@Data
  11 +public class MesWmProductProduceDetailSaveReqVO {
  12 +
  13 + @Schema(description = "编号", example = "1024")
  14 + private Long id;
  15 +
  16 + @Schema(description = "入库单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  17 + @NotNull(message = "入库单行编号不能为空")
  18 + private Long lineId;
  19 +
  20 + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  21 + @NotNull(message = "入库单编号不能为空")
  22 + private Long produceId;
  23 +
  24 + @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  25 + @NotNull(message = "物料编号不能为空")
  26 + private Long itemId;
  27 +
  28 + @Schema(description = "入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
  29 + @NotNull(message = "入库数量不能为空")
  30 + private BigDecimal quantity;
  31 +
  32 + @Schema(description = "批次编号", example = "1")
  33 + private Long batchId;
  34 +
  35 + @Schema(description = "批次号", example = "BATCH20260101001")
  36 + private String batchCode;
  37 +
  38 + @Schema(description = "仓库编号", example = "1")
  39 + private Long warehouseId;
  40 +
  41 + @Schema(description = "库区编号", example = "1")
  42 + private Long locationId;
  43 +
  44 + @Schema(description = "库位编号", example = "1")
  45 + private Long areaId;
  46 +
  47 + @Schema(description = "备注", example = "备注")
  48 + private String remark;
  49 +
  50 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/line/MesWmProductProduceLinePageReqVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import jakarta.validation.constraints.NotNull;
  6 +import lombok.Data;
  7 +import lombok.EqualsAndHashCode;
  8 +import lombok.ToString;
  9 +
  10 +@Schema(description = "管理后台 - MES 生产入库单行分页 Request VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class MesWmProductProduceLinePageReqVO extends PageParam {
  15 +
  16 + @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  17 + @NotNull(message = "入库单编号不能为空")
  18 + private Long produceId;
  19 +
  20 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/line/MesWmProductProduceLineRespVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.math.BigDecimal;
  7 +import java.time.LocalDateTime;
  8 +
  9 +@Schema(description = "管理后台 - MES 生产入库单行 Response VO")
  10 +@Data
  11 +public class MesWmProductProduceLineRespVO {
  12 +
  13 + @Schema(description = "行ID", example = "1")
  14 + private Long id;
  15 +
  16 + @Schema(description = "入库单ID", example = "1")
  17 + private Long produceId;
  18 +
  19 + @Schema(description = "报工单 ID", example = "1")
  20 + private Long feedbackId;
  21 +
  22 + @Schema(description = "物料ID", example = "1")
  23 + private Long itemId;
  24 +
  25 + @Schema(description = "物料编码", example = "M001")
  26 + private String itemCode;
  27 +
  28 + @Schema(description = "物料名称", example = "钢板")
  29 + private String itemName;
  30 +
  31 + @Schema(description = "规格型号", example = "10mm*100mm")
  32 + private String specification;
  33 +
  34 + @Schema(description = "计量单位名称", example = "千克")
  35 + private String unitMeasureName;
  36 +
  37 + @Schema(description = "入库数量", example = "100.00")
  38 + private BigDecimal quantity;
  39 +
  40 + @Schema(description = "批次ID", example = "1")
  41 + private Long batchId;
  42 +
  43 + @Schema(description = "批次号", example = "BATCH20260101001")
  44 + private String batchCode;
  45 +
  46 + @Schema(description = "有效期")
  47 + private LocalDateTime expireDate;
  48 +
  49 + @Schema(description = "批号", example = "LOT001")
  50 + private String lotNumber;
  51 +
  52 + @Schema(description = "质检状态", example = "1")
  53 + private Integer qualityStatus;
  54 +
  55 + @Schema(description = "备注", example = "备注")
  56 + private String remark;
  57 +
  58 + @Schema(description = "创建时间")
  59 + private LocalDateTime createTime;
  60 +
  61 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productproduce/vo/line/MesWmProductProduceLineSaveReqVO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.DecimalMin;
  5 +import jakarta.validation.constraints.NotNull;
  6 +import lombok.Data;
  7 +
  8 +import java.math.BigDecimal;
  9 +import java.time.LocalDateTime;
  10 +
  11 +@Schema(description = "管理后台 - MES 生产入库单行 Save Request VO")
  12 +@Data
  13 +public class MesWmProductProduceLineSaveReqVO {
  14 +
  15 + @Schema(description = "行ID", example = "1")
  16 + private Long id;
  17 +
  18 + @Schema(description = "入库单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  19 + @NotNull(message = "入库单ID不能为空")
  20 + private Long produceId;
  21 +
  22 + @Schema(description = "报工单 ID", example = "1")
  23 + private Long feedbackId;
  24 +
  25 + @Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  26 + @NotNull(message = "物料ID不能为空")
  27 + private Long itemId;
  28 +
  29 + @Schema(description = "入库数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
  30 + @NotNull(message = "入库数量不能为空")
  31 + @DecimalMin(value = "0", inclusive = false, message = "入库数量必须大于 0")
  32 + private BigDecimal quantity;
  33 +
  34 + @Schema(description = "批次ID", example = "1")
  35 + private Long batchId;
  36 +
  37 + @Schema(description = "批次号", example = "BATCH20260101001")
  38 + private String batchCode;
  39 +
  40 + @Schema(description = "有效期")
  41 + private LocalDateTime expireDate;
  42 +
  43 + @Schema(description = "批号", example = "LOT001")
  44 + private String lotNumber;
  45 +
  46 + @Schema(description = "质检状态", example = "1")
  47 + private Integer qualityStatus;
  48 +
  49 + @Schema(description = "备注", example = "备注")
  50 + private String remark;
  51 +
  52 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productproduce/MesWmProductProduceDO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
  8 +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum;
  9 +import com.baomidou.mybatisplus.annotation.KeySequence;
  10 +import com.baomidou.mybatisplus.annotation.TableId;
  11 +import com.baomidou.mybatisplus.annotation.TableName;
  12 +import lombok.*;
  13 +
  14 +import java.time.LocalDateTime;
  15 +
  16 +/**
  17 + * MES 生产入库单 DO
  18 + *
  19 + * @author 芋道源码
  20 + */
  21 +@TableName("mes_wm_product_produce")
  22 +@KeySequence("mes_wm_product_produce_seq")
  23 +@Data
  24 +@EqualsAndHashCode(callSuper = true)
  25 +@ToString(callSuper = true)
  26 +@Builder
  27 +@NoArgsConstructor
  28 +@AllArgsConstructor
  29 +public class MesWmProductProduceDO extends BaseDO {
  30 +
  31 + /**
  32 + * 编号
  33 + */
  34 + @TableId
  35 + private Long id;
  36 + /**
  37 + * 生产工单 ID
  38 + *
  39 + * 关联 {@link MesProWorkOrderDO#getId()}
  40 + */
  41 + private Long workOrderId;
  42 + /**
  43 + * 报工记录 ID
  44 + *
  45 + * TODO @芋艿：关联 ProFeedback，待 ProFeedback 联调时补充
  46 + */
  47 + private Long feedbackId;
  48 + /**
  49 + * 生产任务 ID
  50 + *
  51 + * 关联 {@link MesProTaskDO#getId()}
  52 + */
  53 + private Long taskId;
  54 + // TODO @芋艿：workstationId、processId 哪些是必填字段；
  55 + /**
  56 + * 工作站 ID
  57 + *
  58 + * 关联 {@link MesMdWorkstationDO#getId()}
  59 + */
  60 + private Long workstationId;
  61 + /**
  62 + * 工序 ID
  63 + *
  64 + * 关联 {@link MesProProcessDO#getId()}
  65 + */
  66 + private Long processId;
  67 + /**
  68 + * 生产日期
  69 + */
  70 + private LocalDateTime produceDate;
  71 + /**
  72 + * 状态
  73 + *
  74 + * 枚举 {@link MesWmProductProduceStatusEnum}
  75 + */
  76 + private Integer status;
  77 + /**
  78 + * 备注
  79 + */
  80 + private String remark;
  81 +
  82 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productproduce/MesWmProductProduceDetailDO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
  8 +import com.baomidou.mybatisplus.annotation.KeySequence;
  9 +import com.baomidou.mybatisplus.annotation.TableId;
  10 +import com.baomidou.mybatisplus.annotation.TableName;
  11 +import lombok.*;
  12 +
  13 +import java.math.BigDecimal;
  14 +
  15 +/**
  16 + * MES 生产入库明细 DO
  17 + *
  18 + * @author 芋道源码
  19 + */
  20 +@TableName("mes_wm_product_produce_detail")
  21 +@KeySequence("mes_wm_product_produce_detail_seq")
  22 +@Data
  23 +@EqualsAndHashCode(callSuper = true)
  24 +@ToString(callSuper = true)
  25 +@Builder
  26 +@NoArgsConstructor
  27 +@AllArgsConstructor
  28 +public class MesWmProductProduceDetailDO extends BaseDO {
  29 +
  30 + /**
  31 + * 编号
  32 + */
  33 + @TableId
  34 + private Long id;
  35 + /**
  36 + * 入库单 ID
  37 + *
  38 + * 关联 {@link MesWmProductProduceDO#getId()}
  39 + */
  40 + private Long produceId;
  41 + /**
  42 + * 行 ID
  43 + *
  44 + * 关联 {@link MesWmProductProduceLineDO#getId()}
  45 + */
  46 + private Long lineId;
  47 + /**
  48 + * 物料 ID
  49 + *
  50 + * 关联 {@link MesMdItemDO#getId()}
  51 + */
  52 + private Long itemId;
  53 + /**
  54 + * 入库数量
  55 + */
  56 + private BigDecimal quantity;
  57 + /**
  58 + * 批次 ID
  59 + */
  60 + private Long batchId;
  61 + /**
  62 + * 批次号
  63 + */
  64 + private String batchCode;
  65 + /**
  66 + * 仓库 ID
  67 + *
  68 + * 关联 {@link MesWmWarehouseDO#getId()}
  69 + */
  70 + private Long warehouseId;
  71 + /**
  72 + * 库区 ID
  73 + *
  74 + * 关联 {@link MesWmWarehouseLocationDO#getId()}
  75 + */
  76 + private Long locationId;
  77 + /**
  78 + * 库位 ID
  79 + *
  80 + * 关联 {@link MesWmWarehouseAreaDO#getId()}
  81 + */
  82 + private Long areaId;
  83 + /**
  84 + * 备注
  85 + */
  86 + private String remark;
  87 +
  88 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productproduce/MesWmProductProduceLineDO.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +import java.math.BigDecimal;
  11 +import java.time.LocalDateTime;
  12 +
  13 +/**
  14 + * MES 生产入库单行 DO
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +@TableName("mes_wm_product_produce_line")
  19 +@KeySequence("mes_wm_product_produce_line_seq")
  20 +@Data
  21 +@EqualsAndHashCode(callSuper = true)
  22 +@ToString(callSuper = true)
  23 +@Builder
  24 +@NoArgsConstructor
  25 +@AllArgsConstructor
  26 +public class MesWmProductProduceLineDO extends BaseDO {
  27 +
  28 + /**
  29 + * 编号
  30 + */
  31 + @TableId
  32 + private Long id;
  33 + /**
  34 + * 入库单 ID
  35 + *
  36 + * 关联 {@link MesWmProductProduceDO#getId()}
  37 + */
  38 + private Long produceId;
  39 + /**
  40 + * 报工记录 ID
  41 + *
  42 + * TODO @芋艿：关联 ProFeedback，待 ProFeedback 联调时补充
  43 + */
  44 + private Long feedbackId;
  45 + /**
  46 + * 物料 ID
  47 + *
  48 + * 关联 {@link MesMdItemDO#getId()}
  49 + */
  50 + private Long itemId;
  51 + /**
  52 + * 入库数量
  53 + */
  54 + private BigDecimal quantity;
  55 + /**
  56 + * 批次 ID
  57 + */
  58 + private Long batchId;
  59 + /**
  60 + * 批次号
  61 + */
  62 + private String batchCode;
  63 + /**
  64 + * 过期日期
  65 + */
  66 + private LocalDateTime expireDate;
  67 + /**
  68 + * 生产批号
  69 + */
  70 + private String lotNumber;
  71 + // TODO @AI：待定
  72 + /**
  73 + * 质量状态
  74 + *
  75 + * 0-待检, 1-合格, 2-不合格
  76 + * 字典类型 mes_wm_quality_status
  77 + */
  78 + private Integer qualityStatus;
  79 + /**
  80 + * 备注
  81 + */
  82 + private String remark;
  83 +
  84 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productproduce/MesWmProductProduceDetailMapper.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * MES 生产入库明细 Mapper
  11 + *
  12 + * @author 芋道源码
  13 + */
  14 +@Mapper
  15 +public interface MesWmProductProduceDetailMapper extends BaseMapperX<MesWmProductProduceDetailDO> {
  16 +
  17 + default List<MesWmProductProduceDetailDO> selectListByLineId(Long lineId) {
  18 + return selectList(MesWmProductProduceDetailDO::getLineId, lineId);
  19 + }
  20 +
  21 + default List<MesWmProductProduceDetailDO> selectListByProduceId(Long produceId) {
  22 + return selectList(MesWmProductProduceDetailDO::getProduceId, produceId);
  23 + }
  24 +
  25 + default void deleteByProduceId(Long produceId) {
  26 + delete(MesWmProductProduceDetailDO::getProduceId, produceId);
  27 + }
  28 +
  29 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productproduce/MesWmProductProduceLineMapper.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLinePageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * MES 生产入库单行 Mapper
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +@Mapper
  18 +public interface MesWmProductProduceLineMapper extends BaseMapperX<MesWmProductProduceLineDO> {
  19 +
  20 + default PageResult<MesWmProductProduceLineDO> selectPage(MesWmProductProduceLinePageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductProduceLineDO>()
  22 + .eqIfPresent(MesWmProductProduceLineDO::getProduceId, reqVO.getProduceId())
  23 + .orderByDesc(MesWmProductProduceLineDO::getId));
  24 + }
  25 +
  26 + default List<MesWmProductProduceLineDO> selectListByProduceId(Long produceId) {
  27 + return selectList(MesWmProductProduceLineDO::getProduceId, produceId);
  28 + }
  29 +
  30 + default void deleteByProduceId(Long produceId) {
  31 + delete(MesWmProductProduceLineDO::getProduceId, produceId);
  32 + }
  33 +
  34 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productproduce/MesWmProductProduceMapper.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProducePageReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * MES 生产入库单 Mapper
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Mapper
  16 +public interface MesWmProductProduceMapper extends BaseMapperX<MesWmProductProduceDO> {
  17 +
  18 + default PageResult<MesWmProductProduceDO> selectPage(MesWmProductProducePageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<MesWmProductProduceDO>()
  20 + .eqIfPresent(MesWmProductProduceDO::getWorkOrderId, reqVO.getWorkOrderId())
  21 + .eqIfPresent(MesWmProductProduceDO::getWorkstationId, reqVO.getWorkstationId())
  22 + .eqIfPresent(MesWmProductProduceDO::getProcessId, reqVO.getProcessId())
  23 + .eqIfPresent(MesWmProductProduceDO::getStatus, reqVO.getStatus())
  24 + .betweenIfPresent(MesWmProductProduceDO::getProduceDate, reqVO.getProduceDate())
  25 + .orderByDesc(MesWmProductProduceDO::getId));
  26 + }
  27 +
  28 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java
  View file @305753a
... ... @@ -46,5 +46,7 @@ public interface DictTypeConstants {
46 46 String MES_PRO_FEEDBACK_CHANNEL = "mes_pro_feedback_channel"; // MES 生产报工途径
47 47 String MES_WM_ARRIVAL_NOTICE_STATUS = "mes_wm_arrival_notice_status"; // MES 到货通知单状态
48 48 String MES_WM_ITEM_RECEIPT_STATUS = "mes_wm_item_receipt_status"; // MES 采购入库单状态
  49 + String MES_WM_PRODUCT_PRODUCE_STATUS = "mes_product_produce_status"; // MES 生产入库单状态
  50 + String MES_WM_QUALITY_STATUS = "mes_wm_quality_status"; // MES 质量状态（待检/合格/不合格）
49 51  
50 52 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
  View file @305753a
... ... @@ -369,4 +369,13 @@ public interface ErrorCodeConstants {
369 369 ErrorCode WM_PRODUCTION_ISSUE_LINE_ITEM_NOT_IN_BOM = new ErrorCode(1_040_708_101, "当前物料不在生产工单的 BOM 物料清单中");
370 370 ErrorCode WM_PRODUCTION_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_708_200, "生产领料出库单明细不存在");
371 371  
  372 + // ========== MES 仓库管理-生产入库单（1-040-709-000） ==========
  373 + ErrorCode WM_PRODUCT_PRODUCE_NOT_EXISTS = new ErrorCode(1_040_709_000, "生产入库单不存在");
  374 + ErrorCode WM_PRODUCT_PRODUCE_STATUS_INVALID = new ErrorCode(1_040_709_001, "生产入库单状态不正确，无法执行该操作");
  375 + ErrorCode WM_PRODUCT_PRODUCE_NO_LINE = new ErrorCode(1_040_709_002, "生产入库单至少需要一条行数据");
  376 + ErrorCode WM_PRODUCT_PRODUCE_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_709_003, "生产入库单行数量与明细数量不一致");
  377 + ErrorCode WM_PRODUCT_PRODUCE_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_709_004, "生产入库单已完成或已取消，无法取消");
  378 + ErrorCode WM_PRODUCT_PRODUCE_LINE_NOT_EXISTS = new ErrorCode(1_040_709_100, "生产入库单行不存在");
  379 + ErrorCode WM_PRODUCT_PRODUCE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_709_200, "生产入库单明细不存在");
  380 +
372 381 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductProduceStatusEnum.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.enums.wm;
  2 +
  3 +import cn.iocoder.yudao.framework.common.core.ArrayValuable;
  4 +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
  5 +import lombok.AllArgsConstructor;
  6 +import lombok.Getter;
  7 +
  8 +import java.util.Arrays;
  9 +
  10 +/**
  11 + * MES 生产入库单状态枚举
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Getter
  16 +@AllArgsConstructor
  17 +public enum MesWmProductProduceStatusEnum implements ArrayValuable<Integer> {
  18 +
  19 + // TODO @AI：对应的方法；参考别的 MesWmProductionIssueStatusEnum
  20 + /**
  21 + * 草稿
  22 + */
  23 + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
  24 + /**
  25 + * 已完成
  26 + */
  27 + FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
  28 + /**
  29 + * 已取消
  30 + */
  31 + CANCELED(MesOrderStatusConstants.CANCELLED, "已取消");
  32 +
  33 + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmProductProduceStatusEnum::getStatus).toArray(Integer[]::new);
  34 +
  35 + /**
  36 + * 状态值
  37 + */
  38 + private final Integer status;
  39 + /**
  40 + * 状态名
  41 + */
  42 + private final String name;
  43 +
  44 + @Override
  45 + public Integer[] array() {
  46 + return ARRAYS;
  47 + }
  48 +
  49 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java
  View file @305753a
... ... @@ -6,7 +6,11 @@ import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskSaveRe
6 6 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
7 7 import jakarta.validation.Valid;
8 8  
  9 +import java.util.Collection;
9 10 import java.util.List;
  11 +import java.util.Map;
  12 +
  13 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
10 14  
11 15 /**
12 16 * MES 生产任务 Service 接口
... ... @@ -68,4 +72,22 @@ public interface MesProTaskService {
68 72 */
69 73 void validateTaskExists(Long id);
70 74  
  75 + /**
  76 + * 获得生产任务列表
  77 + *
  78 + * @param ids 编号列表
  79 + * @return 生产任务列表
  80 + */
  81 + List<MesProTaskDO> getTaskList(Collection<Long> ids);
  82 +
  83 + /**
  84 + * 获得生产任务 Map
  85 + *
  86 + * @param ids 编号列表
  87 + * @return 生产任务 Map
  88 + */
  89 + default Map<Long, MesProTaskDO> getTaskMap(Collection<Long> ids) {
  90 + return convertMap(getTaskList(ids), MesProTaskDO::getId);
  91 + }
  92 +
71 93 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
  View file @305753a
... ... @@ -10,6 +10,7 @@ import jakarta.annotation.Resource;
10 10 import org.springframework.stereotype.Service;
11 11 import org.springframework.validation.annotation.Validated;
12 12  
  13 +import java.util.Collection;
13 14 import java.util.List;
14 15  
15 16 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
... ... @@ -72,4 +73,9 @@ public class MesProTaskServiceImpl implements MesProTaskService {
72 73 }
73 74 }
74 75  
  76 + @Override
  77 + public List<MesProTaskDO> getTaskList(Collection<Long> ids) {
  78 + return taskMapper.selectBatchIds(ids);
  79 + }
  80 +
75 81 }
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceDetailService.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail.MesWmProductProduceDetailSaveReqVO;
  4 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
  5 +import jakarta.validation.Valid;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * MES 生产入库明细 Service 接口
  11 + */
  12 +public interface MesWmProductProduceDetailService {
  13 +
  14 + /**
  15 + * 创建生产入库明细
  16 + *
  17 + * @param createReqVO 创建信息
  18 + * @return 编号
  19 + */
  20 + Long createProductProduceDetail(@Valid MesWmProductProduceDetailSaveReqVO createReqVO);
  21 +
  22 + /**
  23 + * 更新生产入库明细
  24 + *
  25 + * @param updateReqVO 更新信息
  26 + */
  27 + void updateProductProduceDetail(@Valid MesWmProductProduceDetailSaveReqVO updateReqVO);
  28 +
  29 + /**
  30 + * 删除生产入库明细
  31 + *
  32 + * @param id 编号
  33 + */
  34 + void deleteProductProduceDetail(Long id);
  35 +
  36 + /**
  37 + * 获得生产入库明细
  38 + *
  39 + * @param id 编号
  40 + * @return 生产入库明细
  41 + */
  42 + MesWmProductProduceDetailDO getProductProduceDetail(Long id);
  43 +
  44 + /**
  45 + * 根据行ID获取明细列表
  46 + *
  47 + * @param lineId 行ID
  48 + * @return 明细列表
  49 + */
  50 + List<MesWmProductProduceDetailDO> getProductProduceDetailListByLineId(Long lineId);
  51 +
  52 + /**
  53 + * 根据入库单ID获取明细列表
  54 + *
  55 + * @param produceId 入库单ID
  56 + * @return 明细列表
  57 + */
  58 + List<MesWmProductProduceDetailDO> getProductProduceDetailListByProduceId(Long produceId);
  59 +
  60 + /**
  61 + * 根据入库单ID删除明细
  62 + *
  63 + * @param produceId 入库单ID
  64 + */
  65 + void deleteProductProduceDetailByProduceId(Long produceId);
  66 +
  67 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceDetailServiceImpl.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.detail.MesWmProductProduceDetailSaveReqVO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
  6 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceDetailMapper;
  7 +import jakarta.annotation.Resource;
  8 +import org.springframework.context.annotation.Lazy;
  9 +import org.springframework.stereotype.Service;
  10 +import org.springframework.validation.annotation.Validated;
  11 +
  12 +import java.util.List;
  13 +
  14 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  15 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_PRODUCE_DETAIL_NOT_EXISTS;
  16 +
  17 +/**
  18 + * MES 生产入库明细 Service 实现类
  19 + */
  20 +@Service
  21 +@Validated
  22 +public class MesWmProductProduceDetailServiceImpl implements MesWmProductProduceDetailService {
  23 +
  24 + @Resource
  25 + private MesWmProductProduceDetailMapper produceDetailMapper;
  26 +
  27 + @Resource
  28 + @Lazy
  29 + private MesWmProductProduceLineService produceLineService;
  30 +
  31 + @Override
  32 + public Long createProductProduceDetail(MesWmProductProduceDetailSaveReqVO createReqVO) {
  33 + // 校验父数据存在
  34 + produceLineService.validateProductProduceLineExists(createReqVO.getLineId());
  35 +
  36 + // 插入
  37 + MesWmProductProduceDetailDO detail = BeanUtils.toBean(createReqVO, MesWmProductProduceDetailDO.class);
  38 + produceDetailMapper.insert(detail);
  39 + return detail.getId();
  40 + }
  41 +
  42 + @Override
  43 + public void updateProductProduceDetail(MesWmProductProduceDetailSaveReqVO updateReqVO) {
  44 + // 校验存在
  45 + validateProductProduceDetailExists(updateReqVO.getId());
  46 + // 校验父数据存在
  47 + produceLineService.validateProductProduceLineExists(updateReqVO.getLineId());
  48 +
  49 + // 更新
  50 + MesWmProductProduceDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductProduceDetailDO.class);
  51 + produceDetailMapper.updateById(updateObj);
  52 + }
  53 +
  54 + @Override
  55 + public void deleteProductProduceDetail(Long id) {
  56 + // 校验存在
  57 + validateProductProduceDetailExists(id);
  58 + // 删除
  59 + produceDetailMapper.deleteById(id);
  60 + }
  61 +
  62 + @Override
  63 + public MesWmProductProduceDetailDO getProductProduceDetail(Long id) {
  64 + return produceDetailMapper.selectById(id);
  65 + }
  66 +
  67 + @Override
  68 + public List<MesWmProductProduceDetailDO> getProductProduceDetailListByLineId(Long lineId) {
  69 + return produceDetailMapper.selectListByLineId(lineId);
  70 + }
  71 +
  72 + @Override
  73 + public List<MesWmProductProduceDetailDO> getProductProduceDetailListByProduceId(Long produceId) {
  74 + return produceDetailMapper.selectListByProduceId(produceId);
  75 + }
  76 +
  77 + @Override
  78 + public void deleteProductProduceDetailByProduceId(Long produceId) {
  79 + produceDetailMapper.deleteByProduceId(produceId);
  80 + }
  81 +
  82 + private void validateProductProduceDetailExists(Long id) {
  83 + if (produceDetailMapper.selectById(id) == null) {
  84 + throw exception(WM_PRODUCT_PRODUCE_DETAIL_NOT_EXISTS);
  85 + }
  86 + }
  87 +
  88 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceLineService.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLinePageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLineSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
  7 +import jakarta.validation.Valid;
  8 +
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * MES 生产入库单行 Service 接口
  13 + */
  14 +public interface MesWmProductProduceLineService {
  15 +
  16 + /**
  17 + * 创建生产入库单行
  18 + *
  19 + * @param createReqVO 创建信息
  20 + * @return 编号
  21 + */
  22 + Long createProductProduceLine(@Valid MesWmProductProduceLineSaveReqVO createReqVO);
  23 +
  24 + /**
  25 + * 更新生产入库单行
  26 + *
  27 + * @param updateReqVO 更新信息
  28 + */
  29 + void updateProductProduceLine(@Valid MesWmProductProduceLineSaveReqVO updateReqVO);
  30 +
  31 + /**
  32 + * 删除生产入库单行
  33 + *
  34 + * @param id 编号
  35 + */
  36 + void deleteProductProduceLine(Long id);
  37 +
  38 + /**
  39 + * 获得生产入库单行
  40 + *
  41 + * @param id 编号
  42 + * @return 生产入库单行
  43 + */
  44 + MesWmProductProduceLineDO getProductProduceLine(Long id);
  45 +
  46 + /**
  47 + * 获得生产入库单行分页
  48 + *
  49 + * @param pageReqVO 分页查询
  50 + * @return 生产入库单行分页
  51 + */
  52 + PageResult<MesWmProductProduceLineDO> getProductProduceLinePage(MesWmProductProduceLinePageReqVO pageReqVO);
  53 +
  54 + /**
  55 + * 根据入库单ID获取行列表
  56 + *
  57 + * @param produceId 入库单ID
  58 + * @return 行列表
  59 + */
  60 + List<MesWmProductProduceLineDO> getProductProduceLineListByProduceId(Long produceId);
  61 +
  62 + /**
  63 + * 根据入库单ID删除行
  64 + *
  65 + * @param produceId 入库单ID
  66 + */
  67 + void deleteProductProduceLineByProduceId(Long produceId);
  68 +
  69 + /**
  70 + * 校验生产入库单行是否存在
  71 + *
  72 + * @param id 编号
  73 + * @return 生产入库单行
  74 + */
  75 + MesWmProductProduceLineDO validateProductProduceLineExists(Long id);
  76 +
  77 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceLineServiceImpl.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLinePageReqVO;
  6 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.line.MesWmProductProduceLineSaveReqVO;
  7 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
  8 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceLineMapper;
  9 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  10 +import jakarta.annotation.Resource;
  11 +import org.springframework.context.annotation.Lazy;
  12 +import org.springframework.stereotype.Service;
  13 +import org.springframework.validation.annotation.Validated;
  14 +
  15 +import java.util.List;
  16 +
  17 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  18 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_PRODUCT_PRODUCE_LINE_NOT_EXISTS;
  19 +
  20 +/**
  21 + * MES 生产入库单行 Service 实现类
  22 + */
  23 +@Service
  24 +@Validated
  25 +public class MesWmProductProduceLineServiceImpl implements MesWmProductProduceLineService {
  26 +
  27 + @Resource
  28 + private MesWmProductProduceLineMapper produceLineMapper;
  29 +
  30 + @Resource
  31 + @Lazy
  32 + private MesWmProductProduceService produceService;
  33 + @Resource
  34 + private MesMdItemService itemService;
  35 +
  36 + @Override
  37 + public Long createProductProduceLine(MesWmProductProduceLineSaveReqVO createReqVO) {
  38 + // 校验父数据存在
  39 + produceService.validateProductProduceExists(createReqVO.getProduceId());
  40 + // 校验物料存在
  41 + itemService.validateItemExists(createReqVO.getItemId());
  42 +
  43 + // 插入
  44 + MesWmProductProduceLineDO line = BeanUtils.toBean(createReqVO, MesWmProductProduceLineDO.class);
  45 + produceLineMapper.insert(line);
  46 + return line.getId();
  47 + }
  48 +
  49 + @Override
  50 + public void updateProductProduceLine(MesWmProductProduceLineSaveReqVO updateReqVO) {
  51 + // 校验存在
  52 + validateProductProduceLineExists(updateReqVO.getId());
  53 + // 校验父数据存在
  54 + produceService.validateProductProduceExists(updateReqVO.getProduceId());
  55 + // 校验物料存在
  56 + itemService.validateItemExists(updateReqVO.getItemId());
  57 +
  58 + // 更新
  59 + MesWmProductProduceLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductProduceLineDO.class);
  60 + produceLineMapper.updateById(updateObj);
  61 + }
  62 +
  63 + @Override
  64 + public void deleteProductProduceLine(Long id) {
  65 + // 校验存在
  66 + validateProductProduceLineExists(id);
  67 + // 删除
  68 + produceLineMapper.deleteById(id);
  69 + }
  70 +
  71 + @Override
  72 + public MesWmProductProduceLineDO getProductProduceLine(Long id) {
  73 + return produceLineMapper.selectById(id);
  74 + }
  75 +
  76 + @Override
  77 + public PageResult<MesWmProductProduceLineDO> getProductProduceLinePage(MesWmProductProduceLinePageReqVO pageReqVO) {
  78 + return produceLineMapper.selectPage(pageReqVO);
  79 + }
  80 +
  81 + @Override
  82 + public List<MesWmProductProduceLineDO> getProductProduceLineListByProduceId(Long produceId) {
  83 + return produceLineMapper.selectListByProduceId(produceId);
  84 + }
  85 +
  86 + @Override
  87 + public void deleteProductProduceLineByProduceId(Long produceId) {
  88 + produceLineMapper.deleteByProduceId(produceId);
  89 + }
  90 +
  91 + @Override
  92 + public MesWmProductProduceLineDO validateProductProduceLineExists(Long id) {
  93 + MesWmProductProduceLineDO line = produceLineMapper.selectById(id);
  94 + if (line == null) {
  95 + throw exception(WM_PRODUCT_PRODUCE_LINE_NOT_EXISTS);
  96 + }
  97 + return line;
  98 + }
  99 +
  100 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProducePageReqVO;
  5 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProduceSaveReqVO;
  6 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
  7 +import jakarta.validation.Valid;
  8 +
  9 +/**
  10 + * MES 生产入库单 Service 接口
  11 + */
  12 +public interface MesWmProductProduceService {
  13 +
  14 + /**
  15 + * 创建生产入库单
  16 + *
  17 + * @param createReqVO 创建信息
  18 + * @return 编号
  19 + */
  20 + Long createProductProduce(@Valid MesWmProductProduceSaveReqVO createReqVO);
  21 +
  22 + /**
  23 + * 修改生产入库单
  24 + *
  25 + * @param updateReqVO 修改信息
  26 + */
  27 + void updateProductProduce(@Valid MesWmProductProduceSaveReqVO updateReqVO);
  28 +
  29 + /**
  30 + * 删除生产入库单
  31 + *
  32 + * @param id 编号
  33 + */
  34 + void deleteProductProduce(Long id);
  35 +
  36 + /**
  37 + * 获得生产入库单
  38 + *
  39 + * @param id 编号
  40 + * @return 生产入库单
  41 + */
  42 + MesWmProductProduceDO getProductProduce(Long id);
  43 +
  44 + /**
  45 + * 获得生产入库单分页
  46 + *
  47 + * @param pageReqVO 分页参数
  48 + * @return 生产入库单分页
  49 + */
  50 + PageResult<MesWmProductProduceDO> getProductProducePage(MesWmProductProducePageReqVO pageReqVO);
  51 +
  52 + /**
  53 + * 校验生产入库单是否存在
  54 + *
  55 + * @param id 编号
  56 + * @return 生产入库单
  57 + */
  58 + MesWmProductProduceDO validateProductProduceExists(Long id);
  59 +
  60 + /**
  61 + * 完成生产入库单（草稿 → 已完成）
  62 + *
  63 + * @param id 编号
  64 + */
  65 + void finishProductProduce(Long id);
  66 +
  67 + /**
  68 + * 取消生产入库单（非已完成/已取消状态 → 已取消）
  69 + *
  70 + * @param id 编号
  71 + */
  72 + void cancelProductProduce(Long id);
  73 +
  74 + /**
  75 + * 校验生产入库单的数量：每行明细数量之和是否等于行入库数量
  76 + *
  77 + * @param id 编号
  78 + * @return 是否全部一致
  79 + */
  80 + Boolean checkProductProduceQuantity(Long id);
  81 +
  82 +}
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java 0 → 100644
  View file @305753a
  1 +package cn.iocoder.yudao.module.mes.service.wm.productproduce;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjUtil;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  8 +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
  9 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProducePageReqVO;
  10 +import cn.iocoder.yudao.module.mes.controller.admin.wm.productproduce.vo.MesWmProductProduceSaveReqVO;
  11 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
  12 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
  13 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
  14 +import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper;
  15 +import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum;
  16 +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
  17 +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
  18 +import jakarta.annotation.Resource;
  19 +import org.springframework.stereotype.Service;
  20 +import org.springframework.transaction.annotation.Transactional;
  21 +import org.springframework.validation.annotation.Validated;
  22 +
  23 +import java.math.BigDecimal;
  24 +import java.util.List;
  25 +
  26 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  27 +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
  28 +
  29 +/**
  30 + * MES 生产入库单 Service 实现类
  31 + */
  32 +@Service
  33 +@Validated
  34 +public class MesWmProductProduceServiceImpl implements MesWmProductProduceService {
  35 +
  36 + @Resource
  37 + private MesWmProductProduceMapper produceMapper;
  38 +
  39 + @Resource
  40 + private MesWmProductProduceLineService produceLineService;
  41 + @Resource
  42 + private MesWmProductProduceDetailService produceDetailService;
  43 + @Resource
  44 + private MesMdWorkstationService workstationService;
  45 + @Resource
  46 + private MesProWorkOrderService workOrderService;
  47 +
  48 + @Override
  49 + @Transactional(rollbackFor = Exception.class)
  50 + public Long createProductProduce(MesWmProductProduceSaveReqVO createReqVO) {
  51 + // 1. 校验关联数据
  52 + if (createReqVO.getWorkOrderId() != null) {
  53 + workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
  54 + }
  55 + if (createReqVO.getWorkstationId() != null) {
  56 + workstationService.validateWorkstationExists(createReqVO.getWorkstationId());
  57 + }
  58 +
  59 + // 2. 插入主表
  60 + MesWmProductProduceDO produce = BeanUtils.toBean(createReqVO, MesWmProductProduceDO.class);
  61 + produce.setStatus(MesWmProductProduceStatusEnum.PREPARE.getStatus());
  62 + produceMapper.insert(produce);
  63 + return produce.getId();
  64 + }
  65 +
  66 + @Override
  67 + @Transactional(rollbackFor = Exception.class)
  68 + public void updateProductProduce(MesWmProductProduceSaveReqVO updateReqVO) {
  69 + // 1.1 校验存在 + 准备中状态
  70 + validateProductProduceExistsAndPrepare(updateReqVO.getId());
  71 + // 1.2 校验关联数据
  72 + if (updateReqVO.getWorkOrderId() != null) {
  73 + workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId());
  74 + }
  75 + if (updateReqVO.getWorkstationId() != null) {
  76 + workstationService.validateWorkstationExists(updateReqVO.getWorkstationId());
  77 + }
  78 +
  79 + // 2. 更新主表
  80 + MesWmProductProduceDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductProduceDO.class);
  81 + produceMapper.updateById(updateObj);
  82 + }
  83 +
  84 + @Override
  85 + @Transactional(rollbackFor = Exception.class)
  86 + public void deleteProductProduce(Long id) {
  87 + // 1. 校验存在 + 准备中状态
  88 + validateProductProduceExistsAndPrepare(id);
  89 +
  90 + // 2.1 级联删除明细
  91 + produceDetailService.deleteProductProduceDetailByProduceId(id);
  92 + // 2.2 级联删除行
  93 + produceLineService.deleteProductProduceLineByProduceId(id);
  94 + // 2.3 删除主表
  95 + produceMapper.deleteById(id);
  96 + }
  97 +
  98 + @Override
  99 + public MesWmProductProduceDO getProductProduce(Long id) {
  100 + return produceMapper.selectById(id);
  101 + }
  102 +
  103 + @Override
  104 + public PageResult<MesWmProductProduceDO> getProductProducePage(MesWmProductProducePageReqVO pageReqVO) {
  105 + return produceMapper.selectPage(pageReqVO);
  106 + }
  107 +
  108 + @Override
  109 + @Transactional(rollbackFor = Exception.class)
  110 + public void finishProductProduce(Long id) {
  111 + // 1. 校验存在 + 草稿状态
  112 + validateProductProduceExistsAndPrepare(id);
  113 +
  114 + // 2. 校验至少有一条行
  115 + List<MesWmProductProduceLineDO> lines = produceLineService.getProductProduceLineListByProduceId(id);
  116 + if (CollUtil.isEmpty(lines)) {
  117 + throw exception(WM_PRODUCT_PRODUCE_NO_LINE);
  118 + }
  119 +
  120 + // 3. 校验每行明细数量之和等于行数量
  121 + for (MesWmProductProduceLineDO line : lines) {
  122 + List<MesWmProductProduceDetailDO> details = produceDetailService.getProductProduceDetailListByLineId(line.getId());
  123 + BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
  124 + MesWmProductProduceDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
  125 + if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) {
  126 + throw exception(WM_PRODUCT_PRODUCE_DETAIL_QUANTITY_MISMATCH);
  127 + }
  128 + }
  129 +
  130 + // TODO @芋艿：完成入库时更新库存（对齐 ktg-mes 的 storageCoreService.processProductProduce），待库存事务模块就绪后实现
  131 +
  132 + // 4. 更新入库单状态
  133 + produceMapper.updateById(new MesWmProductProduceDO()
  134 + .setId(id).setStatus(MesWmProductProduceStatusEnum.FINISHED.getStatus()));
  135 + }
  136 +
  137 + @Override
  138 + @Transactional(rollbackFor = Exception.class)
  139 + public void cancelProductProduce(Long id) {
  140 + // 校验存在
  141 + MesWmProductProduceDO produce = validateProductProduceExists(id);
  142 + // 已完成和已取消不允许取消
  143 + if (ObjectUtils.equalsAny(produce.getStatus(),
  144 + MesWmProductProduceStatusEnum.FINISHED.getStatus(),
  145 + MesWmProductProduceStatusEnum.CANCELED.getStatus())) {
  146 + throw exception(WM_PRODUCT_PRODUCE_CANCEL_NOT_ALLOWED);
  147 + }
  148 +
  149 + // 取消
  150 + produceMapper.updateById(new MesWmProductProduceDO()
  151 + .setId(id).setStatus(MesWmProductProduceStatusEnum.CANCELED.getStatus()));
  152 + }
  153 +
  154 + @Override
  155 + public Boolean checkProductProduceQuantity(Long id) {
  156 + List<MesWmProductProduceLineDO> lines = produceLineService.getProductProduceLineListByProduceId(id);
  157 + for (MesWmProductProduceLineDO line : lines) {
  158 + List<MesWmProductProduceDetailDO> details = produceDetailService.getProductProduceDetailListByLineId(line.getId());
  159 + BigDecimal totalDetailQty = CollectionUtils.getSumValue(details,
  160 + MesWmProductProduceDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
  161 + if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) {
  162 + return false;
  163 + }
  164 + }
  165 + return true;
  166 + }
  167 +
  168 + @Override
  169 + public MesWmProductProduceDO validateProductProduceExists(Long id) {
  170 + MesWmProductProduceDO produce = produceMapper.selectById(id);
  171 + if (produce == null) {
  172 + throw exception(WM_PRODUCT_PRODUCE_NOT_EXISTS);
  173 + }
  174 + return produce;
  175 + }
  176 +
  177 + /**
  178 + * 校验生产入库单存在且为准备中状态
  179 + */
  180 + private MesWmProductProduceDO validateProductProduceExistsAndPrepare(Long id) {
  181 + MesWmProductProduceDO produce = validateProductProduceExists(id);
  182 + if (ObjUtil.notEqual(MesWmProductProduceStatusEnum.PREPARE.getStatus(), produce.getStatus())) {
  183 + throw exception(WM_PRODUCT_PRODUCE_STATUS_INVALID);
  184 + }
  185 + return produce;
  186 + }
  187 +
  188 +}
... ...