Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -37,6 +37,7 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
 import com.yxt.anrui.fin.api.finpaymentapply.*;
 import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery;
 import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo;
@@ -52,6 +53,7 @@ import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
@@ -139,6 +141,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     @Autowired
     private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
     @Autowired
+    private FinCompanyInvoicingService finCompanyInvoicingService;
+    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private ScmCollectionRebateFeign scmCollectionRebateFeign;
@@ -395,6 +399,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
         //网关
+        finPaymentapply = fetchBySid(businessSid);
         if ("1".equals(finPaymentapply.getIsVeh())) {
             if ("1".equals(finPaymentapply.getIsSettle())) {
                 variables.put("isAdj", false);
@@ -586,6 +591,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
                 //使用组织
                 finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                //采购系统
+                FinCompanyInvoicing finCompanyInvoicing = finCompanyInvoicingService.fetchBySid(finPaymentapply.getPayCompanySid());
+                finPaymentrecordDto.setPurchaseSystemSid(finCompanyInvoicing.getPurchaseSystemSid());
+                finPaymentrecordDto.setPurchaseSystemName(finCompanyInvoicing.getPurchaseSystemName());
                 //备注
                 finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                 List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();

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

@@ -391,6 +391,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
                 FinPaymentapplyDetails finPaymentapplyDetails = finPaymentapplyDetailsService.fetchBySid(finPaymentrecord.getBusSid());
                 List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
+                scmCollectionRebateDto.setPurchaseSystemSid(finPaymentrecord.getPurchaseSystemSid());
+                scmCollectionRebateDto.setPurchaseSystemName(finPaymentrecord.getPurchaseSystemName());
+                scmCollectionRebateDto.setCostTitleKey(finPaymentrecord.getCostTitleKey());
+                scmCollectionRebateDto.setCostTitleValue(finPaymentrecord.getCostTitleValue());
                 scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
                 scmCollectionRebateDto.setCollectionTypeKey(dto.getPayWayKey());
@@ -1238,6 +1242,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
             FinPaymentapplyDetails finPaymentapplyDetails = finPaymentapplyDetailsService.fetchBySid(finPaymentrecord.getBusSid());
             List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
+            scmCollectionRebateDto.setPurchaseSystemSid(finPaymentrecord.getPurchaseSystemSid());
+            scmCollectionRebateDto.setPurchaseSystemName(finPaymentrecord.getPurchaseSystemName());
+            scmCollectionRebateDto.setCostTitleKey(finPaymentrecord.getCostTitleKey());
+            scmCollectionRebateDto.setCostTitleValue(finPaymentrecord.getCostTitleValue());
             scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
             scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
             scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());