fix: 报工详情返回工序详细信息、产品详细信息

gongchunyi

8 小时以前 0b4c9f2a37a825a84725cb66ecf04060831ac5d0

 src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java

@@ -93,6 +93,9 @@
    private ProductMaterialService productMaterialService;

    @Autowired
    private ProductBomService productBomService;

    @Autowired
    private TempFileMapper tempFileMapper;

    @Override
@@ -470,6 +473,7 @@
            throw new ServiceException("查询失败,未查询到生产订单信息");
        }
        dto.setNpsNo(productOrder.getNpsNo());
        dto.setStrength(productOrder.getStrength());

        /// 产品信息
        ProductMaterialSkuDto productMaterialSkuDto = productMaterialService.selectProductByProductMainId(productOrder.getId());
@@ -507,6 +511,11 @@
                ProductionProductRouteItemDto routeItemDto = new ProductionProductRouteItemDto();
                BeanUtils.copyProperties(routeItem, routeItemDto);

                //  工序名称/编号
                ProductProcess productProcess = productProcessService.getById(routeItem.getProcessId());
                routeItemDto.setProcessName(productProcess.getName());
                routeItemDto.setProcessNo(productProcess.getNo());

                //  查询工序参数
                List<ProductionProductRouteItemParam> paramList = productionProductRouteItemParamService.list(
                        new LambdaQueryWrapper<ProductionProductRouteItemParam>()
@@ -519,6 +528,10 @@
                            ProductMaterialSkuDto materialSkuDto = productMaterialService.selectProductByModelId(paramDto.getProductId());
                            productMaterialService.selectProductByModelId(paramDto.getProductId());
                            paramDto.setParamName(materialSkuDto.getProductName());
                            paramDto.setModel(materialSkuDto.getModel());
                            paramDto.setMaterialCode(materialSkuDto.getMaterialCode());
                            String strength = productBomService.strengthById(paramDto.getBomId());
                            paramDto.setStrength(strength);
                        }
                        return paramDto;
                    }).collect(Collectors.toList());
@@ -652,7 +665,7 @@
                    .eq(ProductionProductRouteItemParam::getProductionProductRouteItemId, routeItemId));

            List<ProductionProductRouteItemParamDto> paramDtoList = routeItemDto.getProductionProductRouteItemParamDtoList();
                if (paramDtoList != null && !paramDtoList.isEmpty()) {
            if (paramDtoList != null && !paramDtoList.isEmpty()) {
                for (ProductionProductRouteItemParamDto paramDto : paramDtoList) {
                    ProductionProductRouteItemParam paramEntity = new ProductionProductRouteItemParam();
                    BeanUtils.copyProperties(paramDto, paramEntity, "id");