From 1946aa0712f623dd5e0221ef2481bc3d8d224e74 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 一月 2026 17:21:32 +0800
Subject: [PATCH] 1.销售订单到质检的关联删除 2.报工撤回的数量更新
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 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 9472e1c..8e6aad1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +11,7 @@
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;
@@ -17,6 +19,7 @@
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;
@@ -31,6 +34,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,6 +70,10 @@
private ProductionProductInputMapper productionProductInputMapper;
+ private ProductOrderMapper productOrderMapper;
+
+ private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+
@Override
public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
@@ -79,6 +87,8 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+
if (dto.isReportWork()) {
// 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
@@ -89,10 +99,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;
}
@@ -136,7 +157,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);
@@ -146,12 +167,13 @@
//鏇存柊宸ュ崟
if (insert > 0) {
- UpdateWrapper<ProductWorkOrder> wrapper = new UpdateWrapper<>();
- wrapper.set("report_work", true)
- .set("quantity", dto.getQuantity())
- .set("product_main_id", productionProductMain.getId())
- .eq("id", dto.getWorkOrderId());
- productWorkOrderMapper.update(null, wrapper);
+ Map<String, Object> params = new HashMap<>();
+ params.put("quantity", dto.getQuantity());
+ params.put("productMainId", productionProductMain.getId());
+ params.put("workOrderId", dto.getWorkOrderId());
+ params.put("deductQuantity", dto.getQuantity());
+
+ productWorkOrderMapper.updatePlanQuantity(params);
}
ProductProcess productProcess = productProcessMapper.selectById(productProcessRouteItem.getProcessId());
ProductModel productModel = productProcessRouteItem.getProductModelId() != null ?
@@ -203,6 +225,28 @@
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;
}
@@ -211,6 +255,8 @@
public Boolean removeProductMain(ProductionProductMainDto dto) {
Long id = dto.getId();
+ // 鏇存柊宸ュ崟
+ productWorkOrderMapper.rollbackPlanQuantity(id);
// 鍒犻櫎璐ㄦ鍙傛暟鍜岃川妫�璁板綍
qualityInspectMapper.selectList(
new LambdaQueryWrapper<QualityInspect>()
@@ -227,6 +273,12 @@
.eq(ProductionProductOutput::getProductMainId, id)
);
+ // 鍒犻櫎鍏宠仈鐨勬牳绠楁暟鎹�
+ salesLedgerProductionAccountingMapper.delete(
+ new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, id)
+ );
+
// 鍒犻櫎涓昏〃
return productionProductMainMapper.deleteById(id) > 0;
}
--
Gitblit v1.9.3