From 52e4610b008f7643f84c5f37a110c081123caf69 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 08 一月 2026 09:29:01 +0800
Subject: [PATCH] 报工后新增/修改生产核算；删除报工后，删除关联的核算数据
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 deletions(-)
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..2664ea8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -10,12 +10,15 @@
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.utils.SecurityUtils;
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.*;
import com.ruoyi.production.service.ProductionProductMainService;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityInspectParamMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -61,6 +64,14 @@
private QualityInspectParamMapper qualityInspectParamMapper;
+ private ProductStructureMapper productStructureMapper;
+
+ private ProductionProductInputMapper productionProductInputMapper;
+
+ private ProductOrderMapper productOrderMapper;
+
+ private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+
@Override
public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
@@ -74,6 +85,8 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+
if (dto.isReportWork()) {
// 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
@@ -84,10 +97,21 @@
throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
}
+ // 鏌ヨ鐢熶骇鏍哥畻璁板綍
+ QueryWrapper<SalesLedgerProductionAccounting> accountingWrapper = new QueryWrapper<>();
+ accountingWrapper.eq("sales_ledger_work_id", dto.getProductMainId());
+ SalesLedgerProductionAccounting accounting = salesLedgerProductionAccountingMapper.selectOne(accountingWrapper);
+ if (accounting == null) {
+ throw new RuntimeException("鐢熶骇鏍哥畻璁板綍涓嶅瓨鍦�");
+ }
+
// 鍙洿鏂版暟閲�
if (dto.getQuantity() != null) {
output.setQuantity(dto.getQuantity());
productionProductOutputMapper.updateById(output);
+ // 鏇存柊鐢熶骇鏍哥畻璁板綍
+ accounting.setFinishedNum(dto.getQuantity());
+ salesLedgerProductionAccountingMapper.updateById(accounting);
}
return true;
}
@@ -131,7 +155,7 @@
String productNo = String.format("%s%03d", datePrefix, sequenceNumber);
productionProductMain.setProductNo(productNo);
- productionProductMain.setUserId(dto.getUserId());
+ productionProductMain.setUserId(user.getUserId());
productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId());
productionProductMain.setWorkOrderId(dto.getWorkOrderId());
productionProductMain.setStatus(0);
@@ -143,8 +167,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 +203,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();
@@ -190,6 +221,28 @@
productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
productionProductOutputMapper.insert(productionProductOutput);
+
+ // 鑾峰彇鐢熶骇璁㈠崟
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ if (productOrder == null) {
+ throw new RuntimeException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+ // 娣诲姞鐢熶骇鏍哥畻
+ SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
+ .salesLedgerWorkId(productionProductMain.getId())
+ .salesLedgerSchedulingId(0L)
+ .salesLedgerId(productOrder.getSalesLedgerId())
+ .salesLedgerProductId(productOrder.getProductModelId())
+ .schedulingUserId(user.getUserId())
+ .schedulingUserName(user.getNickName())
+ .finishedNum(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO)
+ .workHours(productProcess.getSalaryQuota())
+ .process(productProcess.getName())
+ .schedulingDate(LocalDate.now())
+ .tenantId(dto.getTenantId())
+ .build();
+ salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
return true;
}
@@ -212,9 +265,15 @@
// 鍒犻櫎浜у嚭璁板綍
productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
- .eq(ProductionProductOutput::getProductMainId, id)
+ .eq(ProductionProductOutput::getProductMainId, id)
);
+ // 鍒犻櫎鍏宠仈鐨勬牳绠楁暟鎹�
+ salesLedgerProductionAccountingMapper.delete(
+ new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, id)
+ );
+
// 鍒犻櫎涓昏〃
return productionProductMainMapper.deleteById(id) > 0;
}
--
Gitblit v1.9.3