Merge remote-tracking branch 'origin/master'

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

@@ -759,6 +759,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             finPaymentrecordDto.setCost(String.valueOf(booad.getDeposit().intValue()));
             finPaymentrecordDto.setAccountsReceive(String.valueOf(booad.getDeposit().intValue()));
         }
+        //应付类别
+        finPaymentrecordDto.setDictTypeCode("payCostType");
+        if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
+         finPaymentrecordDto.setDictKey("002");
+        } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setDictKey("005");
+        }
         //供应商编码
         String purchasingUnitSid = booad.getPurchasingUnitSid();
         BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(purchasingUnitSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -698,6 +698,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
                     finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode());
                     finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.DJ_TYPE.getRemarks());
+                    finPaymentrecordDto.setDictTypeCode("payCostType");
+                    finPaymentrecordDto.setDictKey("005");
                     finPaymentrecordDto.setPayRemark(busVehicleApply.getPayRemarks());
                     finPaymentrecordDto.setCreateBySid(busVehicleApply.getCreateBySid());
                     finPaymentrecordDto.setRemarks("排产订金");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -738,6 +738,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                             finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别
                             finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称
                             finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称
+                            finPaymentrecordDto.setDictTypeCode("payCostType");
+                            finPaymentrecordDto.setDictKey("002");
                             finPaymentrecordDto.setReceiveBank(outsourcingApplicationDetailsVo.getDepositBankName());
                             finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号
                             finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());