From 0b4c9f2a37a825a84725cb66ecf04060831ac5d0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 25 三月 2026 09:59:49 +0800
Subject: [PATCH] fix: 报工详情返回工序详细信息、产品详细信息
---
src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
index 0a0d5ff..3dc9f0a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java
+++ b/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");
--
Gitblit v1.9.3