From f0f19fae3c310667b6732a3ac96df8e5d618fcff Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 15:15:37 +0800
Subject: [PATCH] 1.生产报工的成品未进入到入库记录中 2.仓储物流-入库来源保留合格自定义入库、生产报工-入库。出库来源只保留合格自定义出库
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 51 ++++++---------------------------------------------
1 files changed, 6 insertions(+), 45 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 d811177..d5281d4 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -9,13 +9,10 @@
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.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
@@ -25,12 +22,13 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.quality.mapper.*;
-import com.ruoyi.quality.pojo.*;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectParam;
+import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -170,45 +168,8 @@
if (productQty.compareTo(BigDecimal.ZERO) > 0) {
/*鏂板璐ㄦ*/
List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
- if (productProcessRouteItem.getIsQuality()) {
-// int inspectType = 1;
-// String process = productProcess.getName();//宸ュ簭
-// if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) {
-// //鏈�鍚庝竴閬撳伐搴忕敓鎴愬嚭鍘傛
-// inspectType = 2;
-// process = null;
-// }
-// Product product = productMapper.selectById(productModel.getProductId());
-// QualityInspect qualityInspect = new QualityInspect();
-// qualityInspect.setProductId(product.getId());
-// qualityInspect.setProductName(product.getProductName());
-// qualityInspect.setModel(productModel.getModel());
-// qualityInspect.setUnit(productModel.getUnit());
-// qualityInspect.setQuantity(productQty);
-// qualityInspect.setProcess(process);
-// qualityInspect.setInspectState(0);
-// qualityInspect.setInspectType(inspectType);
-// qualityInspect.setProductMainId(productionProductMain.getId());
-// qualityInspect.setProductModelId(productModel.getId());
-// qualityInspectMapper.insert(qualityInspect);
-// List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
-// if (qualityTestStandard.size() > 0) {
-// qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
-// qualityInspectMapper.updateById(qualityInspect);
-// qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
-// .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))//榛樿鑾峰彇鏈�鏂扮殑
-// .forEach(qualityTestStandardParam -> {
-// QualityInspectParam param = new QualityInspectParam();
-// BeanUtils.copyProperties(qualityTestStandardParam, param);
-// param.setId(null);
-// param.setInspectId(qualityInspect.getId());
-// qualityInspectParamMapper.insert(param);
-// });
-// }
- }else {
- //鐩存帴鍏ュ簱
- stockUtils.addStock(productProcessRouteItem.getProductModelId(), productQty, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId());
- }
+ //涓嶇鏄惁璐ㄦ閮界洿鎺ュ叆搴�
+ stockUtils.addStock(productProcessRouteItem.getProductModelId(), productQty, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId(),productModel.getProductId());
/*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(productQty));
@@ -315,7 +276,7 @@
new LambdaQueryWrapper<QualityInspectParam>()
.eq(QualityInspectParam::getInspectId, q.getId()));
qualityInspectMapper.deleteById(q.getId());
- stockUtils.deleteStockInRecord(q.getId(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode());
+ stockUtils.deleteStockInRecord(q.getId(), StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode());
});
// 鍒犻櫎浜у嚭璁板綍
--
Gitblit v1.9.3