报销单切换费用承担公司报错问题修复
This commit is contained in:
		
							parent
							
								
									effc1455f0
								
							
						
					
					
						commit
						040f25551f
					
				| 
						 | 
					@ -27,6 +27,7 @@ public class AutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements Plug
 | 
				
			||||||
        //costcompany
 | 
					        //costcompany
 | 
				
			||||||
        Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
 | 
					        Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
 | 
					        if(company != null){
 | 
				
			||||||
            DynamicObject companyObj = (DynamicObject)company;
 | 
					            DynamicObject companyObj = (DynamicObject)company;
 | 
				
			||||||
            Long companyId = companyObj.getLong("id");
 | 
					            Long companyId = companyObj.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(companyId)){
 | 
					            if(OrgCheckUtils.isKS(companyId)){
 | 
				
			||||||
| 
						 | 
					@ -58,6 +59,7 @@ public class AutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements Plug
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        super.propertyChanged(e);
 | 
					        super.propertyChanged(e);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -122,7 +122,6 @@ public class CostcompanyDefaultPlugin  extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void itemClick(ItemClickEvent evt) {
 | 
					    public void itemClick(ItemClickEvent evt) {
 | 
				
			||||||
        //费用项目设置为默认
 | 
					        //费用项目设置为默认
 | 
				
			||||||
 | 
					 | 
				
			||||||
        Object company = this.getModel().getValue("costcompany");//核算组织
 | 
					        Object company = this.getModel().getValue("costcompany");//核算组织
 | 
				
			||||||
        if (company!=null && evt.getItemKey().equals("addloancheck1")) {
 | 
					        if (company!=null && evt.getItemKey().equals("addloancheck1")) {
 | 
				
			||||||
            DynamicObject companyObj = (DynamicObject)company;
 | 
					            DynamicObject companyObj = (DynamicObject)company;
 | 
				
			||||||
| 
						 | 
					@ -163,7 +162,9 @@ public class CostcompanyDefaultPlugin  extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
        //当前所在的组织是属于矿山下的  costcompany
 | 
					        //当前所在的组织是属于矿山下的  costcompany
 | 
				
			||||||
        //costcompany 费用承担公司
 | 
					        //costcompany 费用承担公司
 | 
				
			||||||
        DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
					        Object costcompanyObjVal = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompanyObjVal!=null){
 | 
				
			||||||
 | 
					            DynamicObject costcompany =  (DynamicObject)costcompanyObjVal;
 | 
				
			||||||
            long costcompanyId = costcompany.getLong("id");
 | 
					            long costcompanyId = costcompany.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
					            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
				
			||||||
                EntryProp entryProp = e.getEntryProp();
 | 
					                EntryProp entryProp = e.getEntryProp();
 | 
				
			||||||
| 
						 | 
					@ -197,3 +198,4 @@ public class CostcompanyDefaultPlugin  extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -73,6 +73,8 @@ public class DailyloanbillExpAccPlugin extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
        //当前所在的组织是属于矿山下的  costcompany
 | 
					        //当前所在的组织是属于矿山下的  costcompany
 | 
				
			||||||
        //costcompany 费用承担公司
 | 
					        //costcompany 费用承担公司
 | 
				
			||||||
 | 
					        Object costcompanyObj = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompanyObj!=null){
 | 
				
			||||||
            DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
					            DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
				
			||||||
            long costcompanyId = costcompany.getLong("id");
 | 
					            long costcompanyId = costcompany.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
					            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
				
			||||||
| 
						 | 
					@ -85,6 +87,7 @@ public class DailyloanbillExpAccPlugin extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
                fieldEditExpense.addAfterF7SelectListener(this);
 | 
					                fieldEditExpense.addAfterF7SelectListener(this);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
					    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,7 +67,9 @@ public class DailyreimbursExpAccPlugin extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
        //当前所在的组织是属于矿山下的
 | 
					        //当前所在的组织是属于矿山下的
 | 
				
			||||||
        //costcompany 费用承担公司
 | 
					        //costcompany 费用承担公司
 | 
				
			||||||
        DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
					        Object costcompanyObj = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompanyObj != null){
 | 
				
			||||||
 | 
					            DynamicObject costcompany =  (DynamicObject)costcompanyObj;
 | 
				
			||||||
            long costcompanyId = costcompany.getLong("id");
 | 
					            long costcompanyId = costcompany.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
					            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
				
			||||||
                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
					                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
				
			||||||
| 
						 | 
					@ -79,6 +81,7 @@ public class DailyreimbursExpAccPlugin extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
                fieldEditExpense.addAfterF7SelectListener(this);
 | 
					                fieldEditExpense.addAfterF7SelectListener(this);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
					    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,8 @@ public class DefaultExpenseItemPlugin  extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
        //通过费用承担公司找到行政组织,获取长名称,排除编码为'10006447','10007186','10006476','10006461','10006939'的
 | 
					        //通过费用承担公司找到行政组织,获取长名称,排除编码为'10006447','10007186','10006476','10006461','10006939'的
 | 
				
			||||||
        String rootOrgCode = "10006431";
 | 
					        String rootOrgCode = "10006431";
 | 
				
			||||||
        super.afterCreateNewData(e);
 | 
					        super.afterCreateNewData(e);
 | 
				
			||||||
 | 
					        Object costcompany1 = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompany1!=null){
 | 
				
			||||||
            DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
 | 
					            DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
 | 
				
			||||||
            long id = costcompany.getLong("id");
 | 
					            long id = costcompany.getLong("id");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -62,6 +64,7 @@ public class DefaultExpenseItemPlugin  extends AbstractBillPlugIn implements Plu
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -70,7 +70,9 @@ public class PrepaybillExpAccPlugin extends AbstractBillPlugIn implements Plugin
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
        //当前所在的组织是属于矿山下的 costcompany
 | 
					        //当前所在的组织是属于矿山下的 costcompany
 | 
				
			||||||
        //costcompany 费用承担公司
 | 
					        //costcompany 费用承担公司
 | 
				
			||||||
        DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
					        Object costcompanyObj = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompanyObj!=null){
 | 
				
			||||||
 | 
					            DynamicObject costcompany =  (DynamicObject)costcompanyObj;
 | 
				
			||||||
            long costcompanyId = costcompany.getLong("id");
 | 
					            long costcompanyId = costcompany.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
					            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
				
			||||||
                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
					                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
				
			||||||
| 
						 | 
					@ -81,7 +83,7 @@ public class PrepaybillExpAccPlugin extends AbstractBillPlugIn implements Plugin
 | 
				
			||||||
                fieldEditExpense.addBeforeF7SelectListener(this);
 | 
					                fieldEditExpense.addBeforeF7SelectListener(this);
 | 
				
			||||||
                fieldEditExpense.addAfterF7SelectListener(this);
 | 
					                fieldEditExpense.addAfterF7SelectListener(this);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -71,7 +71,9 @@ public class PublicreimbursebillExpAccPlugin extends AbstractBillPlugIn implemen
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
        //当前所在的组织是属于矿山下的 costcompany
 | 
					        //当前所在的组织是属于矿山下的 costcompany
 | 
				
			||||||
        //costcompany 费用承担公司
 | 
					        //costcompany 费用承担公司
 | 
				
			||||||
        DynamicObject costcompany =  (DynamicObject)this.getModel().getValue("costcompany");
 | 
					        Object costcompanyObj = this.getModel().getValue("costcompany");
 | 
				
			||||||
 | 
					        if(costcompanyObj!=null){
 | 
				
			||||||
 | 
					            DynamicObject costcompany =  (DynamicObject)costcompanyObj;
 | 
				
			||||||
            long costcompanyId = costcompany.getLong("id");
 | 
					            long costcompanyId = costcompany.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
					            if(OrgCheckUtils.isKS(currentOrgId) && OrgCheckUtils.isKS(costcompanyId)){
 | 
				
			||||||
                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
					                BasedataEdit fieldEdit = this.getView().getControl(ACCOUNT_ITEM);
 | 
				
			||||||
| 
						 | 
					@ -83,6 +85,7 @@ public class PublicreimbursebillExpAccPlugin extends AbstractBillPlugIn implemen
 | 
				
			||||||
                fieldEditExpense.addAfterF7SelectListener(this);
 | 
					                fieldEditExpense.addAfterF7SelectListener(this);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
					    public void afterF7Select(AfterF7SelectEvent afterF7SelectEvent) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,6 +29,7 @@ public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements
 | 
				
			||||||
        //当前切换选择的组织
 | 
					        //当前切换选择的组织
 | 
				
			||||||
        Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
 | 
					        Object company = this.getModel().getValue("costcompany");//核算组织(费用承担公司)
 | 
				
			||||||
        Long currentOrgId = RequestContext.get().getOrgId();
 | 
					        Long currentOrgId = RequestContext.get().getOrgId();
 | 
				
			||||||
 | 
					        if(company!=null){
 | 
				
			||||||
            DynamicObject companyObj = (DynamicObject)company;
 | 
					            DynamicObject companyObj = (DynamicObject)company;
 | 
				
			||||||
            Long companyId = companyObj.getLong("id");
 | 
					            Long companyId = companyObj.getLong("id");
 | 
				
			||||||
            if(OrgCheckUtils.isKS(companyId)){
 | 
					            if(OrgCheckUtils.isKS(companyId)){
 | 
				
			||||||
| 
						 | 
					@ -67,6 +68,7 @@ public class TriprAutoCalWorkingDaysPlugin extends AbstractBillPlugIn implements
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        super.propertyChanged(e);
 | 
					        super.propertyChanged(e);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue