Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java

@@ -21,5 +21,8 @@ public class BaseManActualVo implements Vo {
     @ApiModelProperty("收款银行账号")
     private String bankAccount;
 
+    @ApiModelProperty("厂家销售通路sid")
+    private String actualPaySid;
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleListVo.java

@@ -16,4 +16,6 @@ public class BaseMiddleListVo implements Vo {
     private String middleName;
     @ApiModelProperty("中介人sid")
     private String middleSid;
+    @ApiModelProperty("中介人编码")
+    private String middleCode;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java

@@ -67,4 +67,6 @@ public class BaseMiddleman extends BaseEntity {
     @ApiModelProperty("编码")
     private String middleCode;
 
+    private String companySid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDetailsVo.java

@@ -68,4 +68,6 @@ public class BaseMiddlemanDetailsVo implements Vo {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    private String companySid;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java

@@ -72,5 +72,6 @@ public class BaseMiddlemanDto implements Dto {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+    private String companySid;
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java

@@ -72,4 +72,11 @@ public class BaseVehicleOut extends BaseEntity {
     private String middleTwoSid;
     @ApiModelProperty("返利金额2")
     private BigDecimal rebateMoneyTwo;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
+
+    @ApiModelProperty("中介人1编码")
+    private String middleCodeOne;
+    @ApiModelProperty("中介人2编码")
+    private String middleCodeTwo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -59,4 +59,12 @@ public class BaseVehicleOutDto implements Dto {
     @ApiModelProperty("备注")
     private String remarks;
     private String saleDate;
+
+    @ApiModelProperty("客户编码")
+    private String customerNo;
+
+    @ApiModelProperty("中介人1编码")
+    private String middleCodeOne;
+    @ApiModelProperty("中介人2编码")
+    private String middleCodeTwo;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -53,7 +53,7 @@
         <!--银行代码-->
         bmb.swiftCode,
         bmb.remarks,
-        /*厂家销售通路*/
+            /*厂家销售通路*/
         bmb.actualPay,
         bmb.actualPayKey,
         bmb.paymentAccessNoKey,
@@ -76,10 +76,12 @@
     <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
         select bmb.actualPay,
                bmb.depositBank,
-               bmb.bankAccount
+               bmb.bankAccount,
+               bmb.sid actualPaySid
         from base_manufacturer_bank bmb
                  left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
-        where bmb.isDelete = 0 and bm.isDelete = 0
+        where bmb.isDelete = 0
+          and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
           and bmb.dueBankKey = #{code}
     </select>
@@ -98,7 +100,8 @@
                bmb.bankAccount
         from base_manufacturer_bank bmb
                  left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
-        where bmb.isDelete = 0 and bm.isDelete = 0
+        where bmb.isDelete = 0
+          and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
           and bmb.dueBankKey = #{code}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanMapper.xml

@@ -69,7 +69,7 @@
     </select>
 
     <select id="selectMiddleList" resultType="com.yxt.anrui.base.api.basemiddleman.BaseMiddleListVo">
-        select name as middleName, sid as middleSid
+        select name as middleName, sid as middleSid,middleCode
         from base_middleman
         where createBySid = #{staffSid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemiddleman.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.HanZiConverterPinYin;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +42,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -127,7 +129,12 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
     public ResultBean<List<BaseMiddleListVo>> selectMiddleList(BaseMiddleListQuery query) {
         ResultBean<List<BaseMiddleListVo>> rb = ResultBean.fireFail();
         String staffSid = query.getStaffSid();
-        List<BaseMiddleListVo> list = baseMapper.selectMiddleList(staffSid);
+        List<BaseMiddleListVo> list = new ArrayList<>();
+        //查询用户sid
+        ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid);
+        if(sysUserVoResultBean.getSuccess()){
+            list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid());
+        }
         return rb.success().setData(list);
     }
 }

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

@@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -86,9 +87,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
         }
         baseVehicleService.updateById(baseVehicle);
-        ////ToDo:推送财务出库单
-        //推送金蝶出库单
+        ////ToDo:推送财务中介单位、推送金蝶客户、推送金蝶出库单
         try {
+            //推送财务供应商
+            BdCustomer bdCustomer = createBdCustomer(baseVehicle, dto);
+            ResultBean resultBeanCustomer = finKingDeeFeign.draftBdCustomer(bdCustomer);
+            //推送财务中介单位
+            BdCustomer bdMiddle = createBdMiddle(baseVehicle, dto);
+            ResultBean resultBeanMiddle = finKingDeeFeign.draftBdCustomer(bdMiddle);
             SalOutStock salOutStock = createSalOutStock(baseVehicle, dto);
             ResultBean resultBean1 = finKingDeeFeign.draftSalOutStock(salOutStock);
         } catch (Exception e) {
@@ -98,19 +104,48 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
+    private BdCustomer createBdCustomer(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
+        BdCustomer bdCustomer = new BdCustomer();
+        bdCustomer.setFNumber(dto.getCustomerNo());
+        ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
+        if (resultBean.getSuccess()) {
+            SysOrganizationVo vo = resultBean.getData();
+            if (vo != null) {
+                bdCustomer.setTOrgIds(vo.getOrgCode());
+            }
+        }
+        bdCustomer.setFName(dto.getCustomerName());
+        return bdCustomer;
+    }
+
+    private BdCustomer createBdMiddle(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
+        BdCustomer bdCustomer = new BdCustomer();
+        bdCustomer.setFNumber(dto.getMiddleCodeOne());
+        ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
+        if (resultBean.getSuccess()) {
+            SysOrganizationVo vo = resultBean.getData();
+            if (vo != null) {
+                bdCustomer.setTOrgIds(vo.getOrgCode());
+            }
+        }
+        bdCustomer.setFName(dto.getMiddleOne());
+        return bdCustomer;
+    }
+
     private SalOutStock createSalOutStock(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
         SalOutStock salOutStock = new SalOutStock();
         //日期
         salOutStock.setFDate(baseVehicle.getCreateTime().toString());
         //分公司id
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
-        if (!resultBean.getSuccess()) {
+        if (resultBean.getSuccess()) {
             SysOrganizationVo vo = resultBean.getData();
             if (vo != null) {
                 salOutStock.setFSaleOrgId(vo.getOrgCode());
             }
         }
         //客户
+        salOutStock.setFCustomerID(dto.getCustomerNo());
         //销售部门id
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部");
         if (resultBean1.getSuccess()) {
@@ -120,12 +155,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         //项目类别key和项目类别type
-        salOutStock.setF_PAEZ_AssistantType(dto.getType());
+        salOutStock.setF_PAEZ_AssistantType("payType");
         salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey());
         //业务员
 
         //中介单位
-        salOutStock.setF_PAEZ_Base(dto.getMiddleOne());
+        salOutStock.setF_PAEZ_Base(dto.getMiddleCodeOne());
 
         //物料列表
         List<SalOutStock.FEntity> fEntityList = new ArrayList<>();
@@ -134,7 +169,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //单价
         fEntity.setFPrice(dto.getPrice());
         //物料编码
-        //批号
+        fEntity.setFMaterialID(dto.getVinNo());
         //仓库id
         ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
         fEntity.setFStockID(voResultBean.getData().getWarehouseCode());

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,5 +16,7 @@ public class CrmCustomerTempListVo implements Vo {
     private String name;
     private String sid;
     private String mobile;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -207,7 +207,7 @@
     </select>
 
     <select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
-        select ct.name,ct.sid,ct.mobile
+        select ct.name,ct.sid,ct.mobile,ct.customerNo
         from crm_customer_temp ct
         where createOrgSid = #{orgSid}
           and staffSid = #{staffSid}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -570,7 +570,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
 //        Map<String, String> map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
         customerTemp.setCreateBySid(dto.getUserSid());
         customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
-        customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+        customerTemp.setCreateOrgSid(orgSid);
+//        customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
 //        customerTemp.setCustomerNo(map.get("code"));
         customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");
         customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照");
@@ -757,7 +759,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         dto.fillEntity(crmCustomerTemp);
         crmCustomerTemp.setCreateBySid(dto.getUserSid());
         crmCustomerTemp.setStaffSid(sysUserInfoVo.getStaffSid());
-        crmCustomerTemp.setCreateOrgSid(sysUserInfoVo.getOrgSid());
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+//        crmCustomerTemp.setCreateOrgSid(sysUserInfoVo.getOrgSid());
+        crmCustomerTemp.setCreateOrgSid(orgSid);
         /*Map<String, String> map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo);
         crmCustomerTemp.setCustomerNo(map.get("code"));*/
         ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java

@@ -11,18 +11,18 @@ public class BdCustomer {
    /* @JsonProperty("FCreateOrgId")
     private String FCreateOrgId;*/
     /*客户名称:FName  (必填项)*/
-    @NotBlank
+    @NotBlank( message = "FName不能为空")
     @JsonProperty("FName")
     public String FName;
     /*客户编码:FName  (必填项)*/
-    @NotBlank
+    @NotBlank(message = "FNumber不能为空")
     @JsonProperty("FNumber")
     public String FNumber;
     /**
      * 目标组织:TOrgId
      */
-    @JsonProperty("TOrgId")
-    @NotBlank
+    @JsonProperty("TOrgIds")
+    @NotBlank(message = "TOrgIds不能为空")
     public String TOrgIds;
     /**
      * 备注

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdmaterial/BdMaterial.java

@@ -30,15 +30,15 @@ public class BdMaterial {
     /**
      *物料分组:FMaterialGroup  (必填项)
      */
-    /*@NotBlank(message = "物料分组:FMaterialGroup (必填项)")
+    @NotBlank(message = "物料分组:FMaterialGroup (必填项)")
     @JsonProperty("FMaterialGroup")
-    public String FMaterialGroup;*/
-    @NotBlank(message = "物料分组:FMaterialGroupType (必填项)")
+    public String FMaterialGroup;
+   /* @NotBlank(message = "物料分组:FMaterialGroupType (必填项)")
     @JsonProperty("FMaterialGroupType")
     public String FMaterialGroupType;
     @NotBlank(message = "物料分组:FMaterialGroupKey (必填项)")
     @JsonProperty("FMaterialGroupKey")
-    public String FMaterialGroupKey;
+    public String FMaterialGroupKey;*/
     /**
      *车辆类型:F_PAEZ_Base  (必填项)
      */

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkinstock/StkInStock.java

@@ -85,8 +85,8 @@ public class StkInStock {
          */
         @NotBlank
         public String wlfz;
-        @NotBlank
-        public String wlfzType;
+       /* @NotBlank
+        public String wlfzType;*/
         /**
          * 车辆类型
          */

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@@ -135,7 +135,6 @@ public class StkTransferDirect {
      * FBillEntry
      */
     @JsonProperty("FBillEntry")
-    @NotBlank
     public List<FBillEntry> FBillEntry=new ArrayList<>();
     public final static StkTransferDirect stkTransferDirect = new StkTransferDirect();
     static {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java

@@ -8,11 +8,11 @@ public class KingDeeConfig {
     /**
      * 登录金蝶的账户信息 20211011
      */
-    public static String acctID = "61654d8e138fe6";
+   // public static String acctID = "61654d8e138fe6";
     /**
      * 登录金蝶的账户信息 2022010测试
      */
-   // public static String acctID = "61dce6601125a0";
+    public static String acctID = "61dce6601125a0";
     /**
      * 登录金蝶的账户信息
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java

@@ -1,13 +1,17 @@
 package com.yxt.anrui.fin.biz.kingdee.bdcustomer;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
+import com.yxt.anrui.fin.api.kingdee.KingDeeCode;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
+import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig;
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -41,38 +45,76 @@ public class BdCustomerService extends FinKingDeeService {
         //bdCustomer=BdCustomer.createBdCustomer();
         ResultBean rb=ResultBean.fireFail();
         try {
-            //业务表的主表数据集合
-            Map<String,String> map_fEntityModel_= object2Map(bdCustomer);
-            //准备 物料列表的数据 ForEntryBill
-            String kingDeeData = BdCustomerCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_);
-            ResultBean<String> resultBean = accessKingDeeInterface(
-                    KingDeeBillId.BD_CUSTOMER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+            String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_CUSTOMER.getID(), bdCustomer.getFNumber());
+            ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_CUSTOMER.getID(), getKDForNumbers,
+                    KingDeeBillUrl.VIEW_URL.getURL());
+            JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString());
+            JSONObject result = (JSONObject)jsonObject.get("Result");
+            JSONObject responseStatus = (JSONObject)result.get("ResponseStatus");
+            String custId="";
+            if(responseStatus==null){//不存在客户 //新增客户
+                String vie_result =kingDataInfoByNumber.getData();
+                jsonObject = JSONObject.parseObject(vie_result);
+                JSONObject result1 = (JSONObject)jsonObject.get("Result");
+                JSONObject Result2 = (JSONObject)result1.get("Result");
+                Integer Id = (Integer)Result2.get("Id");
+                custId= Id+"";  //  return  rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg());
+            }else{
+                //业务表的主表数据集合
+                Map<String,String> map_fEntityModel_= object2Map(bdCustomer);
+                //准备 物料列表的数据 ForEntryBill
+                String kingDeeData = BdCustomerCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_);
+                ResultBean<String> resultBean = accessKingDeeInterface(
+                        KingDeeBillId.BD_CUSTOMER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+                String vie_result =resultBean.getData();
+                jsonObject = JSONObject.parseObject(vie_result);
+                JSONObject result1 = (JSONObject)jsonObject.get("Result");
+                Integer Id = (Integer)result1.get("Id");
+                custId= Id+"";
+                String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.BD_CUSTOMER.getID());
+                ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_CUSTOMER.getID(),  submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());
+                if(!resultBean1.getSuccess()){
+                    log.info("客户提交失败!");
+                    return rb.setMsg("客户提交失败!");
+                }
+                log.info("客户提交成功!");
 
-            String submitKD = getSubmitKD(resultBean.getData(),KingDeeBillId.BD_CUSTOMER.getID());
-            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_CUSTOMER.getID(),  submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());
-            if(!resultBean1.getSuccess()){
-                log.info("客户提交失败!");
-                return rb.setMsg("客户提交失败!");
+                String auditKD = getAuditKD(resultBean.getData(),KingDeeBillId.BD_CUSTOMER.getID());
+                ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.BD_CUSTOMER.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL());
+                if(!resultBean2.getSuccess()){
+                    log.info("客户审核失败!");
+                    return rb.setMsg("客户审核失败!");
+                }
+                log.info("客户审核成功!");
             }
-            log.info("客户提交成功!");
 
-            String auditKD = getAuditKD(resultBean.getData(),KingDeeBillId.BD_CUSTOMER.getID());
-            ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.BD_CUSTOMER.getID(), auditKD,KingDeeBillUrl.AUDIT_URL.getURL());
-            if(!resultBean2.getSuccess()){
-                log.info("客户审核失败!");
-                return rb.setMsg("客户审核失败!");
+            getKDForNumbers = getGetKDForNumbers(KingDeeBillId.ORG_ORGANIZATIONS.getID(), bdCustomer.getTOrgIds());
+            kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.ORG_ORGANIZATIONS.getID(), getKDForNumbers, KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator,
+                    KingDeeBillUrl.VIEW_URL.getURL());
+            jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString());
+            result = (JSONObject)jsonObject.get("Result");
+            responseStatus = (JSONObject)result.get("ResponseStatus");
+            if(responseStatus!=null){//不存在分公司 //新增分公司
+                return  rb.setCode(KingDeeCode.NOTEXIST.getCode()).setMsg(KingDeeCode.NOTEXIST.getMsg());
             }
-            log.info("客户审核成功!");
-
-            String allocate = getAllocate(resultBean.getData(),bdCustomer.getTOrgIds(),KingDeeBillId.BD_CUSTOMER.getID());
+            String vie_result =kingDataInfoByNumber.getData();
+            jsonObject = JSONObject.parseObject(vie_result);
+            JSONObject result1 = (JSONObject)jsonObject.get("Result");
+            JSONObject Result2 = (JSONObject)result1.get("Result");
+            Integer Id = (Integer)Result2.get("Id");
+            String id= Id+"";
+            String allocate =getAllocateTempJson(KingDeeBillId.BD_CUSTOMER.getID(),custId,id);
+            /* getAllocate(getSubmitKDTempJson(KingDeeBillId.BD_CUSTOMER.getID(),id),
+                    bdCustomer.getTOrgIds(),KingDeeBillId.BD_CUSTOMER.getID());*/
             ResultBean<String> resultBean3 = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),allocate,KingDeeBillUrl.ALLOCATE_URL.getURL());
+
             if(!resultBean3.getSuccess()){
                 log.info("客户分配失败!");
                 return rb.setMsg("客户分配失败!");
             }
             log.info("客户分配成功!");
 
-            return resultBean;
+            return resultBean3;
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -76,7 +76,7 @@ public class BdMaterialService extends FinKingDeeService {
     private List<KeyItem> getKeyItems() {
         List<KeyItem> params=new ArrayList<>();
         params.add(new KeyItem("FCategoryID","存货类别") );
-        params.add(new KeyItem("FMaterialGroup","物料分组") );
+       /* params.add(new KeyItem("FMaterialGroup","物料分组") );*/
         params.add(new KeyItem("F_PAEZ_Base","车辆类型") );
         params.add(new KeyItem("F_PAEZ_Base2","车辆系别") );
         params.add(new KeyItem("F_PAEZ_Base3","车辆马力") );

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java

@@ -99,8 +99,7 @@ public class STKInStockService extends FinKingDeeService {
         bdMaterial.setFName(f.getFMaterialId());
         bdMaterial.setF_PAEZ_BaseKey(f.getCllx());
         bdMaterial.setF_PAEZ_BaseType(f.getCllxType());
-        bdMaterial.setFMaterialGroupKey(f.getWlfz());
-        bdMaterial.setFMaterialGroupType(f.getWlfzType());
+        bdMaterial.setFMaterialGroup(f.getWlfz());
         bdMaterial.setTOrgIds(stkInStock.getTOrgId());
         List<BdMaterial> list=new ArrayList<>();
         list.add(bdMaterial);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java

@@ -1,14 +1,11 @@
 package com.yxt.anrui.portal.api.sysstaffinfo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @Author dimengzhe
  * @Date 2022/2/11 16:12

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -530,10 +530,23 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if(sysStaffOrg == null){
             ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid);
             sysStaffOrg = staffOrgResultBean.getData();
+            if(sysStaffOrg == null){
+                sysStaffOrg = new SysStaffOrg();
+                sysStaffOrg.setStaffSid(sid);
+                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+                sysStaffOrg.setManageType("3");
+                sysStaffOrgService.insert(sysStaffOrg);
+            }else{
+                BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+                sysStaffOrg.setManageType("3");
+                sysStaffOrgService.updateById(sysStaffOrg);
+            }
+        }else{
+            BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+            sysStaffOrg.setManageType("3");
+            sysStaffOrgService.updateById(sysStaffOrg);
         }
-        BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
-        sysStaffOrg.setManageType("3");
-        sysStaffOrgService.updateById(sysStaffOrg);
+
         //更新员工的关联的岗位信息
         SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
         SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid());
@@ -596,8 +609,18 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
             SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sid, orgSid, type);
             SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid());
-            sysStaffinfoDetailsVo.setSysStaffOrg(sysStaffOrgDetailsVo);
-            sysStaffinfoDetailsVo.setSysStaffPost(sysStaffPostDetailsVo);
+            if(sysStaffOrgDetailsVo != null){
+                sysStaffinfoDetailsVo.setSysStaffOrg(sysStaffOrgDetailsVo);
+            }else{
+                sysStaffinfoDetailsVo.setSysStaffOrg(new SysStaffOrgDetailsVo());
+            }
+            if(sysStaffPostDetailsVo != null){
+                sysStaffinfoDetailsVo.setSysStaffPost(sysStaffPostDetailsVo);
+            }else{
+                sysStaffinfoDetailsVo.setSysStaffPost(new SysStaffPostDetailsVo());
+            }
+
+
 
         }
         return sysStaffinfoDetailsVo;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDetailsVo.java

@@ -29,4 +29,6 @@ public class MiddlemanDetailsVo implements Vo {
     @ApiModelProperty(value = "用户sid")
     @JsonProperty("userSid")
     private String createBySid;
+
+    private String companySid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/intermediary/MiddlemanDto.java

@@ -22,6 +22,8 @@ public class MiddlemanDto implements Dto {
     private String mobile;
     @ApiModelProperty("所在单位")
     private String company;
+    @ApiModelProperty("所在单位sid")
+    private String companySid;
     @ApiModelProperty("开户行")
     private String bankName;
     @ApiModelProperty("银行账号")