From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置

---
 src/main/java/com/ruoyi/production/service/impl/ProductProcessRouteItemServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessRouteItemServiceImpl.java
index 081ff3b..4d8df0f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessRouteItemServiceImpl.java
@@ -48,6 +48,7 @@
     private ProductionProductMainMapper productionProductMainMapper;
 
     private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+    private ProductionReportPersonMapper productionReportPersonMapper;
 
     private ProductWorkOrderMapper productWorkOrderMapper;
 
@@ -102,9 +103,14 @@
 //                            .eq(QualityInspect::getProductMainId, mainId));
                     salesLedgerProductionAccountingMapper.delete(new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
                             .eq(SalesLedgerProductionAccounting::getProductMainId, main.getId()));
+                    productionReportPersonMapper.delete(new LambdaQueryWrapper<ProductionReportPerson>()
+                            .eq(ProductionReportPerson::getProductMainId, main.getId()));
                 }
             }
             // 鏌ヨ璁㈠崟 + 鍒犻櫎鏍哥畻
+
+            // 娓呯悊鎺掍骇棰勭敓鎴愮殑璐ㄦ鍗�
+            productionProductMainService.cleanPreGeneratedQualityInspects(Collections.singletonList(workOrderId));
 
             // 鍒犻櫎鍏宠仈宸ュ崟
             productWorkOrderMapper.delete(new LambdaQueryWrapper<ProductWorkOrder>()
@@ -145,7 +151,7 @@
             productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
             productWorkOrder.setProductOrderId(productProcessRouteItem.getProductOrderId());
             productWorkOrder.setPlanQuantity(productOrder.getQuantity());
-            productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null,productProcess.getName(),productOrder.getNpsNo()));
+            productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(productProcess.getName(),productOrder.getNpsNo()));
             productWorkOrder.setStatus(1);
             productWorkOrderMapper.insert(productWorkOrder);
         }

--
Gitblit v1.9.3