From 6ddd43ad5947425003af8f8ec21417cf6c4feb74 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 27 Sep 2023 09:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E8=B4=B7=E6=AC=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/base/biz/basevehicle/BaseVehicleService.java   | 2 +-
 .../biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index ca8783701a..555fad18d5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -3493,7 +3493,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //非删除
             qw.eq("bv.isDelete", 0);
             //库存状态为库存
-            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+            qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()));
             //锁定状态为未锁定
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
             List<String> list = params.getList();
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
index db649fb206..cb891f471d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@@ -252,7 +252,10 @@
 
     <select id="selectListByOrdersSid"
             resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
-        select sid,ifnull(borrowerSid,'') as borrowerSid,borrowName,linkNo,linkSid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
+        select sid,ifnull(borrowerSid,'') as borrowerSid,borrowName,linkNo,linkSid,if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{saleOrderSid} group by borrowerSid
     </select>
 
     <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">