From 3dfb5250ea10cea6302bda1edd0c20def52d5fb3 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 19 Aug 2025 17:14:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E4=BB=93=E5=BA=93=E5=A4=A7?=
 =?UTF-8?q?=E5=B8=88=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=20returnType=20?=
 =?UTF-8?q?=E5=92=8C=20withdrawLock=20=E5=8A=9F=E8=83=BD-=20=E5=9C=A8=20IS?=
 =?UTF-8?q?ysOaWarehouseMasterService=20=E6=8E=A5=E5=8F=A3=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20updateReturnType=20=E5=92=8C=20up?=
 =?UTF-8?q?dateWithdrawLock=20=E6=96=B9=E6=B3=95=20-=20=E5=9C=A8=20SysOaWa?=
 =?UTF-8?q?rehouseMasterController=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=8E=A7=E5=88=B6=E5=99=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20-=20=E5=9C=A8=20SysOaWarehouseMasterServiceImpl=20?=
 =?UTF-8?q?=E4=B8=AD=E5=AE=9E=E7=8E=B0=E4=BA=86=E8=BF=99=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysOaWarehouseMasterController.java          | 11 ++++++++++-
 .../oa/service/ISysOaWarehouseMasterService.java |  3 +++
 .../impl/SysOaWarehouseMasterServiceImpl.java    | 16 +++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
index 910aedf..aeb20dc 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
@@ -113,7 +113,16 @@ public class SysOaWarehouseMasterController extends BaseController {
     public R<Void> updateIsLike(@RequestParam Long masterId, @RequestParam Integer isLike) {
         return toAjax(iSysOaWarehouseMasterService.updateIsLike(masterId, isLike));
     }
-
+    //  修改returnType
+    @PutMapping("/returnType")
+    public R<Void> updateReturnType(@RequestParam Long masterId, @RequestParam Integer returnType) {
+        return toAjax(iSysOaWarehouseMasterService.updateReturnType(masterId, returnType));
+    }
+    // 修改withdrawlock
+    @PutMapping("/withdrawlock")
+    public R<Void> updateWithdrawlock(@RequestParam Long masterId, @RequestParam Integer withdrawlock) {
+        return toAjax(iSysOaWarehouseMasterService.updateWithdrawLock(masterId, withdrawlock));
+    }
 
     /**
      * 修改出库单管理
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
index 15d1d6e..2567611 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java
@@ -87,4 +87,7 @@ public interface ISysOaWarehouseMasterService {
      */
     Boolean updateRemark(Long masterId, String remark);
 
+    int updateReturnType(Long masterId, Integer returnType);
+
+    int updateWithdrawLock(Long masterId, Integer withdrawlock);
 }
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 89b99d6..bde4d17 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
@@ -324,5 +324,19 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
         update.setRemark(remark);
         return baseMapper.updateById(update) > 0;
     }
-
+    // 2. 修改returnType
+    @Override
+    public int updateReturnType(Long masterId, Integer returnType) {
+        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
+        update.setMasterId(masterId);
+        update.setReturnType(returnType);
+        return baseMapper.updateById(update);
+    }
+    @Override
+    public int updateWithdrawLock(Long masterId, Integer withdrawlock) {
+        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
+        update.setMasterId(masterId);
+        update.setReturnType(withdrawlock);
+        return baseMapper.updateById(update);
+    }
 }