From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 b3ddbb4..0296ef4 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -30,7 +30,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@@ -163,13 +163,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