From 2060cf3506df6a3b1e1db05502bb4c9973088adc Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 12 Jul 2024 10:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=BD=A6=E4=BF=AE=E6=94=B9=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyDetailsMapper.java                     | 4 ++++
 .../BusDeliveredApplyDetailsService.java                    | 4 ++++
 .../BusSalesOrderReturnVehApplyService.java                 | 6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java
index f471f4e651..6d7ccbebbe 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java
@@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetails;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -98,4 +99,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
     String fetchByVehSid(String vinSid);
 
     int fetchByIsDeleteVinSid(String vinSid);
+
+    @Update("update bus_delivered_apply_details set isDelete = 1 where vinSid = #{vehSid}")
+    void updateIsDel(String vehSid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
index 09acbda59a..f0e92660ed 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
@@ -226,4 +226,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     public int fetchByIsDeleteVinSid(String vinSid) {
         return baseMapper.fetchByIsDeleteVinSid(vinSid);
     }
+
+    public void updateIsDel(String vehSid) {
+        baseMapper.updateIsDel(vehSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
index 5959a7f0c3..872d4c5509 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
@@ -65,8 +65,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders;
 import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto;
+import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
 import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
@@ -180,6 +180,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
     @Autowired
     private BusSalesReturnOrdersService busSalesReturnOrdersService;
 
+    @Autowired
+    private BusDeliveredApplyDetailsService busDeliveredApplyDetailsService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
 
@@ -727,6 +729,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         baseVehicleFeign.updateStateForReturnVeh(vehSid);
                         //对应车辆开票作废
                         finVehicleInvoiceFeign.updateBillingState(busSalesOrderReturnVehApply.getContractNo(), vehSid);
+                        //修改出库申请车辆状态
+                        busDeliveredApplyDetailsService.updateIsDel(vehSid);
                     }
                     //------------------------修改车辆持久状态--------------------------
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());