Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -94,8 +94,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //修改客户简称为合同编号
         List<BdCustomer> bdCustomers = new ArrayList<>();
         BdCustomer bdCustomer = new BdCustomer();
+        bdCustomer.setFName(dto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length()-8));
         bdCustomer.setFShortName(dto.getConcatNo());
+        bdCustomer.setFNumber(FNumber);
         bdCustomer.setOldFNumber(FNumber);
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData();
+        bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
         bdCustomers.add(bdCustomer);
         finKingDeeFeign.saveBdCustomers(bdCustomers);
         //查询出库的车辆是否满足出库条件

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json

@@ -54,7 +54,7 @@
     "FCountCycle": "1",
     "FCountDay": 1,
     "FIsMustCounting": false,
-    "FIsBatchManage": true,
+    "FIsBatchManage": false,
     "FIsKFPeriod": false,
     "FIsExpParToFlot": false,
     "FCurrencyId": {