From cbc94604475c7db386aa372c5e206f9405fc8af3 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 2 Mar 2026 12:58:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsLeaveRequestBo中新增approvalType字段用于存储审批类型
- 修改WmsLeaveRequestServiceImpl依赖注入从WmsApprovalMapper改为IWmsApprovalService
- 更新请假申请保存逻辑使用WmsApprovalBo替代WmsApproval实体
- 实现审批类型的传递和存储功能，将审批信息通过service层插入
---
 .../main/java/com/klp/domain/bo/WmsLeaveRequestBo.java |  3 +++
 .../klp/service/impl/WmsLeaveRequestServiceImpl.java   | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
index f248de8f..d848a93f 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java
@@ -93,5 +93,8 @@ public class WmsLeaveRequestBo extends BaseEntity {
     // 审批人
     private String approverName;
 
+    // 审批类型
+    private String approvalType;
+
 
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
index 2d520ed1..a26b2af4 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.domain.bo.WmsApprovalBo;
+import com.klp.service.IWmsApprovalService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.domain.bo.WmsLeaveRequestBo;
@@ -32,7 +34,7 @@ import com.klp.domain.WmsApproval;
 public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
 
     private final WmsLeaveRequestMapper baseMapper;
-    private final WmsApprovalMapper approvalMapper;
+    private final IWmsApprovalService approvalService;
 
     /**
      * 查询员工请假申请
@@ -122,13 +124,13 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
-            bo.setLeaveId(add.getLeaveId());
-            WmsApproval approval = new WmsApproval();
+            WmsApprovalBo approval = new WmsApprovalBo();
             approval.setApplyType("leave");
             approval.setApplyId(add.getLeaveId());
             approval.setApprovalStatus("待审批");
             approval.setApproverName(bo.getApproverName());
-            approvalMapper.insert(approval);
+            approval.setApprovalType(bo.getApprovalType());
+            approvalService.insertByBo(approval);
         }
 
         return flag;