From 1a0c23ead18b924e449b899230635ff75b0a3d80 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 20 Oct 2025 09:24:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(warehouse):=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=A4=87=E6=B3=A8=E6=97=B6=E9=9C=80=E6=B1=82ID?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整需求ID为0时的处理逻辑，设置为null
- 优化更新备注方法中的条件判断顺序
- 修复masterNum和remark字段更新逻辑- 确保不同条件下正确更新仓库主表信息
---
 .../impl/SysOaWarehouseMasterServiceImpl.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 d5bb448..8f4d0ad 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
@@ -320,18 +320,17 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
     @Override
     public Boolean updateRemark(Long masterId, String remark,Long requirementId,String masterNum) {
         if (masterId == null) return false;
-        if (requirementId == 0) {
-            SysOaWarehouseMaster update = new SysOaWarehouseMaster();
-            update.setMasterId(masterId);
-            update.setRequirementId(requirementId);
-            return baseMapper.updateById(update) > 0;
-        }
         SysOaWarehouseMaster update = new SysOaWarehouseMaster();
         update.setMasterId(masterId);
-        update.setRemark(remark);
-        update.setRequirementId(requirementId);
-        update.setMasterNum(masterNum);
-        return baseMapper.updateById(update) > 0;
+        if (requirementId == 0) {
+            update.setRequirementId(null);
+            return baseMapper.updateById(update) > 0;
+        }else {
+            update.setRemark(remark);
+            update.setRequirementId(requirementId);
+            update.setMasterNum(masterNum);
+            return baseMapper.updateById(update) > 0;
+        }
     }
     // 2. 修改returnType
     @Override