From fab05e56c723d2e7b4c03b4b08048a356cab06d0 Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Mon, 16 Jun 2025 10:39:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A2=E5=8A=A1=E7=A1=AE=E8=AE=A4=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java | 1 + .../plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java | 1 + .../plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java | 1 + .../workflow/OutContractSettleFiConfirmWorkFlowPlugin.java | 1 + .../plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java | 1 + .../plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java | 1 + 6 files changed, 6 insertions(+) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java index 9c83769..2e44e4f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmePlugin.java @@ -55,6 +55,7 @@ public class InContractFinaceConfirmePlugin extends AbstractBillPlugIn implement getModel().setValue("zcgj_ec_in_contract_sett",ecincontractsettle.getLong("id")); getModel().setValue("zcgj_ec_in_contract_name",ecincontractsettle.getString("billname")); getModel().setValue("zcgj_ec_in_contractid", ecincontractsettle.getLong("id")); //id文本，冗余 + getModel().setValue("zcgj_org",ecincontractsettle.getDynamicObject("org")); getModel().setValue("zcgj_billname",ecincontractsettle.getString("billname")); getModel().setValue("zcgj_contract",ecincontractsettle.getDynamicObject("contract")); getModel().setValue("zcgj_contattr",ecincontractsettle.getDynamicObject("contattr")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java index c71ac61..87a0d64 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleFiConfirmWorkFlowPlugin.java @@ -33,6 +33,7 @@ public class InContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin inFinaceconfirm.set("zcgj_ec_in_contract_name",inContractSettle.getString("billname")); inFinaceconfirm.set("zcgj_ec_in_contractid", inContractSettle.getLong("id")); //id文本，冗余 inFinaceconfirm.set("zcgj_billname",inContractSettle.getString("billname")); + inFinaceconfirm.set("zcgj_org",inContractSettle.getDynamicObject("org")); inFinaceconfirm.set("zcgj_contract",inContractSettle.getDynamicObject("contract")); inFinaceconfirm.set("zcgj_contattr",inContractSettle.getDynamicObject("contattr")); inFinaceconfirm.set("zcgj_project",inContractSettle.getDynamicObject("project")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java index 388cd36..351f2be 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/InContractSettleInvalidWorkFlowPlugin.java @@ -32,6 +32,7 @@ public class InContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin { inFinaceconfirm.set("zcgj_ec_in_contract_sett",inContractSettle.getLong("id")); inFinaceconfirm.set("zcgj_ec_in_contract_name",inContractSettle.getString("billname")); inFinaceconfirm.set("zcgj_ec_in_contractid", inContractSettle.getLong("id")); //id文本，冗余 + inFinaceconfirm.set("zcgj_org",inContractSettle.getDynamicObject("org")); inFinaceconfirm.set("zcgj_billname",inContractSettle.getString("billname")); inFinaceconfirm.set("zcgj_contract",inContractSettle.getDynamicObject("contract")); inFinaceconfirm.set("zcgj_contattr",inContractSettle.getDynamicObject("contattr")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java index b6ae59c..f5e905a 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleFiConfirmWorkFlowPlugin.java @@ -35,6 +35,7 @@ public class OutContractSettleFiConfirmWorkFlowPlugin implements IWorkflowPlugin outFinaceconfirm.set("zcgj_ec_out_contract_sett",outContractSettle.getLong("id")); outFinaceconfirm.set("zcgj_ec_out_contract_name",outContractSettle.getString("billname")); outFinaceconfirm.set("zcgj_ec_out_contractid", outContractSettle.getLong("id")); //id文本，冗余 + outFinaceconfirm.set("zcgj_org",outContractSettle.getDynamicObject("org")); outFinaceconfirm.set("zcgj_billname",outContractSettle.getString("billname")); outFinaceconfirm.set("zcgj_contract",outContractSettle.getDynamicObject("contract")); outFinaceconfirm.set("zcgj_contattr",outContractSettle.getDynamicObject("contattr")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java index 61779c3..adb2c96 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleInvalidWorkFlowPlugin.java @@ -36,6 +36,7 @@ public class OutContractSettleInvalidWorkFlowPlugin implements IWorkflowPlugin { outFinaceconfirm.set("zcgj_ec_out_contract_sett",outContractSettle.getLong("id")); outFinaceconfirm.set("zcgj_ec_out_contract_name",outContractSettle.getString("billname")); outFinaceconfirm.set("zcgj_ec_out_contractid", outContractSettle.getLong("id")); //id文本，冗余 + outFinaceconfirm.set("zcgj_org",outContractSettle.getDynamicObject("org")); outFinaceconfirm.set("zcgj_billname",outContractSettle.getString("billname")); outFinaceconfirm.set("zcgj_contract",outContractSettle.getDynamicObject("contract")); outFinaceconfirm.set("zcgj_contattr",outContractSettle.getDynamicObject("contattr")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java index 0e2a9eb..fb4a1bc 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/workflow/OutContractSettleReversalWorkFlowPlugin.java @@ -36,6 +36,7 @@ public class OutContractSettleReversalWorkFlowPlugin implements IWorkflowPlugin inContractSettle.set("contract",contractInfo); inContractSettle.set("org", outContractSettle.getDynamicObject("org")); inContractSettle.set("billstatus","C"); + inContractSettle.set("zcgj_org",outContractSettle.getDynamicObject("org")); inContractSettle.set("begindate",outContractSettle.getDate("begindate")); inContractSettle.set("enddate",outContractSettle.getDate("enddate")); inContractSettle.set("period",outContractSettle.getDynamicObject("period"));