yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

推送金蝶，用途内容在列表的备注中填写

master
God 2 years ago
parent
721be5e1c2
commit
a301157d17
4 changed files with 30 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java
  3. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
  4. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -49,6 +49,8 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@ -114,6 +116,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
@ -426,6 +430,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
@ -438,6 +444,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getTrailerAmount());
creditResultDetailDto.setUseTo(CwSystemYT.GCDTK.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.GCDTK.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -448,6 +456,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getBondAmounts());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.BOND_AMOUNTS.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//保险保证金
@ -456,6 +466,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositPremium());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//落户保证金
@ -464,6 +476,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositSettle());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_SETTLE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//服务费
@ -472,6 +486,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType());
creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//代收意外险
@ -480,6 +496,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//上牌费、运管费
@ -492,6 +510,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SHANGPAI_YUNGUAN.getType());
creditResultDetailDto.setExTaxMoney(add.toString());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SHANGPAI_YUNGUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//其它费用
@ -500,6 +520,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getOtherAmount());
creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.OTHER_AMOUNT.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//补车价
@ -508,6 +530,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getVehOtherPrice());
creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.VEH_OTHER_PRICE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//留购价
@ -516,6 +540,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.NOMINAL_PRICE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}*/
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java
View File

@ -45,5 +45,7 @@ public class CapitalCreditResult {
public String exTaxMoney;
@ApiModelProperty("用途")
public String useTo;
@ApiModelProperty("备注")
public String remarks;
}
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
View File

@ -103,6 +103,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
m.put("FCOSTDEPARTMENTID", c.getDearDept());
m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
m.put("F_PAEZ_Assistant1", c.getUseTo());
m.put("FCOMMENT",c.getRemarks());
collectionDetailMap.add(m);
}
return rb.success().setData(collectionDetailMap);

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json
View File

@ -25,7 +25,7 @@
"F_PMZC_Assistant2": {
"FNumber": ""
},
"FCOMMENT": "",
"FCOMMENT": "@KD_FCOMMENT",
"FSourceBillNo": "",
"FCREATEINVOICE": "false",
"FIVAmountFor": "0",

Write Preview
Loading…
Cancel
Save