From dc65f9d54db26c5655ebce137f0d5442508c79e5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 14:14:50 +0800
Subject: [PATCH] 报工提交生成过程检
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 29 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..f100c7f 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,27 @@
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.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.bean.BeanUtils;
import com.ruoyi.production.controller.ProductWorkOrderController;
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.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;
@@ -28,18 +38,28 @@
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;
@Override
@@ -54,24 +74,23 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
- // 鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
- if (dto.getId() != null) {
- // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
- QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
- outputWrapper.eq("product_main_id", dto.getId());
-
- ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
- if (output == null) {
- throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
- }
-
- // 鍙洿鏂版暟閲�
- if (dto.getQuantity() != null) {
- output.setQuantity(dto.getQuantity());
- productionProductOutputMapper.updateById(output);
- }
- return true;
- }
+// if (dto.isReportWork()) {
+// // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
+// QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
+// outputWrapper.eq("product_main_id", dto.getId());
+//
+// 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 +105,6 @@
queryWrapper.select("MAX(product_no) as maxNo")
.likeRight("product_no", datePrefix);
- // 淇锛氬畨鍏ㄥ鐞嗗彲鑳戒负绌虹殑鏌ヨ缁撴灉
List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(queryWrapper);
int sequenceNumber = 1;
@@ -119,8 +137,46 @@
productionProductMain.setStatus(0);
// 娣诲姞鎶ュ伐涓昏〃
- productionProductMainMapper.insert(productionProductMain);
+ int insert = productionProductMainMapper.insert(productionProductMain);
+ //鏇存柊宸ュ崟
+ if (insert > 0) {
+ UpdateWrapper<ProductWorkOrder> wrapper = new UpdateWrapper<>();
+ wrapper.set("report_work", true)
+ .set("quantity",dto.getQuantity())
+ .eq("id", dto.getWorkOrderId());
+ productWorkOrderMapper.update(null, wrapper);
+ }
+ 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);
+ 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);
+ });
+ }
// 娣诲姞浜у嚭
ProductionProductOutput productionProductOutput = new ProductionProductOutput();
productionProductOutput.setProductMainId(productionProductMain.getId());
--
Gitblit v1.9.3