diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractSelectProjectPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractSelectProjectPlugin.java index 2726f4c..af3f005 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractSelectProjectPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractSelectProjectPlugin.java @@ -58,16 +58,6 @@ public class ContractSelectProjectPlugin extends AbstractBillPlugIn implements P DynamicObject zcgj_headquarters = zcgj_companybelong.getDynamicObject("zcgj_headquarters");//本部 this.getModel().setValue("zcgj_hqorg", zcgj_headquarters);//总部代收组织 } - QFilter filter1 = new QFilter("zcgj_companyblentry.zcgj_org", QCP.equals, org.getPkValue());//组织 - DynamicObject zcgj_companybelong1 = BusinessDataServiceHelper.loadSingle("zcgj_companybelong", - "zcgj_headquarters,zcgj_zbbankaccount", - new QFilter[]{filter1});//"公司归属区域" - if (zcgj_companybelong1 != null) { - DynamicObject zcgj_headquarters = zcgj_companybelong1.getDynamicObject("zcgj_headquarters");//本部 - DynamicObject zcgj_zbbankaccount = zcgj_companybelong1.getDynamicObject("zcgj_zbbankaccount");//本部银行账户 - this.getModel().setValue("zcgj_zborg", zcgj_headquarters);//总部组织 - this.getModel().setValue("zcgj_zbbankaccount", zcgj_zbbankaccount);//总部账号 - } } else { this.getView().showErrorNotification("请先选择财务记账组织"); this.getModel().setValue("zcgj_hqrec", null); @@ -75,9 +65,31 @@ public class ContractSelectProjectPlugin extends AbstractBillPlugIn implements P } } else { this.getModel().setValue("zcgj_hqorg", null);//总部代收组织 + } + } else if (name.equals("fiaccountorg")) { + //财务记账组织 + ChangeData changeData = e.getChangeSet()[0]; + Object newValue = changeData.getNewValue(); + if (newValue != null) { + DynamicObject fiaccountorg = (DynamicObject) newValue; + QFilter filter1 = new QFilter("zcgj_companyblentry.zcgj_org", QCP.equals, fiaccountorg.getPkValue());//组织 + DynamicObject zcgj_companybelong1 = BusinessDataServiceHelper.loadSingle("zcgj_companybelong", + "zcgj_headquarters,zcgj_zbbankaccount", + new QFilter[]{filter1});//"公司归属区域" + if (zcgj_companybelong1 != null) { + DynamicObject zcgj_headquarters = zcgj_companybelong1.getDynamicObject("zcgj_headquarters");//本部 + DynamicObject zcgj_zbbankaccount = zcgj_companybelong1.getDynamicObject("zcgj_zbbankaccount");//本部银行账户 + this.getModel().setValue("zcgj_zborg", zcgj_headquarters);//总部组织 + this.getModel().setValue("zcgj_zbbankaccount", zcgj_zbbankaccount);//总部账号 + } else { + this.getModel().setValue("zcgj_zborg", null);//总部组织 + this.getModel().setValue("zcgj_zbbankaccount", null);//总部账号 + } + } else { this.getModel().setValue("zcgj_zborg", null);//总部组织 this.getModel().setValue("zcgj_zbbankaccount", null);//总部账号 } + }/* else if (name.equals("fiaccountorg")) { //财务记账组织 ChangeData changeData = e.getChangeSet()[0];