From 284ad9842a08eb00c919b0e05a5ce2dae0a2d0a1 Mon Sep 17 00:00:00 2001 From: xiaoshi <2272816786@qq.com> Date: Fri, 20 Jun 2025 14:34:35 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/ContractPublicBillPlugin.java | 2 ++ .../form/RenewalContractBillPlugin.java | 33 ++++++++++--------- .../form/RenewalOutContractBillPlugin.java | 2 ++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java index 99cbcf9..c865054 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractPublicBillPlugin.java @@ -72,9 +72,11 @@ public class ContractPublicBillPlugin extends AbstractBillPlugIn implements Plug String priceType = pricetype.toString(); if(priceType.equals("gddj")){ this.getModel().setValue("isonlist", true); + this.getView().setEnable(false,"isonlist"); ((FieldEdit)this.getView().getControl("treeprice")).setMustInput(true); }else { this.getModel().setValue("isonlist", false); + this.getView().setEnable(true,"isonlist"); ((FieldEdit)this.getView().getControl("treeprice")).setMustInput(true); } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalContractBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalContractBillPlugin.java index b43806f..dfbe080 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalContractBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalContractBillPlugin.java @@ -25,30 +25,31 @@ import java.util.*; public class RenewalContractBillPlugin extends AbstractListPlugin { - @Override public void afterCopyData(EventObject e) { //获取列表父界面缓存信息 Object srcBillNo2 = this.getView().getParentView().getPageCache().get("srcBillNo"); - if(srcBillNo2!=null){ + if (srcBillNo2 != null) { // this.getView().showMessage("源单编号："+srcBillNo2); // BillModel billModel = (BillModel) e.getSource(); DynamicObject contract = BusinessDataServiceHelper.loadSingle("ec_out_contract", "id,billno,billname,zcgj_renewal,zcgj_isrenewal", new QFilter[]{new QFilter("billno", QCP.equals, srcBillNo2.toString())}); this.getModel().setValue("id", null);//id - this.getModel().setValue("billno", null);//合同编码 - this.getModel().setValue("billname", contract.getString("billname")+"-续签");//合同名称 + this.getModel().setValue("billno", null);//合同编码 + this.getModel().setValue("billname", contract.getString("billname") + "-续签");//合同名称 this.getModel().setValue("zcgj_startdate", null);//起始日期 this.getModel().setValue("zcgj_enddate", null);//终止日期 // DynamicObject contract = BusinessDataServiceHelper.loadSingle("ec_out_contract", "id,billno,zcgj_renewal", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); this.getModel().setValue("zcgj_renewal", contract);//续签主合同 this.getModel().setValue("zcgj_isrenewal", true);//是否续签 + this.getModel().setValue("treelistentry",null); + this.getModel().setValue("sublistentry",null); this.getView().getParentView().getPageCache().remove("srcBillNo");//读取后清理缓存 + } } - @Override public void registerListener(EventObject e) { super.registerListener(e); @@ -76,20 +77,20 @@ public class RenewalContractBillPlugin extends AbstractListPlugin { DynamicObject receiveApplication = receiveApplications[0]; String billno = receiveApplication.getString("billno"); - QFilter qf = new QFilter("zcgj_renewal.billno", QCP.equals,billno); + QFilter qf = new QFilter("zcgj_renewal.billno", QCP.equals, billno); DynamicObject[] recontracts = BusinessDataServiceHelper.load("ec_in_contract", "id,billno,billname,zcgj_renewal", new QFilter[]{qf}); for (DynamicObject recontract : recontracts) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("type","ec_in_contract"); - jsonObject.put("zcgj_billno",billno); - jsonObject.put("zcgj_billname",receiveApplication.getString("billname")); - jsonObject.put("zcgj_renewalnum",recontract.getString("billno")); - jsonObject.put("zcgj_renewalname",recontract.getString("billname")); + jsonObject.put("type", "ec_in_contract"); + jsonObject.put("zcgj_billno", billno); + jsonObject.put("zcgj_billname", receiveApplication.getString("billname")); + jsonObject.put("zcgj_renewalnum", recontract.getString("billno")); + jsonObject.put("zcgj_renewalname", recontract.getString("billname")); // objects.add( )); // map.put(recontract.getLong("id"),recontract.getString("billno")); jsonArray.add(jsonObject); } - if (jsonArray.size()<1){ + if (jsonArray.size() < 1) { this.getView().showTipNotification("该合同暂无续签合同！"); return; } @@ -127,13 +128,13 @@ public class RenewalContractBillPlugin extends AbstractListPlugin { DynamicObject[] receiveApplications = BusinessDataServiceHelper.load("ec_in_contract", "billno,zcgj_renewal,zcgj_isrenewal,contstatus", new QFilter[]{new QFilter("id", "in", setIds)}); DynamicObject receiveApplication = receiveApplications[0]; boolean isrenewal = receiveApplication.getBoolean("zcgj_isrenewal"); - if (isrenewal){ + if (isrenewal) { this.getView().showTipNotification("续签合同不能进行续签！"); evt.setCancel(true); return; } String contstatus = receiveApplication.getString("contstatus"); - if (!contstatus.equals("01")){ + if (!contstatus.equals("01")) { this.getView().showTipNotification("收入合同需执行中才可进行续签！"); evt.setCancel(true); return; @@ -155,10 +156,10 @@ public class RenewalContractBillPlugin extends AbstractListPlugin { super.beforeDoOperation(args); FormOperate operate = (FormOperate) args.getSource(); String operateNo = operate.getOperateKey(); - if(operateNo.equalsIgnoreCase("copy")){ + if (operateNo.equalsIgnoreCase("copy")) { ListSelectedRowCollection listSelectedData = args.getListSelectedData(); String srcBillNo = listSelectedData.get(0).getBillNo(); - this.getView().getPageCache().put("srcBillNo",srcBillNo); + this.getView().getPageCache().put("srcBillNo", srcBillNo); } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalOutContractBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalOutContractBillPlugin.java index 9adf655..fb466d1 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalOutContractBillPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/RenewalOutContractBillPlugin.java @@ -43,6 +43,8 @@ public class RenewalOutContractBillPlugin extends AbstractListPlugin { // DynamicObject contract = BusinessDataServiceHelper.loadSingle("ec_out_contract", "id,billno,zcgj_renewal", new QFilter[]{new QFilter("billno", QCP.equals, billno)}); this.getModel().setValue("zcgj_renewal", contract);//续签主合同 this.getModel().setValue("zcgj_isrenewal", true);//是否续签 + this.getModel().setValue("treelistentry",null); + this.getModel().setValue("sublistentry",null); this.getView().getParentView().getPageCache().remove("srcBillNo");//读取后清理缓存 } }