Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
b18d4b68ee
|
@ -235,15 +235,15 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
|
|||
qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
|
||||
formShowParameter.getListFilterParameter().setQFilters(qFilter);
|
||||
}else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单
|
||||
DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");
|
||||
// DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");//往来单位
|
||||
DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
|
||||
List<QFilter> qFilter = new ArrayList<>();
|
||||
if(billpayerid!=null){
|
||||
/* if(billpayerid!=null){
|
||||
Long payerid = billpayerid.getLong("id");
|
||||
//qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid));
|
||||
qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商
|
||||
|
||||
}
|
||||
}*/
|
||||
if(costcompany!=null){
|
||||
Long companyId = costcompany.getLong("id");
|
||||
qFilter.add(new QFilter("zcgj_accountorg", QCP.equals, companyId));
|
||||
|
|
Loading…
Reference in New Issue