BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 746345aaa0c2f9968e4ac26abc580807c6b40e91

Authored by YunaiV
1 parent 5845ef52

✨ feat(mes): 添加工作站编码字段，移除单位编号字段并优化相关逻辑

Inline Side-by-side
Showing 4 changed files with 8 additions and 38 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
  View file @746345a
... ... @@ -12,14 +12,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskRespVO
12 12 import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskSaveReqVO;
13 13 import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
14 14 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
15   -import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
16 15 import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
17 16 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
18 17 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
19 18 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
20 19 import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
21 20 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
22   -import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
23 21 import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
24 22 import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
25 23 import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
... ... @@ -67,9 +65,6 @@ public class MesProTaskController {
67 65 private MesMdItemService itemService;
68 66  
69 67 @Resource
70   - private MesMdUnitMeasureService unitMeasureService;
71   -
72   - @Resource
73 68 private MesMdClientService clientService;
74 69  
75 70 @PostMapping("/create")
... ... @@ -154,30 +149,19 @@ public class MesProTaskController {
154 149 new java.util.ArrayList<>(convertSet(list, MesProTaskDO::getProcessId)));
155 150 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
156 151 convertSet(list, MesProTaskDO::getItemId));
157   - Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
158   - convertSet(list, MesProTaskDO::getUnitMeasureId));
159 152 Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
160 153 convertSet(list, MesProTaskDO::getClientId));
161   -
162 154 // 拼接 VO
163 155 return convertList(list, task -> {
164 156 MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
165   - findAndThen(workOrderMap, task.getWorkOrderId(), wo -> {
166   - vo.setWorkOrderCode(wo.getCode());
167   - vo.setWorkOrderName(wo.getName());
168   - vo.setRequestDate(wo.getRequestDate());
169   - });
  157 + findAndThen(workOrderMap, task.getWorkOrderId(), wo ->
  158 + vo.setWorkOrderCode(wo.getCode()).setWorkOrderName(wo.getName()).setRequestDate(wo.getRequestDate()));
170 159 findAndThen(workstationMap, task.getWorkstationId(), ws ->
171   - vo.setWorkstationName(ws.getName()));
  160 + vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName()));
172 161 findAndThen(processMap, task.getProcessId(), p ->
173 162 vo.setProcessName(p.getName()));
174   - findAndThen(itemMap, task.getItemId(), item -> {
175   - vo.setItemCode(item.getCode());
176   - vo.setItemName(item.getName());
177   - vo.setItemSpec(item.getSpecification());
178   - });
179   - findAndThen(unitMeasureMap, task.getUnitMeasureId(), um ->
180   - vo.setUnitMeasureName(um.getName()));
  163 + findAndThen(itemMap, task.getItemId(), item ->
  164 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
181 165 findAndThen(clientMap, task.getClientId(), c ->
182 166 vo.setClientName(c.getName()));
183 167 return vo;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskRespVO.java
  View file @746345a
... ... @@ -31,6 +31,9 @@ public class MesProTaskRespVO {
31 31 @Schema(description = "工作站编号", example = "1")
32 32 private Long workstationId;
33 33  
  34 + @Schema(description = "工作站编码", example = "WS-001")
  35 + private String workstationCode;
  36 +
34 37 @Schema(description = "工作站名称", example = "注塑工作站")
35 38 private String workstationName;
36 39  
... ... @@ -55,12 +58,6 @@ public class MesProTaskRespVO {
55 58 @Schema(description = "规格型号", example = "100x200mm")
56 59 private String itemSpec;
57 60  
58   - @Schema(description = "单位编号", example = "200")
59   - private Long unitMeasureId;
60   -
61   - @Schema(description = "单位名称", example = "个")
62   - private String unitMeasureName;
63   -
64 61 @Schema(description = "排产数量", example = "100.00")
65 62 private BigDecimal quantity;
66 63  
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskSaveReqVO.java
  View file @746345a
... ... @@ -43,10 +43,6 @@ public class MesProTaskSaveReqVO {
43 43 @NotNull(message = "产品不能为空")
44 44 private Long itemId;
45 45  
46   - @Schema(description = "单位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
47   - @NotNull(message = "单位不能为空")
48   - private Long unitMeasureId;
49   -
50 46 @Schema(description = "排产数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
51 47 @NotNull(message = "排产数量不能为空")
52 48 private BigDecimal quantity;
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/task/MesProTaskDO.java
  View file @746345a
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.pro.task;
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
5 5 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
6   -import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
7 6 import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
8 7 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
9 8 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
... ... @@ -75,12 +74,6 @@ public class MesProTaskDO extends BaseDO {
75 74 * 关联 {@link MesMdItemDO#getId()}
76 75 */
77 76 private Long itemId;
78   - /**
79   - * 单位编号
80   - *
81   - * 关联 {@link MesMdUnitMeasureDO#getId()}
82   - */
83   - private Long unitMeasureId;
84 77  
85 78 /**
86 79 * 排产数量
... ...