1、优化合同收款凭证生成逻辑。
This commit is contained in:
parent
0b16eaa8a2
commit
f772afdec6
|
@ -594,6 +594,9 @@ public class ICoreServiceImpl implements ICoreService {
|
|||
VoucherData.Voucher.Detail.Ass ass_D0003 = null;
|
||||
|
||||
boolean flat_D0004=false;
|
||||
AeConfVoucherTemplateAssistEntity templateAssistEntity_004=null;
|
||||
String key_004=null;
|
||||
String value_004=null;
|
||||
|
||||
for (Map.Entry<String, String> assByBdCodeEntry : AssByBdCodeMap.entrySet()) {
|
||||
|
||||
|
@ -609,6 +612,9 @@ public class ICoreServiceImpl implements ICoreService {
|
|||
|
||||
if ("350499bebe41426eaf29c603ca54fd88".equals(createVoucherVO.getMdmId()) && "D0004".equals(value) && ass_D0003 == null) {
|
||||
flat_D0004 = true;
|
||||
key_004 = key;
|
||||
value_004 = value;
|
||||
templateAssistEntity_004=templateAssistEntity;
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -656,6 +662,27 @@ public class ICoreServiceImpl implements ICoreService {
|
|||
assEntity.setCheckvaluecode("17");
|
||||
assEntity.setCheckvaluename("无");
|
||||
assList.add(assEntity);
|
||||
}else {
|
||||
//不是06 07的查询辅助核算
|
||||
System.out.println(templateAssistEntity_004);//去单据辅助核算
|
||||
Map<String, String> assValu_004 = getAssValue(templateAssistEntity_004, dataValue, orgBookVO);
|
||||
|
||||
if (assValu_004.size() != 0) {
|
||||
VoucherData.Voucher.Detail.Ass assEntity = new VoucherData.Voucher.Detail.Ass();
|
||||
assEntity.setChecktypecode(value_004);
|
||||
assEntity.setCheckvalueid(assValu_004.get("pk"));
|
||||
assEntity.setCheckvaluecode(assValu_004.get("code"));
|
||||
assEntity.setCheckvaluename(assValu_004.get("name"));
|
||||
//类型
|
||||
for (AeConfBdAccsubjEntity aeConfBdAccsubjEntity : aeConfBdAccsubjEntities) {
|
||||
if (value_004.equals(aeConfBdAccsubjEntity.getBdcode())) {
|
||||
assEntity.setChecktypename(aeConfBdAccsubjEntity.getBdname());
|
||||
break;
|
||||
}
|
||||
}
|
||||
assList.add(assEntity);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue