From 76640d343082d1473a482e7ba48461db9b26c035 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:36:57 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
index 9b5953b..886da11 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
@@ -90,7 +90,7 @@
             }
             String workOrderNoStr = "GD" + String.format("%s%03d", datePrefix, sequenceNumber);
             ProductionOperationTask productionOperationTask = new ProductionOperationTask();
-            productionOperationTask.setTechnologyRoutingOperationId(productionOrderRoutingOperation.getId());
+            productionOperationTask.setProductionOrderRoutingOperationId(productionOrderRoutingOperation.getId());
             productionOperationTask.setProductionOrderId(productionOrderRoutingOperation.getProductionOrderId());
             productionOperationTask.setPlanQuantity(BigDecimal.ZERO);
             productionOperationTask.setCompleteQuantity(BigDecimal.ZERO);
@@ -106,7 +106,7 @@
         try {
             ProductionOperationTask productionOperationTask = productionOperationTaskMapper.selectOne(
                     new LambdaQueryWrapper<ProductionOperationTask>()
-                            .eq(ProductionOperationTask::getTechnologyRoutingOperationId, id)
+                            .eq(ProductionOperationTask::getProductionOrderRoutingOperationId, id)
                             .last("limit 1"));
             if (productionOperationTask == null) {
                 throw new RuntimeException("鍒犻櫎澶辫触锛氭湭鎵惧埌鍏宠仈鐨勭敓浜у伐鍗�");
@@ -128,7 +128,7 @@
                 routingId = deleteItem.getOrderRoutingId();
             }
             productionOperationTaskMapper.delete(new LambdaQueryWrapper<ProductionOperationTask>()
-                    .eq(ProductionOperationTask::getTechnologyRoutingOperationId, id));
+                    .eq(ProductionOperationTask::getProductionOrderRoutingOperationId, id));
             productionOrderRoutingOperationMapper.deleteById(id);
             if (routingId != null) {
                 List<ProductionOrderRoutingOperation> operationList = productionOrderRoutingOperationMapper.selectList(

--
Gitblit v1.9.3