修改

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-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

@@ -596,8 +596,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("银行账号")