From 00e06f89de12694a88e1c303813370e7990a50f6 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Mon, 15 Sep 2025 09:28:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E7=B1=BB=E5=9E=8B-=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E9=87=87=E8=B4=AD=E8=AE=A1=E4=BB=B7=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java index 272f04a..182ea95 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java @@ -50,7 +50,8 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin } else if (number.equals("ZCHLX02") ||number.equals("wzcg01")) { //合同类型-物资采购 或物资采购类（已禁用 comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj")); - comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg")); + //comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg")); + comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj")); comboList.add(new ComboItem(new LocaleString("全面合作"), "A")); comboList.add(new ComboItem(new LocaleString("局部合作"), "B")); Object pricetype = this.getModel().getValue("zcgj_pricetype");//计价方式 From 912eb13cd753f56fd6ed3305c78bdd3a36522c26 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Mon, 15 Sep 2025 09:28:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=BB=B4=E4=BF=AE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=8D=95=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fs/plugin/form/PublicreimbursebillNoContractPlugin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java index 3948c4e..c3d2910 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java @@ -234,13 +234,14 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl } qFilter.add(new QFilter("billstatus", QCP.equals, "C")); formShowParameter.getListFilterParameter().setQFilters(qFilter); - }else if("zcgj_maintenanceack".equals(propertyName)){ + }else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单 DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid"); DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany"); List qFilter = new ArrayList<>(); if(billpayerid!=null){ Long payerid = billpayerid.getLong("id"); - qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid)); + //qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid)); + qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商 } if(costcompany!=null){