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 42a1fba97a..74399d7e25 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
@@ -2650,6 +2650,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getOrgCode())) {
             baseVehicle.setOrgCode(dto.getOrgCode());
         }
+        if (StringUtils.isNotBlank(dto.getSupplierName())) {
+            baseVehicle.setSupplierName(dto.getSupplierName());
+        }
     }
 
     public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@@ -2812,6 +2815,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getOrgCode())) {
             baseVehicle.setOrgCode(dto.getOrgCode());
         }
+        if (StringUtils.isNotBlank(dto.getSupplierName())) {
+            baseVehicle.setSupplierName(dto.getSupplierName());
+        }
     }
 
     /**
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 fc6cf95534..7d0df019df 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
@@ -83,6 +83,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }else {
                     bdCustomer.setFNumber(FNumber1);
                 }
+                bdCustomer.setFShortName(dto.getConcatNo());
                 bdCustomers.add(bdCustomer);
                 finKingDeeFeign.draftBdCustomers(bdCustomers);
             }else {
@@ -90,6 +91,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 return rb.success().setData(b);
             }
         }
+        //修改客户简称为合同编号
+        List<BdCustomer> bdCustomers = new ArrayList<>();
+        BdCustomer bdCustomer = new BdCustomer();
+        bdCustomer.setFShortName(dto.getConcatNo());
+        bdCustomer.setOldFNumber(FNumber);
+        bdCustomers.add(bdCustomer);
+        finKingDeeFeign.saveBdCustomers(bdCustomers);
         //查询出库的车辆是否满足出库条件
         int count = baseMapper.selectCountByVinSid(dto.getVinSid());
         if (count > 0) {
@@ -129,8 +137,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         ////ToDo:推送财务中介单位、推送金蝶客户、推送金蝶出库单
         try {
             //推送财务客户信息
-            BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
-            ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);
+            /*BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
+            ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);*/
             //推送财务中介人
             if (StringUtils.isNotBlank(dto.getMiddleOne())) {
                 BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
@@ -150,9 +158,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     public ResultBean isUpdateOrInsertCrm(BaseVehicleOutDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String isUpdateOrInsertCrm = dto.getIsUpdateOrInsertCrm();
+        List<BdCustomer> bdCustomers = new ArrayList<>();
+        BdCustomer bdCustomer = new BdCustomer();
         if ("是".equals(isUpdateOrInsertCrm)){
-            List<BdCustomer> bdCustomers = new ArrayList<>();
-            BdCustomer bdCustomer = new BdCustomer();
             String FNumber = HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
             if (FNumber.length() > 30){
                 FNumber = FNumber.substring(0,30);
@@ -160,13 +168,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }else {
                 bdCustomer.setFNumber(FNumber);
             }
-            bdCustomer.setFNumber(HanZiConverterPinYin.getPinYinFirst(dto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8));
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
             bdCustomer.setOldFNumber(dto.getCustomerNo());
+            bdCustomer.setFShortName(dto.getConcatNo());
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.saveBdCustomers(bdCustomers);
         }else if ("否".equals(isUpdateOrInsertCrm)){
-            List<BdCustomer> bdCustomers = new ArrayList<>();
-            BdCustomer bdCustomer = new BdCustomer();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
             bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
             bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
@@ -177,6 +186,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }else {
                 bdCustomer.setFNumber(FNumber1);
             }
+            bdCustomer.setFShortName(dto.getConcatNo());
             bdCustomers.add(bdCustomer);
             finKingDeeFeign.draftBdCustomers(bdCustomers);
         }
@@ -219,8 +229,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         ////ToDo:推送财务中介单位、推送金蝶客户、推送金蝶出库单
         try {
             //推送财务客户信息
-            BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
-            ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);
+            /*BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
+            ResultBean resultBeanCustomer = finKingDeeFeign.updateSingleCustomer(bdCustomer);*/
             //推送财务中介人
             if (StringUtils.isNotBlank(dto.getMiddleOne())) {
                 BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
index e23e451349..58ab59259a 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
@@ -134,6 +134,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             qw.eq("locationSid", query.getLocationSid());
         }
         qw.eq("InventoryStateKey", "");
+        qw.eq("isDelete",0);
         IPage<ScmVehicleInventory> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehicleInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmVehicleInventoryVo record : pagging.getRecords()) {