拆分推送金蝶财务分公司

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeign.java

@@ -81,6 +81,11 @@ public interface BasePurchaseSystemFeign {
     @ResponseBody
     public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchDetailsByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
 
+    @ApiOperation("根据分公司sid查询采购系统财务分公司编码")
+    @GetMapping("/fetchOrgCodeByUseOrgSid/{useOrgSid}")
+    @ResponseBody
+    public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(@PathVariable("useOrgSid") String useOrgSid);
+
     @ApiOperation("根据部门sid查询采购系统名称")
     @GetMapping("/fetchDetailsByDeptSid/{deptSid}")
     @ResponseBody

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basepurchasesystem/BasePurchaseSystemFeignFallback.java

@@ -75,6 +75,11 @@ public class BasePurchaseSystemFeignFallback implements BasePurchaseSystemFeign
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
 		return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -544,19 +544,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         stkInStock.setFInStockEntry(fInStockEntry);
                         finKingDeeFeign.draftStkInStock(stkInStock);
                         //推送财务供应商信息
+                        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());
-                        if (sysOrganizationVoResultBean1.getSuccess()) {
                                 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);
                         }
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -11,9 +11,11 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
 import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinance;
 import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto;
 import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
+import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
@@ -65,6 +67,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
     private BaseVehicleBrandService baseVehicleBrandService;
     @Resource
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
 
     /**
      * 供应厂商分页列表
@@ -336,6 +340,17 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
+                List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
+                if (data != null){
+                    for (BasePurchaseSystemDetailsVo datum : data) {
+                        BdSupplier bdSupplier = new BdSupplier();
+                        bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
+                        bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
+                        bdSupplier.setFUseOrgId(datum.getOrgCode());
+                        bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
+                        finKingDeeFeign.draftBdSupplier(bdSupplier);
+                    }
+                }else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -343,8 +358,20 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.draftBdSupplier(bdSupplier);
                 }
+            }
         }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
+            List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
+            if (data != null){
+                for (BasePurchaseSystemDetailsVo datum : data) {
+                    BdSupplier bdSupplier = new BdSupplier();
+                    bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
+                    bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
+                    bdSupplier.setFUseOrgId(datum.getOrgCode());
+                    bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
+                    finKingDeeFeign.draftBdSupplier(bdSupplier);
+                }
+            }else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -352,6 +379,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                 finKingDeeFeign.draftBdSupplier(bdSupplier);
             }
+        }
         return rb.success().setMsg("操作成功");
     }
 
@@ -464,6 +492,17 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
+                List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
+                if (data != null){
+                    for (BasePurchaseSystemDetailsVo datum : data) {
+                        BdSupplier bdSupplier = new BdSupplier();
+                        bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
+                        bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
+                        bdSupplier.setFUseOrgId(datum.getOrgCode());
+                        bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
+                        finKingDeeFeign.updateBdSupplier(bdSupplier);
+                    }
+                }else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -471,8 +510,20 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.updateBdSupplier(bdSupplier);
                 }
+            }
         }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
+            List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
+            if (data != null){
+                for (BasePurchaseSystemDetailsVo datum : data) {
+                    BdSupplier bdSupplier = new BdSupplier();
+                    bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
+                    bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
+                    bdSupplier.setFUseOrgId(datum.getOrgCode());
+                    bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
+                    finKingDeeFeign.updateBdSupplier(bdSupplier);
+                }
+            }else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -480,6 +531,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                 finKingDeeFeign.updateBdSupplier(bdSupplier);
             }
+        }
         return rb.success().setMsg("修改成功");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@@ -32,9 +32,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVeh;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturerretwareveh.BaseManufacturerRetwareVehDto;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
 import com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService;
+import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
@@ -96,6 +98,9 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
     private FileUploadComponent fileUploadComponent;
     @Resource
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
+
     private QueryWrapper<BaseManufacturerRetware> createQueryWrapper(BaseManufacturerRetwareQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -282,8 +287,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
     private STKInStockPushPurmrb createPush(BaseVehicle baseVehicle) {
         STKInStockPushPurmrb push=new STKInStockPushPurmrb();
         push.setFMaterialId(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+        if (data != null){
+            push.setUseOrdSid(data.getOrgCode());
+        }else {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicle.getUseOrgSid()).getData();
             push.setUseOrdSid(sysOrganizationVo.getOrgCode());
+        }
         return push;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -846,9 +846,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
         com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
         BaseOutsourcingApplicationDto booad = baseMapper.getBySid(flowTaskVo.getBusinessSid());
-        if (!flowTaskVo.getUserSid().equals(booad.getCreateBySid())){
+        /*if (!flowTaskVo.getUserSid().equals(booad.getCreateBySid())){
             return ResultBean.fireFail().setMsg("操作失败，当前操作人不是发起人，不可终止!");
-        }
+        }*/
         String businessTaskid = booad.getTaskId();
         if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
             BeanUtil.copyProperties(flowTaskVo, fl);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@@ -72,4 +72,6 @@ public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem>
 
 	@Select("select * from base_purchase_system where deptSid = #{deptSid} and sid != #{sid}")
 	BasePurchaseSystemDetailsVo fetchDetailsByDeptSidAndSid(@Param("deptSid") String deptSid,@Param("sid") String sid);
+
+    List<BasePurchaseSystemDetailsVo> fetchOrgCodeByUseOrgSid(String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml

@@ -4,10 +4,23 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
-		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_purchase_system
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemVo">
-		SELECT * FROM base_purchase_system <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_purchase_system
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchOrgCodeByUseOrgSid"
+            resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo">
+        SELECT DISTINCT orgCode
+        FROM base_purchase_system
+        WHERE useOrgSid = #{useOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemRest.java

@@ -101,6 +101,11 @@ public class BasePurchaseSystemRest implements BasePurchaseSystemFeign {
 		return basePurchaseSystemService.fetchDetailsByUseOrgSid(useOrgSid);
 	}
 
+	@Override
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
+		return basePurchaseSystemService.fetchOrgCodeByUseOrgSid(useOrgSid);
+	}
+
 	@Override
 	public ResultBean<BasePurchaseSystemDetailsVo> fetchDetailsByDeptSid(String deptSid) {
 		return basePurchaseSystemService.fetchDetailsByDeptSid(deptSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@@ -140,4 +140,10 @@ public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSy
 		BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = baseMapper.fetchDetailsByDeptSid(deptSid);
 		return rb.success().setData(basePurchaseSystemDetailsVo);
 	}
+
+	public ResultBean<List<BasePurchaseSystemDetailsVo>> fetchOrgCodeByUseOrgSid(String useOrgSid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<BasePurchaseSystemDetailsVo> basePurchaseSystemDetailsVos = baseMapper.fetchOrgCodeByUseOrgSid(useOrgSid);
+		return rb.success().setData(basePurchaseSystemDetailsVos);
+	}
 }

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

@@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign {
 
     @ApiOperation("推送财务客户-否")
     @PostMapping("/sendFinCustomer")
-    public ResultBean sendFinCustomer(@RequestBody String[] customerSids);
+    public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@RequestParam("orgCode") String orgCode);
 
     @ApiOperation("推送财务客户-是")
     @PostMapping("/sendFinCustomerTrue")

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

@@ -37,7 +37,7 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 	}
 
 	@Override
-	public ResultBean sendFinCustomer(String[] customerSids) {
+	public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
 		return null;
 	}
 

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

@@ -73,8 +73,8 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
     }
 
     @Override
-    public ResultBean sendFinCustomer(String[] customerSids) {
+    public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
-        return crmCustomerTempService.sendFinCustomer(customerSids);
+        return crmCustomerTempService.sendFinCustomer(customerSids,orgCode);
     }
 
     @Override

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

@@ -3,6 +3,10 @@ package com.yxt.anrui.crm.biz.crmcustomertemp;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.anrui.crm.api.crmbusiness.AppCrmBusinessInfoVo;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
@@ -104,6 +108,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
 
     public PagerVo<CrmCustomerTemp> listPage(PagerQuery<CrmCustomerTempQuery> pq) {
@@ -1137,7 +1145,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         return rb.success().setData(list);
     }
 
-    public ResultBean sendFinCustomer(String[] customerSids) {
+    public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
         ResultBean rb = ResultBean.fireFail();
         List<BdCustomer> bdCustomers = new ArrayList<>();
         for (String customerSid : customerSids) {
@@ -1145,7 +1153,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             CrmCustomerTemp crmCustomerTemp = fetchBySid(customerSid);
             String createOrgSid = crmCustomerTemp.getCreateOrgSid();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
-            bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            bdCustomer.setTOrgIds(orgCode);
             bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTemp.getMobile());
             bdCustomer.setFNumber(crmCustomerTemp.getCustomerNo());
             bdCustomers.add(bdCustomer);
@@ -1162,8 +1170,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String createOrgSid = crmCustomerTemp.getCreateOrgSid();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
         for (CrmCustomerTempToFin crmCustomerTempToFin : crmCustomerTempToFins) {
+            BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(crmCustomerTempToFin.getVinNo(), createOrgSid).getData();
             BdCustomer bdCustomer = new BdCustomer();
+            BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+            if (data != null){
+                bdCustomer.setTOrgIds(data.getOrgCode());
+            }else {
                 bdCustomer.setTOrgIds(sysOrganizationVo.getOrgCode());
+            }
             bdCustomer.setFName(crmCustomerTemp.getName() + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length() - 8));
             String FNumber = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTempToFin.getVinNo().substring(crmCustomerTempToFin.getVinNo().length() - 8);
             if (FNumber.length() > 30) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
@@ -142,6 +144,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private BdCustomerService bdCustomerService;
     @Autowired
     private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1292,12 +1296,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
         //收款组织
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getCreateDeptSid()).getData();
+        if (data != null){
+            arReceivebill.setFPAYORGID(data.getOrgCode());
+        }else {
             if (resultBean.getSuccess()) {
                 SysOrganizationVo vo = resultBean.getData();
                 if (vo != null) {
                     arReceivebill.setFPAYORGID(vo.getOrgCode());
                 }
             }
+        }
         //销售部门
         if (StringUtils.isNotBlank(confirmation.getCreateDeptSid())) {
             resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
 import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
 import com.yxt.anrui.fin.api.finmanufacturerbank.*;
@@ -74,6 +76,8 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
     private CNBankcntService cnBankcntService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     public PagerVo<FinManufacturerBankVo> listPageVo(PagerQuery<FinManufacturerBankQuery> pq) {
         FinManufacturerBankQuery query = pq.getParams();
@@ -118,6 +122,18 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                 return rb.setMsg("该公司已存在该银行账号的数据");
             }
             baseMapper.insert(finManufacturerBank);
+            List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
+            if (data != null){
+                for (BasePurchaseSystemDetailsVo datum : data) {
+                    CNBankacnt cnBankacnt = new CNBankacnt();
+                    cnBankacnt.setFCreateOrgId(datum.getOrgCode());
+                    cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
+                    cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
+                    cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
+                    cnBankacnt.setFName(finManufacturerBank.getAccountName());
+                    cnBankcntService.draftCNBankcnt(cnBankacnt);
+                }
+            }else {
                 CNBankacnt cnBankacnt = new CNBankacnt();
                 String useOrgSid = finManufacturerBank.getUseOrgSid();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -127,6 +143,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                 cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
                 cnBankacnt.setFName(finManufacturerBank.getAccountName());
                 cnBankcntService.draftCNBankcnt(cnBankacnt);
+            }
             return rb.success().setMsg("保存成功");
         } else {
             FinManufacturerBank finManufacturerBank = fetchBySid(sid);
@@ -139,6 +156,18 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             }
             BeanUtil.copyProperties(dto, finManufacturerBank);
             baseMapper.updateById(finManufacturerBank);
+            List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
+            if (data != null){
+                for (BasePurchaseSystemDetailsVo datum : data) {
+                    CNBankacnt cnBankacnt = new CNBankacnt();
+                    cnBankacnt.setFCreateOrgId(datum.getOrgCode());
+                    cnBankacnt.setBankName(finManufacturerBank.getDepositBank());
+                    cnBankacnt.setFNumber(finManufacturerBank.getBankAccount());
+                    cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
+                    cnBankacnt.setFName(finManufacturerBank.getAccountName());
+                    cnBankcntService.updateCNBankacnt(cnBankacnt);
+                }
+            }else {
                 CNBankacnt cnBankacnt = new CNBankacnt();
                 String useOrgSid = finManufacturerBank.getUseOrgSid();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -148,6 +177,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                 cnBankacnt.setFBANKID(finManufacturerBank.getDepositBankKey());
                 cnBankacnt.setFName(finManufacturerBank.getAccountName());
                 cnBankcntService.updateCNBankacnt(cnBankacnt);
+            }
             return rb.success().setMsg("修改成功");
         }
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -34,6 +34,8 @@ import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -118,7 +120,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
-    private DocPdfComponent docPdfComponent;
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -245,24 +247,30 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
 //        apPayBill.setFRECTUNIT("010001");
         apPayBill.setFRECTUNIT(finPaymentrecord.getPayCode());
         apPayBill.setFREMARK(finPaymentrecord.getPayRemark());
-        //采购组织
-        //根据使用组织查询采购组织的编码
-        ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
-        if (resultBean.getSuccess()) {
-            SysOrganizationVo vo = resultBean.getData();
-            if (vo != null) {
-                apPayBill.setFPURCHASEORGID(vo.getOrgCode());
-            }
-        }
 //        apPayBill.setFPURCHASEORGID("101");
         //采购部门
+        SysOrganizationVo vo = new SysOrganizationVo();
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
         if (resultBean1.getSuccess()) {
-            SysOrganizationVo vo = resultBean1.getData();
+            vo = resultBean1.getData();
             if (vo != null) {
                 apPayBill.setFPURCHASEDEPTID(vo.getOrgCode());
             }
         }
+        //采购组织
+        BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(vo.getSid()).getData();
+        if (data != null) {
+            apPayBill.setFPURCHASEORGID(data.getOrgCode());
+        } else {
+            //根据使用组织查询采购组织的编码
+            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid());
+            if (resultBean.getSuccess()) {
+                SysOrganizationVo vo1 = resultBean.getData();
+                if (vo1 != null) {
+                    apPayBill.setFPURCHASEORGID(vo1.getOrgCode());
+                }
+            }
+        }
         //        apPayBill.setFPURCHASEDEPTID("05.04");
         //应付类别默认005定金
        /* 001整车、002外采、005定金、010牵引系列、011自卸系列、012载货系列、013搅拌车系列、014起重机系列、015专用车系列、016欧马可系列、017LNG系列 022大客户系列

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -3,6 +3,8 @@ package com.yxt.anrui.scm.biz.scmwarehouse;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@@ -45,6 +47,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
 
     public PagerVo<ScmWarehouse> listPage(PagerQuery<ScmWarehouseQuery> pq) {
         ScmWarehouseQuery query = pq.getParams();
@@ -115,6 +119,27 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         this.saveOrUpdate(entity);
         //推送金蝶仓库
         if ("ARZTCK".equals(dto.getGressionCode())) {
+            List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(dto.getUseOrgSid()).getData();
+            if (data != null) {
+                for (BasePurchaseSystemDetailsVo datum : data) {
+                    BDStock bdStock1 = new BDStock();
+                    //推送在途仓库
+                    bdStock1.setFCreateOrgId(datum.getOrgCode());
+                    bdStock1.setFName("在途仓库");
+                    bdStock1.setFNumber("ARZTCK");
+                    BDStock bdStock2 = new BDStock();
+                    //推送正式仓库
+                    bdStock2.setFCreateOrgId(datum.getOrgCode());
+                    bdStock2.setFName("正式仓库");
+                    bdStock2.setFNumber("ARZSCK");
+                    try {
+                        finKingDeeFeign.drafBDtStock(bdStock1);
+                        finKingDeeFeign.drafBDtStock(bdStock2);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else {
                 BDStock bdStock1 = new BDStock();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
                 //推送在途仓库
@@ -134,6 +159,7 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
                 }
             }
         }
+    }
 
     public ScmWarehouseVo fetchByIdVo(String id) {
         ScmWarehouse entity = this.fetchById(id);