From 9ce3bbf11836ad8ee0caf4d25a860effdae9c2fa Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Tue, 2 Jun 2026 14:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E6=88=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/oa/controller/SysOaWarehouseController.java    | 2 --
 .../com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java   | 5 -----
 .../oa/service/impl/SysOaWarehouseMasterServiceImpl.java | 9 +--------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
index 8cc5e52..adbe18e 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
@@ -183,8 +183,6 @@ public class SysOaWarehouseController extends BaseController {
         });
         sysOaWarehouseMaster.setWarehouseList(list);
         sysOaWarehouseMaster.setMasterNum(UUID.randomUUID().toString());
-        // 导入入口跳过"必须关联采购需求"校验，后续可在采购需求处手动关联
-        sysOaWarehouseMaster.setSkipRequirementCheck(true);
         iSysOaWarehouseMasterService.insertByBo(sysOaWarehouseMaster);
         return R.ok(result.getAnalysis());
     }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
index 4075b69..39e0059 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java
@@ -83,11 +83,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
 
     private Long requirementId;
 
-    /**
-     * 导入场景跳过"必须关联采购需求"校验（仅 import 入口传 true）
-     */
-    private transient Boolean skipRequirementCheck;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
index 73666fc..d56b45d 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
@@ -171,14 +171,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
             add.setRemark("办公耗材自动写入");
         }
 
-        // 规则 2：入库（type=1）默认必须强关联采购需求（requirement_id）；
-        // 导入入口会显式传 skipRequirementCheck=true，单纯导入物料，后续在采购需求处手动关联
-        if (add.getType() != null && add.getType() == 1
-                && add.getRequirementId() == null
-                && !Boolean.TRUE.equals(bo.getSkipRequirementCheck())) {
-            throw new RuntimeException("入库必须关联采购需求，请先选择需求");
-        }
-
+        // 入库不再强制关联采购需求，requirementId 可后续在采购需求页手动补关联
         add.setReturnType(0); // 默认0
         add.setSignUser(LoginHelper.getNickName());
         boolean flag = baseMapper.insert(add) > 0;