From 746345aaa0c2f9968e4ac26abc580807c6b40e91 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 15 Mar 2026 22:04:27 +0800 Subject: [PATCH] ✨ feat(mes): 添加工作站编码字段，移除单位编号字段并优化相关逻辑 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 26 +++++--------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java | 9 +++------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java | 4 ---- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java | 7 ------- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java index 4b800e9..0ed42bb 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java @@ -12,14 +12,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskRespVO import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO; 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.md.workstation.MesMdWorkstationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService; 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.md.workstation.MesMdWorkstationService; import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService; import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService; @@ -67,9 +65,6 @@ public class MesProTaskController { private MesMdItemService itemService; @Resource - private MesMdUnitMeasureService unitMeasureService; - - @Resource private MesMdClientService clientService; @PostMapping("/create") @@ -154,30 +149,19 @@ public class MesProTaskController { new java.util.ArrayList<>(convertSet(list, MesProTaskDO::getProcessId))); Map itemMap = itemService.getItemMap( convertSet(list, MesProTaskDO::getItemId)); - Map unitMeasureMap = unitMeasureService.getUnitMeasureMap( - convertSet(list, MesProTaskDO::getUnitMeasureId)); Map clientMap = clientService.getClientMap( convertSet(list, MesProTaskDO::getClientId)); - // 拼接 VO return convertList(list, task -> { MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class); - findAndThen(workOrderMap, task.getWorkOrderId(), wo -> { - vo.setWorkOrderCode(wo.getCode()); - vo.setWorkOrderName(wo.getName()); - vo.setRequestDate(wo.getRequestDate()); - }); + findAndThen(workOrderMap, task.getWorkOrderId(), wo -> + vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setRequestDate(wo.getRequestDate())); findAndThen(workstationMap, task.getWorkstationId(), ws -> - vo.setWorkstationName(ws.getName())); + vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName())); findAndThen(processMap, task.getProcessId(), p -> vo.setProcessName(p.getName())); - findAndThen(itemMap, task.getItemId(), item -> { - vo.setItemCode(item.getCode()); - vo.setItemName(item.getName()); - vo.setItemSpec(item.getSpecification()); - }); - findAndThen(unitMeasureMap, task.getUnitMeasureId(), um -> - vo.setUnitMeasureName(um.getName())); + findAndThen(itemMap, task.getItemId(), item -> + vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification())); findAndThen(clientMap, task.getClientId(), c -> vo.setClientName(c.getName())); return vo; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java index da49826..743ece8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java @@ -31,6 +31,9 @@ public class MesProTaskRespVO { @Schema(description = "工作站编号", example = "1") private Long workstationId; + @Schema(description = "工作站编码", example = "WS-001") + private String workstationCode; + @Schema(description = "工作站名称", example = "注塑工作站") private String workstationName; @@ -55,12 +58,6 @@ public class MesProTaskRespVO { @Schema(description = "规格型号", example = "100x200mm") private String itemSpec; - @Schema(description = "单位编号", example = "200") - private Long unitMeasureId; - - @Schema(description = "单位名称", example = "个") - private String unitMeasureName; - @Schema(description = "排产数量", example = "100.00") private BigDecimal quantity; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java index d7a8cb5..a46402a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java @@ -43,10 +43,6 @@ public class MesProTaskSaveReqVO { @NotNull(message = "产品不能为空") private Long itemId; - @Schema(description = "单位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") - @NotNull(message = "单位不能为空") - private Long unitMeasureId; - @Schema(description = "排产数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") @NotNull(message = "排产数量不能为空") private BigDecimal quantity; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java index 95df901..1a14001 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.pro.task; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO; 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.md.workstation.MesMdWorkstationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO; @@ -75,12 +74,6 @@ public class MesProTaskDO extends BaseDO { * 关联 {@link MesMdItemDO#getId()} */ private Long itemId; - /** - * 单位编号 - * - * 关联 {@link MesMdUnitMeasureDO#getId()} - */ - private Long unitMeasureId; /** * 排产数量 -- libgit2 0.21.4