优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.base.api.basevehicle;
 
 import com.yxt.common.core.query.Query;
-import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -37,4 +36,6 @@ public class BaseChoiceVehicleQuery implements Query {
 
     @ApiModelProperty("当前组织机构的全路径sid")
     private String orgPath;
+
+    private String purchaseSystemSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -46,4 +46,9 @@ public class BaseVehicleActualSales extends BaseEntity {
 
     @ApiModelProperty("申请人的所在部门sid全路径")
     private String orgSidPath;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -55,4 +55,9 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
 
     @ApiModelProperty("申请人的组织机构全路径sid")
     private String orgPath;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -60,4 +60,9 @@ public class BaseVehicleActualSalesDto implements Dto {
     private String orgSidPath;
     @ApiModelProperty("前端传")
     private String orgPath;
+
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -13,7 +13,6 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
-import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.*;
@@ -49,7 +48,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@@ -1984,6 +1982,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
+            if(StringUtils.isNotBlank(params.getPurchaseSystemSid())){
+                qw.like("bv.purchaseSystemSid", params.getPurchaseSystemSid());
+            }
             //结算状态：0未买断
             qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
             //库存或调出或内销

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml

@@ -30,7 +30,9 @@
                useOrgName,
                carBrandSid,
                carBrandName,
-               orgSidPath                          as orgPath
+               orgSidPath                          as orgPath,
+        purchaseSystemSid,
+        purchaseSystemName
         from base_vehicle_actual_sales
         where sid = #{sid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleUpdateQuery;
 import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetailsVo;
@@ -20,9 +21,11 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQuery;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto;
+import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService;
 import com.yxt.anrui.base.biz.basevehicleactualpay.BaseVehicleActualPayService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
@@ -71,6 +74,9 @@ import java.util.stream.Collectors;
 @Service
 public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicleActualSalesMapper, BaseVehicleActualSales> {
 
+    @Autowired
+    private BaseManufacturerService baseManufacturerService;
+
     @Autowired
     private BaseVehicleActualDetailsService baseVehicleActualDetailsService;
     @Autowired
@@ -96,6 +102,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
     private FinPaymentrecordFeign finPaymentrecordFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
 
     /**
      * 分页列表
@@ -561,6 +569,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                         finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount());
                         finPaymentrecordDto.setReceiveCompany(v.getAccountName());
                         finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
+                        finPaymentrecordDto.setPurchaseSystemSid(baseVehicleActualSales.getPurchaseSystemSid());
+                        finPaymentrecordDto.setPurchaseSystemName(baseVehicleActualSales.getPurchaseSystemName());
+                        String manufacturerSid = baseVehicleBrandService.selectByManufacturerSid(baseVehicleActualSales.getCarBrandSid());
+                        BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(manufacturerSid);
+                        if (baseManufacturer !=null){
+                            finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
+                        }
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }
 

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

@@ -361,7 +361,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         apPayBill.setFREMARK(finPaymentrecord.getPayRemark());
 //        apPayBill.setFPURCHASEORGID("101");
         //采购部门
-        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.selectByPSid(finPaymentrecord.getCreateOrgSid(), "销售支持部");
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid());
         if (resultBean1.getSuccess()) {
             SysOrganizationVo vo = resultBean1.getData();
             if (vo != null) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -200,7 +200,7 @@
         select *
         from sys_organization
         where psid = #{sid}
-          and name = #{name}
+          and name like concat('%',#{name},'%')
     </select>
 
     <select id="selectOrgSidList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">