From e5b06241af0b53cf48d032ee1f94ab47eca24815 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:35:33 +0800
Subject: [PATCH] 1.取消生产报工记录添加上生产时间字段
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 181 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 153 insertions(+), 28 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 efa13d3..31a1e9c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -1,17 +1,31 @@
package com.ruoyi.production.service.impl;
+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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
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.ProductProcessRouteItem;
-import com.ruoyi.production.pojo.ProductionProductMain;
-import com.ruoyi.production.pojo.ProductionProductOutput;
+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;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityTestStandard;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,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;
@@ -28,18 +43,36 @@
public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService {
private ProductionProductMainMapper productionProductMainMapper;
-
+
private ProductWorkOrderController productWorkOrderController;
-
+
private ProductWorkOrderMapper productWorkOrderMapper;
-
+
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
-
+
private ProductionProductOutputMapper productionProductOutputMapper;
-
+
private ProcessRouteItemMapper processRouteItemMapper;
-
+
private ProductModelMapper productModelMapper;
+
+ private QualityInspectMapper qualityInspectMapper;
+
+ private ProductProcessMapper productProcessMapper;
+
+ private ProductMapper productMapper;
+
+ private QualityTestStandardMapper qualityTestStandardMapper;
+
+ private QualityInspectParamMapper qualityInspectParamMapper;
+
+ private ProductStructureMapper productStructureMapper;
+
+ private ProductionProductInputMapper productionProductInputMapper;
+
+ private ProductOrderMapper productOrderMapper;
+
+ private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
@Override
@@ -54,24 +87,9 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
- // 鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
- if (dto.getId() != null) {
- // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
- QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
- outputWrapper.eq("product_main_id", dto.getId());
+ SysUser user = SecurityUtils.getLoginUser().getUser();
- ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
- if (output == null) {
- throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
- }
- // 鍙洿鏂版暟閲�
- if (dto.getQuantity() != null) {
- output.setQuantity(dto.getQuantity());
- productionProductOutputMapper.updateById(output);
- }
- return true;
- }
// 鏂板閫昏緫
ProductionProductMain productionProductMain = new ProductionProductMain();
@@ -86,7 +104,6 @@
queryWrapper.select("MAX(product_no) as maxNo")
.likeRight("product_no", datePrefix);
- // 淇锛氬畨鍏ㄥ鐞嗗彲鑳戒负绌虹殑鏌ヨ缁撴灉
List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(queryWrapper);
int sequenceNumber = 1;
@@ -113,13 +130,66 @@
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);
// 娣诲姞鎶ュ伐涓昏〃
- productionProductMainMapper.insert(productionProductMain);
+ int insert = productionProductMainMapper.insert(productionProductMain);
+
+ //鏇存柊宸ュ崟
+ if (insert > 0) {
+ 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 ?
+ productModelMapper.selectById(productProcessRouteItem.getProductModelId()) : null;
+
+ if (productModel != null) {
+ Product product = productMapper.selectById(productModel.getProductId());
+ int inspectType = "缁勮".equals(productProcess.getName()) ? 2 : 1;
+
+ QualityInspect qualityInspect = new QualityInspect();
+ qualityInspect.setProductId(product.getId());
+ qualityInspect.setProductName(product.getProductName());
+ qualityInspect.setModel(productModel.getModel());
+ qualityInspect.setUnit(productModel.getUnit());
+ qualityInspect.setQuantity(dto.getQuantity());
+ qualityInspect.setProcess(productProcess.getName());
+ qualityInspect.setInspectState(0);
+ qualityInspect.setInspectType(inspectType);
+ qualityInspect.setProductMainId(productionProductMain.getId());
+ qualityInspectMapper.insert(qualityInspect);
+
+ qualityTestStandardMapper.selectList(
+ new LambdaQueryWrapper<QualityTestStandard>()
+ .eq(QualityTestStandard::getProductId, product.getId())
+ ).forEach(standard -> {
+ QualityInspectParam param = new QualityInspectParam();
+ BeanUtils.copyProperties(standard, param);
+ param.setId(null);
+ param.setInspectId(qualityInspect.getId());
+ 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();
@@ -128,6 +198,61 @@
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;
}
+
+ @Override
+ @Transactional
+ public Boolean removeProductMain(ProductionProductMainDto dto) {
+ Long id = dto.getId();
+
+ // 鏇存柊宸ュ崟
+ productWorkOrderMapper.rollbackPlanQuantity(id);
+ // 鍒犻櫎璐ㄦ鍙傛暟鍜岃川妫�璁板綍
+ qualityInspectMapper.selectList(
+ new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getProductMainId, id)
+ ).forEach(q -> {
+ qualityInspectParamMapper.delete(
+ new LambdaQueryWrapper<QualityInspectParam>()
+ .eq(QualityInspectParam::getInspectId, q.getId()));
+ qualityInspectMapper.deleteById(q.getId());
+ });
+
+ // 鍒犻櫎浜у嚭璁板綍
+ productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
+ .eq(ProductionProductOutput::getProductMainId, id)
+ );
+
+ // 鍒犻櫎鍏宠仈鐨勬牳绠楁暟鎹�
+ salesLedgerProductionAccountingMapper.delete(
+ new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, id)
+ );
+
+ // 鍒犻櫎涓昏〃
+ return productionProductMainMapper.deleteById(id) > 0;
+ }
}
--
Gitblit v1.9.3