From 551dd084b86b997816aa1eef5257d11377e87720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Sat, 23 Aug 2025 10:17:28 +0800
Subject: [PATCH] 11

---
 .../dromara/cailiaoshebei/controller/BusMrpBaseController.java | 1 +
 .../org/dromara/out/service/impl/OutMonthPlanServiceImpl.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java
index c8f328b2..191eafaa 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java
@@ -149,6 +149,7 @@ public class BusMrpBaseController extends BaseController {
     public R<List<BusBillofquantitiesVersions>> obtainTheVersion(Long projectId) {
         List<BusBillofquantitiesVersions> list = busBillofquantitiesVersionsService.list(Wrappers.<BusBillofquantitiesVersions>lambdaQuery()
             .eq(BusBillofquantitiesVersions::getProjectId, projectId)
+            .eq(BusBillofquantitiesVersions::getWorkOrderType, "3")
             .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus())
         );
         if (CollectionUtils.isEmpty(list)){
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java
index e9484653..692a7398 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java
@@ -262,6 +262,9 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
                     }
                 }
             }
+            for (BusProcurement busProcurement : busProcurements) {
+                busProcurement.setProjectId(req.getProjectId());
+            }
             //保存
             boolean b = busProcurementService.saveOrUpdateBatch(busProcurements);
 //            if (!b) {