|
@@ -25,14 +25,13 @@ public class ErFindRelationBillUtils {
|
|
Map<String ,Set<Object>> relationBillMap = new HashMap<>();
|
|
Map<String ,Set<Object>> relationBillMap = new HashMap<>();
|
|
// 查询付款处理
|
|
// 查询付款处理
|
|
Set<Object> casPaybillSet = getBotpRelationId(billType, BillTypeConstants.CAS_PAYBILL, Long.parseLong(billId), true);
|
|
Set<Object> casPaybillSet = getBotpRelationId(billType, BillTypeConstants.CAS_PAYBILL, Long.parseLong(billId), true);
|
|
|
|
+ // 凭证
|
|
|
|
+ Set<Long> voucherSet = DapVoucherUtil.getBuildData(Collections.singletonList(Long.valueOf(billId)), billType);
|
|
|
|
+ relationBillMap.put(BillTypeConstants.GL_VOUCHER,voucherSet.stream().map(r->(Object)r).collect(Collectors.toSet()));
|
|
|
|
|
|
if(CollectionUtils.isNotEmpty(casPaybillSet)){
|
|
if(CollectionUtils.isNotEmpty(casPaybillSet)){
|
|
relationBillMap.put(BillTypeConstants.CAS_PAYBILL,casPaybillSet);
|
|
relationBillMap.put(BillTypeConstants.CAS_PAYBILL,casPaybillSet);
|
|
-
|
|
|
|
- // 凭证
|
|
|
|
- Set<Long> voucherSet = DapVoucherUtil.getBuildVch(casPaybillSet, BillTypeConstants.CAS_PAYBILL);
|
|
|
|
- relationBillMap.put(BillTypeConstants.GL_VOUCHER,voucherSet.stream().map(r->(Object)r).collect(Collectors.toSet()));
|
|
|
|
-
|
|
|
|
|
|
+ //Set<Long> voucherSet = DapVoucherUtil.getBuildData(casPaybillSet, BillTypeConstants.CAS_PAYBILL);
|
|
//电子回单
|
|
//电子回单
|
|
Set<Object> casPayBillElecReceipt = getCasPayBillElecReceipt(casPaybillSet);
|
|
Set<Object> casPayBillElecReceipt = getCasPayBillElecReceipt(casPaybillSet);
|
|
relationBillMap.put(BillTypeConstants.BEI_ELECRECEIPT,casPayBillElecReceipt);
|
|
relationBillMap.put(BillTypeConstants.BEI_ELECRECEIPT,casPayBillElecReceipt);
|