From 76379bc95397a1b0d8ac66c4f3fae8d79bc212c4 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Sat, 11 May 2024 16:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java  | 2 ++
 .../api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java     | 2 ++
 .../biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml     | 1 +
 .../biz/basevehicleoutapply/BaseVehicleOutApplyService.java   | 4 ++++
 4 files changed, 9 insertions(+)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java
index 1eccc6362c..7af5bf6f9f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyQueryNew.java
@@ -48,6 +48,8 @@ import lombok.Data;
 @ApiModel(value = "车辆出库单 查询条件", description = "车辆出库单 查询条件")
 public class BaseVehicleOutApplyQueryNew implements Query {
 
+    @ApiModelProperty("业务状态")
+    private String isDelete;
     @ApiModelProperty("物料编码")
     private String materialCode;
     @ApiModelProperty("车架号")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
index 245b7b2f3e..aabbffdd47 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyVoNew implements Vo {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("业务状态")
+    private String isDelete;
     @ApiModelProperty("车辆sid")
     private String vinSid;
     @ApiModelProperty("车架号")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
index 98313417ec..4e997d0b97 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
@@ -6,6 +6,7 @@
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew">
         SELECT
         bvo.`sid`,
+        IF(bvo.`isDelete` = 1, '作废','正常') AS isDelete,
         bvo.vinSid,
         bvo.vinNo,
         bvoa.`createOrgSid`,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
index db123e184d..e76c8c866e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
@@ -120,6 +120,10 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             } else if ("3".equals(orgLevelKey)) {
                 qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
             }
+            //业务状态
+            if (StringUtils.isNotBlank(params.getIsDelete())) {
+                qw.eq("bvo.isDelete", params.getIsDelete());
+            }
             //物料编码
             if (StringUtils.isNotBlank(params.getMaterialCode())) {
                 qw.like("bvo.materialCode", params.getMaterialCode());