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);
+    }
 }