From cb8ee71facb5520be75dcc9b77e245edc752650e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 13 五月 2026 15:00:12 +0800
Subject: [PATCH] fix:1.生产订单按照bom结构的单位需求数量更改 2.修改生产订单修改对应报工的数量
---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index 876d68e..c82886e 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -82,7 +81,7 @@
break;
case "鎶ュ簾":
stockUtils.addUnStock(qualityInspect.getProductModelId(), unqualified.getQuantity(),
- StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
+ StockInQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
break;
case "璁╂鏀捐":
stockUtils.addStock(qualityInspect.getProductModelId(), unqualified.getQuantity(),
@@ -96,7 +95,7 @@
switch (qualityUnqualified.getDealResult()) {
case "鎶ュ簾":
stockUtils.addUnStock(modelId, unqualified.getQuantity(),
- StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
+ StockInQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
break;
case "璁╂鏀捐":
stockUtils.addStock(modelId, unqualified.getQuantity(),
@@ -163,13 +162,13 @@
BeanUtils.copyProperties(sourceOperation, newOperation);
newOperation.setId(null);
newOperation.setProductionOrderId(newOrder.getId());
- newOperation.setTechnologyRoutingId(routingIdMap.get(sourceOperation.getTechnologyRoutingId()));
+ newOperation.setOrderRoutingId(routingIdMap.get(sourceOperation.getOrderRoutingId()));
newOperation.setCreateTime(null);
newOperation.setUpdateTime(null);
productionOrderRoutingOperationMapper.insert(newOperation);
ProductionOperationTask newTask = new ProductionOperationTask();
- newTask.setTechnologyRoutingOperationId(newOperation.getId());
+ newTask.setProductionOrderRoutingOperationId(newOperation.getId());
newTask.setProductionOrderId(newOrder.getId());
newTask.setPlanQuantity(newOrder.getQuantity());
newTask.setCompleteQuantity(BigDecimal.ZERO);
--
Gitblit v1.9.3