Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
58681bd418
File diff suppressed because it is too large
Load Diff
|
@ -109,7 +109,7 @@ public class PaymentapplyCopyPlugin extends AbstractBillPlugIn implements Plugin
|
|||
srcBillNo = this.getView().getParentView().getPageCache().get("srcBillNo");//列表获取的缓存信息
|
||||
}
|
||||
QFilter f2 = new QFilter("billno", QCP.equals, srcBillNo);
|
||||
DynamicObject ec_paymentapply = BusinessDataServiceHelper.loadSingle("ec_paymentapply", "id,entryentity,entryentity.bankaccount", new QFilter[]{f2});
|
||||
DynamicObject ec_paymentapply = BusinessDataServiceHelper.loadSingle("ec_paymentapply", "id,billname,entryentity,entryentity.bankaccount", new QFilter[]{f2});
|
||||
if (ec_paymentapply != null) {
|
||||
DynamicObjectCollection entryEntityCollection = ec_paymentapply.getDynamicObjectCollection("entryentity");//合同付款信息分录
|
||||
for (int i = 0; i < entryEntityCollection.size(); i++) {
|
||||
|
@ -117,6 +117,12 @@ public class PaymentapplyCopyPlugin extends AbstractBillPlugIn implements Plugin
|
|||
String bankAccount = entryEntity.getString("bankaccount");//收款账号
|
||||
this.getModel().setValue("bankaccount", bankAccount, i);
|
||||
}
|
||||
String billName = ec_paymentapply.getString("billname");//单位名称
|
||||
if (billName != null) {
|
||||
this.getModel().setValue("billname", billName + "-复制");
|
||||
} else {
|
||||
this.getModel().setValue("billname", "-复制");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue