From 3bdaa5708b94e64f813f70ede8ba0bbd1a3179ec Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 15:08:01 +0800
Subject: [PATCH] 成品检数据查询
---
src/main/java/com/ruoyi/production/service/impl/ProductionRecordServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..15c3392 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
@@ -226,7 +229,7 @@
throw new ServiceException("鎶ュ伐澶辫触,鐢熶骇璁㈠崟鏇存柊澶辫触");
}
- // 瀹屾垚鎶ュ伐涓昏〃-鎶曞叆琛�-浜у嚭琛ㄦ暟鎹�
+ // 瀹屾垚鎶ュ伐涓昏〃-浜у嚭琛�-浜у嚭鏄庣粏琛ㄦ暟鎹�
ProductionProductMain productionProductMain = new ProductionProductMain();
productionProductMain.setProductNo(productionProductMainService.generateProductNo());
productionProductMain.setProductOrderId(dto.getProductOrderId());
@@ -244,7 +247,7 @@
productionProductInput.setQuantity(dto.getQuantity());
result = productionProductInputService.save(productionProductInput);
if (!result) {
- throw new ServiceException("鎶ュ伐澶辫触,鐢熶骇鎶曞叆瀛樺偍澶辫触");
+ throw new ServiceException("鎶ュ伐澶辫触,鐢熶骇浜у嚭瀛樺偍澶辫触");
}
ProductionProductOutput productionProductOutput = new ProductionProductOutput();
@@ -470,6 +473,7 @@
throw new ServiceException("鏌ヨ澶辫触,鏈煡璇㈠埌鐢熶骇璁㈠崟淇℃伅");
}
dto.setNpsNo(productOrder.getNpsNo());
+ dto.setStrength(productOrder.getStrength());
/// 浜у搧淇℃伅
ProductMaterialSkuDto productMaterialSkuDto = productMaterialService.selectProductByProductMainId(productOrder.getId());
@@ -477,7 +481,7 @@
dto.setMaterialCode(productMaterialSkuDto.getMaterialCode());
dto.setModel(productMaterialSkuDto.getModel());
- // 鏌ヨ鎶曞叆琛紙鑾峰彇浜у搧ID鍜屾姇鍏ユ暟閲忥級
+ // 鏌ヨ鎬荤殑浜у嚭鏁伴噺(杩欓噷鎶婃姇鍏ヨ〃寮勬垚浜嗕骇鍑烘�昏〃)
ProductionProductInput input = productionProductInputService.getOne(
new LambdaQueryWrapper<ProductionProductInput>()
.eq(ProductionProductInput::getProductMainId, productMainId)
@@ -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