From 38159f6f72ec65aa12d78953e4c3e4d619351a09 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 18:05:41 +0800
Subject: [PATCH] 报工联动投入
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 26 +++++++++++++++++++-------
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 2 +-
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
index f2f4ef1..26594f6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -22,7 +22,7 @@
@ApiOperation("鏍规嵁productId鏌ヨ")
- @GetMapping("listByproductModelId/{productModelId}")
+ @GetMapping("/listByproductModelId/{productModelId}")
public R listByproductModelId( @PathVariable("productModelId") Long productModelId){
return R.ok(productStructureService.listByproductModelId( productModelId));
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index c333c78..9472e1c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.production.controller.ProductWorkOrderController;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
@@ -60,6 +61,10 @@
private QualityTestStandardMapper qualityTestStandardMapper;
private QualityInspectParamMapper qualityInspectParamMapper;
+
+ private ProductStructureMapper productStructureMapper;
+
+ private ProductionProductInputMapper productionProductInputMapper;
@Override
@@ -143,8 +148,8 @@
if (insert > 0) {
UpdateWrapper<ProductWorkOrder> wrapper = new UpdateWrapper<>();
wrapper.set("report_work", true)
- .set("quantity",dto.getQuantity())
- .set("product_main_id",productionProductMain.getId())
+ .set("quantity", dto.getQuantity())
+ .set("product_main_id", productionProductMain.getId())
.eq("id", dto.getWorkOrderId());
productWorkOrderMapper.update(null, wrapper);
}
@@ -179,10 +184,17 @@
qualityInspectParamMapper.insert(param);
});
}
-
-
-
-
+ // 娣诲姞鎶曞叆
+ if (productModel != null) {
+ List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModel.getId());
+ for (ProductStructureDto productStructureDto : productStructureDtos) {
+ ProductionProductInput productionProductInput = new ProductionProductInput();
+ productionProductInput.setProductModelId(productStructureDto.getProductModelId());
+ productionProductInput.setQuantity(productStructureDto.getUnitQuantity());
+ productionProductInput.setProductMainId(productionProductMain.getId());
+ productionProductInputMapper.insert(productionProductInput);
+ }
+ }
// 娣诲姞浜у嚭
ProductionProductOutput productionProductOutput = new ProductionProductOutput();
@@ -212,7 +224,7 @@
// 鍒犻櫎浜у嚭璁板綍
productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
- .eq(ProductionProductOutput::getProductMainId, id)
+ .eq(ProductionProductOutput::getProductMainId, id)
);
// 鍒犻櫎涓昏〃
--
Gitblit v1.9.3