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 01351d8..2976962 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
@@ -55,6 +55,10 @@ public class SysOaWarehouseMasterController extends BaseController {
     public TableDataInfo<SysOaWarehouseMasterVo> list(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
         return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
     }
+    /**
+     * 查询出库单管理列表
+     * 这个是查询退库单
+     */
     @GetMapping("/list/return")
     public TableDataInfo<SysOaWarehouseMasterVo> listReturn(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
         return iSysOaWarehouseMasterService.queryPageReturnList(bo, pageQuery);
@@ -135,6 +139,11 @@ public class SysOaWarehouseMasterController extends BaseController {
     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));
+    }
     //  明细退库
     @PostMapping("/returnDetail")
     public R<Void> returnDetail(@RequestBody List<ReturnDetailBo> returnDetails) {
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
index 312145f..0ce8bcb 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
@@ -60,5 +60,6 @@ public class SysOaWarehouseMaster extends BaseEntity {
     private Integer isLike;
     private Long status;
     private Integer returnType;
+    private Integer withdrawlock;
 
 }
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 a6e6127..0763a6c 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
@@ -76,4 +76,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
 
     private  Integer returnType;
 
+    private Integer withdrawlock;
+
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
index 64d6835..f36227a 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java
@@ -87,6 +87,7 @@ public class SysOaWarehouseMasterVo {
      * 日志操作次数
      */
     private Integer logCount;
+    private Integer 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 1e83a9f..4c527f8 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,6 @@ public interface ISysOaWarehouseMasterService {
      * 单独修改remark
      */
     Boolean updateRemark(Long masterId, String remark);
+
+    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 97bd5db..563ad37 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
@@ -78,11 +78,23 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
 
     @Override
     public TableDataInfo<SysOaWarehouseMasterVo> queryPageReturnList(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
-        QueryWrapper<SysOaWarehouseMaster> lqw = buildQueryWrapper(bo);
+        QueryWrapper<SysOaWarehouseMaster> lqw = buildQueryWrapperPlusWithLogCoun(bo);
         Page<SysOaWarehouseMasterVo> result = baseMapper.selectVoPagePlusWithLogCount(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+    private QueryWrapper<SysOaWarehouseMaster> buildQueryWrapperPlusWithLogCoun(SysOaWarehouseMasterBo bo) {
+        QueryWrapper<SysOaWarehouseMaster> lqw = Wrappers.query();
+        lqw.eq(bo.getType()!= null, "sowm.type",bo.getType())
+                .eq(bo.getProjectId()!= null, "sowm.project_id", bo.getProjectId())
+                .eq(bo.getReturnType() != null, "sowm.return_type", bo.getReturnType())
+                .eq(bo.getWithdrawlock()!= null, "sowm.withdrawlock", bo.getWithdrawlock())
+                // 其他过滤……
+                .eq("sowm.del_flag",0)
+                .orderByDesc("sowm.update_time");
+        return lqw;
+    }
+
     /**
      * 查询出库单管理列表
      */
@@ -318,4 +330,12 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
         update.setRemark(remark);
         return baseMapper.updateById(update) > 0;
     }
+
+    @Override
+    public int updateWithdrawlock(Long masterId, Integer withdrawlock) {
+        SysOaWarehouseMaster update = new SysOaWarehouseMaster();
+        update.setMasterId(masterId);
+        update.setReturnType(withdrawlock);
+        return baseMapper.updateById(update);
+    }
 }