Commit c1c9c8ba9a7b35825ea852956b42878ca1d8df7c

Authored by YunaiV
1 parent d2feaae7

✨ feat(mes): 更新退货检验单表单,修正名称并优化字段处理

yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
@@ -155,10 +155,8 @@ public class MesWmReturnIssueController { @@ -155,10 +155,8 @@ public class MesWmReturnIssueController {
155 convertSet(list, MesWmReturnIssueDO::getWorkOrderId)); 155 convertSet(list, MesWmReturnIssueDO::getWorkOrderId));
156 // 2. 构建结果 156 // 2. 构建结果
157 return BeanUtils.toBean(list, MesWmReturnIssueRespVO.class, vo -> { 157 return BeanUtils.toBean(list, MesWmReturnIssueRespVO.class, vo -> {
158 - // 2.1 填充工作站名称  
159 MapUtils.findAndThen(workstationMap, vo.getWorkstationId(), 158 MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
160 workstation -> vo.setWorkstationName(workstation.getName())); 159 workstation -> vo.setWorkstationName(workstation.getName()));
161 - // 2.2 填充工单编号  
162 MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), 160 MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
163 workOrder -> vo.setWorkOrderCode(workOrder.getCode())); 161 workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
164 }); 162 });
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
@@ -145,7 +145,6 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService { @@ -145,7 +145,6 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
145 boolean hasPendingQc = CollUtil.contains(lines, 145 boolean hasPendingQc = CollUtil.contains(lines,
146 line -> MesWmQualityStatusEnum.PENDING.getStatus().equals(line.getQualityStatus())); 146 line -> MesWmQualityStatusEnum.PENDING.getStatus().equals(line.getQualityStatus()));
147 // 2.1.2 确定目标状态:1)有待检验物料 → 待检验状态;2)无待检验物料 → 待上架状态 147 // 2.1.2 确定目标状态:1)有待检验物料 → 待检验状态;2)无待检验物料 → 待上架状态
148 - // TODO @芋艿:RQC 质量检测的接入  
149 Integer targetStatus = hasPendingQc ? MesWmReturnIssueStatusEnum.CONFIRMED.getStatus() 148 Integer targetStatus = hasPendingQc ? MesWmReturnIssueStatusEnum.CONFIRMED.getStatus()
150 : MesWmReturnIssueStatusEnum.APPROVING.getStatus(); 149 : MesWmReturnIssueStatusEnum.APPROVING.getStatus();
151 150