From fbc2aabb646f11a4d5982490ec8bda7dc6ab2c2d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 24 May 2023 15:02:38 +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

---
 .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java   | 3 +--
 .../biz/basevehicleoutapply/BaseVehicleOutApplyService.java    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index c029d0b7f0..6e1c3f32ff 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -1496,7 +1496,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     baseVehicleZSOutDto.setMaterialTypeKey("002");
                     baseVehicleZSOutDto.setMaterialTypeValue("挂车");
                     baseVehicleZSOutDto.setVinSid(baseTrailerVo.getVehSid());
-                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getZcvinNo());
+                    baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
             } else {
@@ -1510,7 +1510,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     baseVehicleZSOutDto.setMaterialTypeKey("003");
                     baseVehicleZSOutDto.setMaterialTypeValue("上装");
                     baseVehicleZSOutDto.setVinSid(dto.getVinSid());
-                    baseVehicleZSOutDto.setVinNo(dto.getMaterialCode());
                     gcOrSzDtos.add(baseVehicleZSOutDto);
                 }
             }
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 b9e875f52b..b7804c4e4d 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
@@ -111,6 +111,7 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
 			if (StringUtils.isNotBlank(params.getOrgSid())) {
 				qw.eq("bvoa.createOrgSid", params.getOrgSid());
 			}
+			qw.orderByDesc("bvoa.saleDate");
 		}
 		return qw;
 	}