From d7a2f75d59ba5296b4894efa2222f96ac5cd87f0 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 24 May 2023 14:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basevehicleoutapply/BaseVehicleOutApplyQueryNew.java | 2 ++
 .../basevehicleoutapply/BaseVehicleOutApplyMapper.xml    | 2 +-
 .../basevehicleoutapply/BaseVehicleOutApplyService.java  | 9 +++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

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 f94ef06b39..1eccc6362c 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
@@ -50,6 +50,8 @@ public class BaseVehicleOutApplyQueryNew implements Query {
 
     @ApiModelProperty("物料编码")
     private String materialCode;
+    @ApiModelProperty("车架号")
+    private String vinNo;
     @ApiModelProperty("销售类型key")
     private String typeKey;
     @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 4b9f76351b..9dcc56ba32 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
@@ -10,7 +10,7 @@
         bvoa.`createOrgSid`,
         bv.configName AS modelConfig,
         bv.insideCode,
-        bvo.type,
+        bvoa.saleTypeValue AS `type`,
         bvo.manPurOrderTypeValue,
         bvoa.`saleDate`,
         bvo.`price`,
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 26c782a07c..b9e875f52b 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
@@ -72,10 +72,14 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			} else if ("3".equals(orgLevelKey)) {
 				qw.eq("bvoa.createOrgSid", params.getCreateOrgSid());
 			}
-			//车架号
+			//物料编码
 			if (StringUtils.isNotBlank(params.getMaterialCode())) {
 				qw.like("bvo.materialCode", params.getMaterialCode());
 			}
+			//车架号
+			if (StringUtils.isNotBlank(params.getVinNo())) {
+				qw.like("bvo.vinNo", params.getVinNo());
+			}
 			//销售类型
 			if (StringUtils.isNotBlank(params.getTypeKey())) {
 				qw.eq("bvoa.saleTypeKey", params.getTypeKey());
@@ -119,9 +123,6 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 		for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
 			String createOrgSid = record.getCreateOrgSid();
 			String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
-			if (StringUtils.isNotBlank(record.getMaterialCode())){
-				record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
-			}
 			record.setCreateOrgName(createorgName);
 		}
 		PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);