diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index b31296a6d2..995d26459c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@@ -477,6 +477,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     baseVehicleService.updateConAndCostPrice(baseInternalPurchaseVehicle.getWitPinMoney(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
                 }
                 try {
+                    //推送金蝶销售出库单
+                    createSalOutStock(baseAccadjApply);
                     //关联查询调车车辆列表中的采购部门sid
                     List<String> stringList = baseAccadjApplyeVehService.fetchCallInBuyerOrgSidByMainSid(baseAccadjApply.getSid());
                     List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
@@ -487,10 +489,34 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         baseAccadjApplyToJDRu.setBaseInternalPurchaseVehicles(baseInternalPurchaseVehicleList);
                         baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
                     }
-                    //推送金蝶销售出库单
-                    SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
-                    finKingDeeFeign.draftSalOutStock(salOutStock);
                     for (BaseAccadjApplyToJDRu baseAccadjApplyToJDRu : baseAccadjApplyToJDRus) {
+                        List<BaseVehicle> baseVehicles = baseAccadjApplyToJDRu.getBaseVehicles();
+                        //调出采购系统sid(部门sid)
+                        String purchaseSystemSid = baseVehicles.get(0).getPurchaseSystemSid();
+                        //调出获取采购系统
+                        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVoDC = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
+                        //调出获取采购系统中的财务分公司编码
+                        String orgCodeDC = basePurchaseSystemDetailsVoDC.getOrgCode();
+                        //调出根据code获取组织信息
+                        SysOrganization sysOrganizationDC = sysOrganizationFeign.selectByOrgCode(orgCodeDC).getData();
+                        //调出获取组织的otherCode
+                        String otherCodeDC = sysOrganizationDC.getOtherCode();
+                        //调入取车辆信息
+                        BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicles.get(0).getVinNo(), baseAccadjApply.getCallInOrgSid());
+                        //调入采购系统sid(部门sid)
+                        String purchaseSystemSidDR = baseVehicleDR.getPurchaseSystemSid();
+                        //调入获取采购系统
+                        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVoDR = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSidDR).getData();
+                        //调入获取采购系统名称
+                        String purchaseSystemNameDR = basePurchaseSystemDetailsVoDR.getPurchaseSystemName();
+                        //调入获取采购系统中的财务分公司编码
+                        String orgCodeDR = basePurchaseSystemDetailsVoDR.getOrgCode();
+                        //调入获取部门信息
+                        SysOrganizationVo sysOrganizationVoDR = sysOrganizationFeign.fetchBySid(purchaseSystemSidDR).getData();
+                        //调入获取部门名称
+                        String nameDR = sysOrganizationVoDR.getName();
+                        //调入获取部门编码
+                        String orgCodeDRBM = sysOrganizationVoDR.getOrgCode();
                         //推送金蝶采购入库单
                         StkInStock stkInStock = new StkInStock();
                         // 入库日期:FDate  (必填项)
@@ -504,24 +530,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         //分公司id
                         List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles2 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
                         BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles2.get(0);
-                        BasePurchaseSystemDetailsVo data2 = basePurchaseSystemService.fetchDetailsByDeptSid(baseInternalPurchaseVehicle1.getCallInBuyerOrgSid()).getData();
-                        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
-                        if (data2 != null) {
-                            stkInStock.setFPurchaseOrgId(data2.getOrgCode());
-                            //分配目标组织:TOrgId  (必填项)
-                            stkInStock.setTOrgId(data2.getOrgCode());
-                        } else {
-                            if (sysOrganizationVoResultBean.getSuccess()) {
-                                SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
-                                if (vo != null) {
-                                    stkInStock.setFPurchaseOrgId(vo.getOrgCode());
-                                    //分配目标组织:TOrgId  (必填项)
-                                    stkInStock.setTOrgId(vo.getOrgCode());
-                                }
-                            }
-                        }
-                        // 供应商:FSupplierId  (必填项)
-                        stkInStock.setFSupplierId(salOutStock.getFSaleOrgId());
+                        //ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
+                        stkInStock.setFPurchaseOrgId(orgCodeDR);
+                        //分配目标组织:TOrgId  (必填项)
+                        stkInStock.setTOrgId(stkInStock.getFPurchaseOrgId());
+                        //供应商:FSupplierId  (必填项)
+                        stkInStock.setFSupplierId(otherCodeDC);
                         //stkInStock.setFSupplierId("010001");
                         // 物料列表:FInStockEntry  (必填项)
                         List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
@@ -563,32 +577,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             fInStockEntry.add(sf);
                         }
                         stkInStock.setFInStockEntry(fInStockEntry);
-                        finKingDeeFeign.draftStkInStock(stkInStock);
+                        //推送财务供应商信息
+                        BdSupplier bdSupplier = new BdSupplier();
+                        bdSupplier.setFName(sysOrganizationDC.getName());
+                        bdSupplier.setFLocMobile("13333333333");
+                        bdSupplier.setFNumber(otherCodeDC);
+                        bdSupplier.setFUseOrgId(orgCodeDC);
                         //推送车辆入库查询
                         ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
                         scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
                         scmApplyInboundQueryDto.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.NG_ORDER.getCode());
                         scmApplyInboundQueryDto.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.NG_ORDER.getRemarks());
                         scmApplyInboundQueryDto.setApplicationCode(baseAccadjApply.getApplyNo());
-                        BaseInternalPurchase baseInternalPurchase = baseInternalPurchaseService.fetchBySid(baseInternalPurchaseVehicle1.getMainSid());
-                        scmApplyInboundQueryDto.setOrgDeptSid(baseInternalPurchase.getCallInBuyerOrgSid());
-                        SysOrganizationVo data7 = sysOrganizationFeign.fetchBySid(baseInternalPurchase.getCallInBuyerOrgSid()).getData();
-                        scmApplyInboundQueryDto.setOrgDeptName(data7.getName());
-                        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo1 = basePurchaseSystemService.fetchDetailsByDeptSid(baseInternalPurchase.getCallInBuyerOrgSid()).getData();
-                        scmApplyInboundQueryDto.setPurchaseSystemName(basePurchaseSystemDetailsVo1.getPurchaseSystemName());
-                        scmApplyInboundQueryDto.setPurchaseSystemCode(data7.getOrgCode());
-                        scmApplyInboundQueryDto.setOrgCode(basePurchaseSystemDetailsVo1.getOrgCode());
+                        scmApplyInboundQueryDto.setOrgDeptSid(purchaseSystemSidDR);
+                        scmApplyInboundQueryDto.setOrgDeptName(nameDR);
+                        scmApplyInboundQueryDto.setPurchaseSystemName(purchaseSystemNameDR);
+                        scmApplyInboundQueryDto.setPurchaseSystemCode(orgCodeDRBM);
+                        scmApplyInboundQueryDto.setOrgCode(orgCodeDR);
                         scmApplyInboundQueryDto.setManSid(baseAccadjApply.getCallOutOrgSid());
                         scmApplyInboundQueryDto.setManName(baseAccadjApply.getCallInOrgName());
-                        SysOrganizationVo data4 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()).getData();
-                        scmApplyInboundQueryDto.setManCode(data4.getOrgCode());
+                        scmApplyInboundQueryDto.setManCode(otherCodeDC);
                         scmApplyInboundQueryDto.setMakeListSid(baseAccadjApply.getCreateBySid());
-                        SysUserVo data3 = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
-                        scmApplyInboundQueryDto.setMakeListName(data3.getName());
+                        SysUserVo sysUserVo = sysUserFeign.fetchBySid(baseAccadjApply.getCreateBySid()).getData();
+                        scmApplyInboundQueryDto.setMakeListName(sysUserVo.getName());
                         scmApplyInboundQueryDto.setMakeListDate(DateUtil.formatDate(new Date()));
                         scmApplyInboundQueryDto.setCreateOrgSid(baseAccadjApply.getCreateOrgSid());
-                        SysOrganizationVo data6 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
-                        scmApplyInboundQueryDto.setCreateOrgName(data6.getName());
+                        SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
+                        scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());
                         scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());
                         List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
                         for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
@@ -598,9 +613,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle1.getCarBrandSid());
                             scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
                             scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
-                            BaseVehicleModel data5 = baseVehicleModelService.selectDetails(baseVehicle1.getModelSid()).getData();
-                            scmApplyInboundVehQueryDto.setVehicleTypeKey(data5.getVehicleType());
-                            scmApplyInboundVehQueryDto.setVehicleTypeValue(data5.getVehicleTypeValue());
+                            BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicle1.getModelSid()).getData();
+                            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
+                            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
                             scmApplyInboundVehQueryDto.setIunit("辆");
                             scmApplyInboundVehQueryDto.setNum("1");
                             scmApplyInboundVehQueryDto.setSettleMoney(String.valueOf(baseVehicle1.getCostPrice()));
@@ -609,34 +624,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                             scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
                         }
                         scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
-                        scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);
-                        //推送财务供应商信息
-                        List<BasePurchaseSystemDetailsVo> data1 = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(baseAccadjApply.getCallOutOrgSid()).getData();
-                        if (data1 != null) {
-                            for (BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo : data1) {
-                                BdSupplier bdSupplier = new BdSupplier();
-                                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
-                                SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
-                                if (vo != null) {
-                                    bdSupplier.setFName(vo.getName());
-                                    bdSupplier.setFLocMobile("13333333333");
-                                    bdSupplier.setFNumber(vo.getOtherCode());
-                                }
-                                bdSupplier.setFUseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
-                                finKingDeeFeign.draftBdSupplier(bdSupplier);
-                            }
-                        } else {
-                            BdSupplier bdSupplier = new BdSupplier();
-                            ResultBean<SysOrganizationVo> sysOrganizationVoResultBean1 = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid());
-                            SysOrganizationVo vo = sysOrganizationVoResultBean1.getData();
-                            if (vo != null) {
-                                bdSupplier.setFName(vo.getName());
-                                bdSupplier.setFLocMobile("13333333333");
-                                bdSupplier.setFNumber(vo.getOtherCode());
-                            }
-                            bdSupplier.setFUseOrgId(sysOrganizationVoResultBean.getData().getOrgCode());
-                            finKingDeeFeign.draftBdSupplier(bdSupplier);
+                        ResultBean<String> save = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);
+                        if (!save.getSuccess()){
+                            return rb.setMsg("采购入库单查询推送失败");
                         }
+                        finKingDeeFeign.draftBdSupplier(bdSupplier);
+                        finKingDeeFeign.draftStkInStock(stkInStock);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -649,8 +642,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     }
 
     //调车调账构造销售出库单数据
-    private SalOutStock createSalOutStock(BaseAccadjApply baseAccadjApply) {
-        SalOutStock salOutStock = new SalOutStock();
+    private void createSalOutStock(BaseAccadjApply baseAccadjApply) {
         //获取车辆台账表中的采购部门sid
         List<String> stringList = baseAccadjApplyeVehService.fetchByAccSidAndCallOutOrgSid(baseAccadjApply.getSid(), baseAccadjApply.getCallOutOrgSid());
         List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();
@@ -663,7 +655,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         }
         //一个采购系统推送一个销售出库单
         for (BaseAccadjApplyToJDRu accadjApplyToJDRus : baseAccadjApplyToJDRus) {
-            List<BaseVehicle> baseVehicles = accadjApplyToJDRus.getBaseVehicles();
+            SalOutStock salOutStock = new SalOutStock();
             //单据编号
             salOutStock.setFBillNo(baseAccadjApply.getApplyNo());
             //日期:FDate  (必填项)
@@ -671,6 +663,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             //项目类别:F_PAEZ_Assistant  (必填项) 集团内部调车 034
             salOutStock.setF_PAEZ_AssistantKey("034");
             salOutStock.setF_PAEZ_AssistantType("payType");
+            List<BaseVehicle> baseVehicles = accadjApplyToJDRus.getBaseVehicles();
             //调出销售部门编码
             String purchaseSystemCode = baseVehicles.get(0).getPurchaseSystemCode();
             //调出采购系统sid(部门sid)
@@ -679,6 +672,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
             //调出获取采购系统中的财务分公司编码
             String orgCode = basePurchaseSystemDetailsVo.getOrgCode();
+            //调入取车辆信息
             BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicles.get(0).getVinNo(), baseAccadjApply.getCallInOrgSid());
             //调入采购系统sid(部门sid)
             String purchaseSystemSidDR = baseVehicleDR.getPurchaseSystemSid();
@@ -732,12 +726,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             List<BdCustomer> bdCustomers = new ArrayList<>();
             BdCustomer bdCustomer = new BdCustomer();
             bdCustomer.setTOrgIds(salOutStock.getFSaleOrgId());
-            bdCustomer.setFName(baseAccadjApply.getCallInOrgName());
+            bdCustomer.setFName(sysOrganization.getName());
             bdCustomer.setFNumber(salOutStock.getFCustomerID());
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.draftBdCustomers(bdCustomers);
+            finKingDeeFeign.draftSalOutStock(salOutStock);
         }
-        return salOutStock;
     }
 
     public ResultBean InitiatorToAnswer(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml
index 88d49c7e8c..a08a2eac55 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.xml
@@ -58,5 +58,6 @@
                 ON bv.`vinNo` = bipv.`vinNo`
         WHERE baa.`sid` = #{sid}
           AND bv.`purchaseSystemSid` = #{s}
+          AND bv.vehicleState != "0004"
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
index 9930d9dca3..063d8cf676 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
@@ -146,6 +146,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getCarModelName())) {
             qw.like("btm.carModelName", query.getCarModelName());
         }
+        qw.orderByDesc("bt.createTime");
         String warehousingStartDate = query.getWarehousingStartDate();
         String warehousingEndDate = query.getWarehousingEndDate();
         qw.apply(StringUtils.isNotEmpty(warehousingStartDate), "date_format (bt.warehousingDate,'%Y-%m-%d') >= date_format('" + warehousingStartDate + "','%Y-%m-%d')").
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 065c3ce727..bbd0f41073 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1234,6 +1234,7 @@
         WHERE vinNo = #{vinNo}
           AND createOrgSid = #{createOrgSid}
           AND isDelete = 0
+          AND vehicleState != "0004"
     </select>
 
     <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
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 97055abdda..318e2bd555 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
@@ -2757,6 +2757,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getVehMark())) {
             baseVehicle.setVehMark(dto.getVehMark());
         }
+        if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
+            baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
+        }
     }
 
     public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@@ -2925,6 +2928,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getVehMark())) {
             baseVehicle.setVehMark(dto.getVehMark());
         }
+        if (StringUtils.isNotBlank(dto.getOrgPriceDate())) {
+            baseVehicle.setOrgPriceDate(dto.getOrgPriceDate());
+        }
     }
 
     /**
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
index cc684df45e..49c7712433 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
@@ -17,8 +17,8 @@
 		bv.vehModel,
 		bv.vinNo,
 		bv.vehicleStateValue,
-		bv.priceDate,
-		bv.salesDate,
+		bvm.priceDate,
+		bvm.salesDate,
 		bv.costPrice,
 		bv.guidePrice,
 		bv.vehModelSid
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
index f22c1e2a8c..db097fbcc0 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java
@@ -28,10 +28,12 @@ package com.yxt.anrui.base.biz.basevehinstall;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
@@ -69,131 +71,127 @@ import java.util.List;
 @RequestMapping("v1/basevehinstall")
 public class BaseVehinstallRest implements BaseVehinstallFeign {
 
-	@Autowired
-	private BaseVehinstallService baseVehinstallService;
-	@Autowired
-	private SysOrganizationFeign sysOrganizationFeign;
-	@Autowired
-	private BaseVehinstallmodelService baseVehinstallmodelService;
-	@Autowired
-	private BaseManufacturerService baseManufacturerService;
-	@Resource
-	private FinKingDeeFeign finKingDeeFeign;
-	@Autowired
-	private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseVehinstallService baseVehinstallService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BaseVehinstallmodelService baseVehinstallmodelService;
+    @Autowired
+    private BaseManufacturerService baseManufacturerService;
+    @Resource
+    private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseVehinstallVo> pv = baseVehinstallService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseVehinstallVo>> listPage(@RequestBody PagerQuery<BaseVehinstallQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehinstallVo> pv = baseVehinstallService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseVehinstallVo> pv = baseVehinstallService.vehInsMod(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    public ResultBean<PagerVo<BaseVehinstallVo>> vehInsMod(PagerQuery<BaseVehinstallQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehinstallVo> pv = baseVehinstallService.vehInsMod(pq);
+        return rb.success().setData(pv);
+    }
 
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BaseVehinstallDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		String vinNo = dto.getVinNo();
-		String costPrice = dto.getCostPrice();
-		String guidePrice = dto.getGuidePrice();
-		if (StringUtils.isBlank(vinNo)){
-			return rb.setMsg("请选择主车车架号");
-		}
-		if (StringUtils.isBlank(costPrice)){
-			return rb.setMsg("请填写厂家结算价");
-		}
-		if (StringUtils.isBlank(guidePrice)){
-			return rb.setMsg("请填写销售指导价");
-		}
-		baseVehinstallService.saveOrUpdateDto(dto);
-		if (StringUtils.isBlank(dto.getSid())){
-			StkInStock stkInStock = new StkInStock();
-			//入库日期:FDate  (必填项)
-			stkInStock.setFDate(DateUtil.formatDate(new Date()));
-			//采购部门:FPurchaseDeptId  (必填项)
-			String departmentSid = dto.getDepartmentSid();
-			SysOrganizationVo data = sysOrganizationFeign.fetchBySid(departmentSid).getData();
-			stkInStock.setFPurchaseDeptId(data.getOrgCode());
-			//采购组织:FPurchaseOrgId  (必填项)
-			BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(departmentSid).getData();
-			if (basePurchaseSystemDetailsVo != null){
-				stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
-				//分配目标组织:TOrgId  (必填项)
-				stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());
-			}else {
-				ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid());
-				SysOrganizationVo vo = sysOrganizationVoResultBean.getData();
-				if (vo != null) {
-					stkInStock.setFPurchaseOrgId(vo.getOrgCode());
-					//分配目标组织:TOrgId  (必填项)
-					stkInStock.setTOrgId(vo.getOrgCode());
-				}
-			}
-			//供应商:FSupplierId  (必填项)
-			String mainSid = dto.getMainSid();
-			BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
-			BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid());
-			stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
-			//物料列表:FInStockEntry  (必填项)
-			List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
-			StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
-			//单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
-			sf.setFPrice(dto.getCostPrice());
-			//车辆类型
-			sf.setCllx("61");
-			sf.setCllxType("sellChannel");
-			//批号:FLot
-			sf.setFLot(dto.getVinNo());
-			//物料编码:FMaterialId  (必填项)
-			sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
-			//仓库:FStockId
-			sf.setFStockId("ARZSCK");
-			//物料分组
-			sf.setWlfz("99.02");
-			//存货类别
-			sf.setFCategoryIDKey("005");
-			sf.setFCategoryIDType("purchaseOrderType");
-			fInStockEntry.add(sf);
-			stkInStock.setFInStockEntry(fInStockEntry);
-			try {
-				finKingDeeFeign.draftStkInStock(stkInStock);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		return rb.success();
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseVehinstallDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String vinNo = dto.getVinNo();
+        String costPrice = dto.getCostPrice();
+        String guidePrice = dto.getGuidePrice();
+        if (StringUtils.isBlank(vinNo)) {
+            return rb.setMsg("请选择主车车架号");
+        }
+        if (StringUtils.isBlank(costPrice)) {
+            return rb.setMsg("请填写厂家结算价");
+        }
+        if (StringUtils.isBlank(guidePrice)) {
+            return rb.setMsg("请填写销售指导价");
+        }
+        baseVehinstallService.saveOrUpdateDto(dto);
+        if (StringUtils.isBlank(dto.getSid())) {
+            StkInStock stkInStock = new StkInStock();
+            //入库日期:FDate  (必填项)
+            stkInStock.setFDate(DateUtil.formatDate(new Date()));
+            //获取主车信息
+            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, dto.getCreateOrg());
+            //获取主车采购系统sid
+            String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
+            //根据采购系统sid获取部门组织信息
+            SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
+            //采购部门:FPurchaseDeptId  (必填项)
+            stkInStock.setFPurchaseDeptId(sysOrganizationVoBM.getOrgCode());
+            //采购组织:FPurchaseOrgId  (必填项)
+            BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
+            stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
+            //分配目标组织:TOrgId  (必填项)
+            stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());
+            //供应商:FSupplierId  (必填项)
+            String mainSid = dto.getMainSid();
+            BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(mainSid);
+            BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseVehinstallmodel.getRefitFactorySid());
+            stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
+            //物料列表:FInStockEntry  (必填项)
+            List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
+            StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+            //单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
+            sf.setFPrice(dto.getCostPrice());
+            //车辆类型
+            sf.setCllx("61");
+            sf.setCllxType("sellChannel");
+            //批号:FLot
+            sf.setFLot(dto.getVinNo());
+            //物料编码:FMaterialId  (必填项)
+            sf.setFMaterialId(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "SZ");
+            //仓库:FStockId
+            sf.setFStockId("ARZSCK");
+            //物料分组
+            sf.setWlfz("99.02");
+            //存货类别
+            sf.setFCategoryIDKey("005");
+            sf.setFCategoryIDType("purchaseOrderType");
+            fInStockEntry.add(sf);
+            stkInStock.setFInStockEntry(fInStockEntry);
+            try {
+                finKingDeeFeign.draftStkInStock(stkInStock);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Override
+    @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehinstallService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehinstallService.delBySids(sids);
+        return rb.success();
+    }
 
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<BaseVehinstallDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehinstallDetailsVo vo = baseVehinstallService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
-		return baseVehinstallService.selectOne(vinNo,useOrgSid);
-	}
+    @Override
+    public ResultBean<BaseVehinstall> selectOne(String vinNo, String useOrgSid) {
+        return baseVehinstallService.selectOne(vinNo, useOrgSid);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
index e2fc0b6f90..fcd184b016 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java
@@ -112,6 +112,7 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
 		if (StringUtils.isNotBlank(query.getVinNo())){
 			qw.like("bv.vinNo",query.getVinNo());
 		}
+		qw.orderByDesc("bvm.createTime");
 		IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
 		IPage<BaseVehinstallVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<BaseVehinstallVo> p = PagerUtil.pageToVo(pagging, null);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
index 224cf5ee84..3ce8531d79 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
@@ -269,6 +269,16 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                 sf.setWlfz(scmApplyInboundVehQueryDetailsVo.getMgroupCode());
                 //单价   对应厂家结算价
                 sf.setFPrice(scmApplyInboundVehQueryDetailsVo.getSettleMoney() + "");
+                //存货类别
+                sf.setFCategoryIDType("purchaseOrderType");
+                sf.setFCategoryIDKey(scmApplyInboundQuery.getManPurOrderTypeKey());
+                //批号:FLot
+                sf.setFLot(scmApplyInboundVehQueryDetailsVo.getVinNo());
+                //物料编码:FMaterialId  (必填项)
+                sf.setFMaterialId(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
+                //仓库:FStockId-目前只分在途和正式两个仓库。
+                //仓库编码
+                sf.setFStockId("ARZSCK");
                 //车辆类型
                 //厂家采购
                 if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey()) ||
@@ -276,6 +286,12 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                     //车辆类型-厂家外采和调车
                     sf.setCllx(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
                     sf.setCllxType("sellChannel");
+                    //填充直接调拨单物料列表数据
+                    StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
+                    fBillEntry.setFMaterialId(sf.getFMaterialId());//物料编码
+                    fBillEntry.setFDestStockId("ARZTCK");//调入仓库
+                    fBillEntry.setFSrcStockId("ARZSCK");//调出仓库
+                    FPAYBILLENTRYs.add(fBillEntry);
                 } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
                     //车辆类型-外采主车
                     sf.setCllx("60");
@@ -283,27 +299,12 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
                     //物料分组-外采主车
                     sf.setWlfz("99.01");
                 }
-                //存货类别
-                sf.setFCategoryIDType("purchaseOrderType");
-                sf.setFCategoryIDKey(scmApplyInboundQuery.getManPurOrderTypeKey());
-                //批号:FLot
-                sf.setFLot(scmApplyInboundVehQueryDetailsVo.getVinNo());
-                //物料编码:FMaterialId  (必填项)
-                sf.setFMaterialId(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
-                //仓库:FStockId-目前只分在途和正式两个仓库。
-                //仓库编码
-                sf.setFStockId("ARZSCK");
                 fInStockEntry.add(sf);
-                //填充直接调拨单物料列表数据
-                StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();
-                fBillEntry.setFMaterialId(sf.getFMaterialId());//物料编码
-                fBillEntry.setFDestStockId("ARZTCK");//调入仓库
-                fBillEntry.setFSrcStockId("ARZSCK");//调出仓库
-                FPAYBILLENTRYs.add(fBillEntry);
             }
             stkInStock.setFInStockEntry(fInStockEntry);
             ResultBean<String> stringResultBean = finKingDeeFeign.draftStkInStock(stkInStock);
-            if (stringResultBean.getSuccess()) {
+            //外采不推送直接调拨单
+            if (stringResultBean.getSuccess() && !ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmApplyInboundQuery.getManPurOrderTypeKey())) {
                 //推送调拨单
                 StkTransferDirect stkTransferDirect = new StkTransferDirect();
                 stkTransferDirect.setFStockOrgId(stkInStock.getTOrgId()); //调入库存组织