buhuazhen
2026-04-24 e8d0bdce89ae0937763736f75868a43bd8690985
feat(production): 增加报工用户names支持

- 在ProcessRouteAnticlockwiseDto中新增userNames属性
- 在ProductWorkOrder中新增userNames字段及其注解
- 修改ProcessRouteServiceImpl, 设置productWorkOrder的userNames属性
- 在ProductionPrintOrderServiceImpl中,调整工序逆时针Dto的userIds获取方式
- 新增设置userNames为报工用户姓名的字符串拼接
- 更新productModelId赋值来源,改为materialInfo的第一个元素id
已修改4个文件
16 ■■■■■ 文件已修改
src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
@@ -22,6 +22,7 @@
    //人员ids
    private String  userIds;
    private String  userNames;
    // 机台id
    private Long deviceId;
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -144,6 +144,9 @@
    @ApiModelProperty(value = "报工用户ids")
    private String userIds;
    @ApiModelProperty(value = "报工用户names")
    private String userNames;
    @ApiModelProperty("机台id")
    private Long deviceId;
}
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -233,6 +233,7 @@
            productWorkOrder.setPlanQuantity(order.getQuantity());
            productWorkOrder.setDeviceId(dto.getDeviceId());
            productWorkOrder.setUserIds(dto.getUserIds());
            productWorkOrder.setUserNames(dto.getUserNames());
            productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcess.getName(), byId.getNpsNo()));
            productWorkOrder.setStatus(1);
            productWorkOrderService.save(productWorkOrder);
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.dto.SimplePersonDto;
import com.ruoyi.production.dto.ProcessContentDto;
import com.ruoyi.production.dto.ProcessRouteAnticlockwiseDto;
import com.ruoyi.production.dto.ProductionPrintOrderDto;
import com.ruoyi.production.dto.SaveProductionPrintOrderDto;
import com.ruoyi.production.dto.*;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
import com.ruoyi.production.pojo.ProductOrder;
@@ -53,6 +50,7 @@
                processContentDto.setId(IdUtil.simpleUUID());
            }
        });
        MaterialInfoDto materialInfoDtoFirst = dto.getMaterialInfo().get(0);
        // 调用工序方增 函数
        List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos = processContentDtoList.stream().map(it -> {
            ProcessRouteAnticlockwiseDto pdto = new ProcessRouteAnticlockwiseDto();
@@ -62,8 +60,9 @@
            pdto.setProcessRouteNum(it.getProcessPositive());
            pdto.setProcessRouteAddNum(it.getProcessPositive());
//            pdto.setProcessRouteRequire(); 工艺要求
            pdto.setProductModelId(dto.getProductModelId());
            pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
            pdto.setProductModelId(materialInfoDtoFirst.getId());
            pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
            pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
            pdto.setDeviceId(it.getDeviceId());
            pdto.setUuid(it.getId());
            return pdto;