From 0c14f00de93f6684389f32b0c3c38777b5d43230 Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Tue, 19 Nov 2024 18:04:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88=E7=BB=8D=E9=91=AB?= =?UTF-8?q?=20=E6=97=B6=E9=97=B4=EF=BC=9A2024/11/19=20=2017=EF=BC=9A00=20?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9A=E6=88=90=E6=9C=AC=E6=B5=8B=E7=AE=97?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/repc/recos/domain/Calculation.java | 24 ++++++- .../recos/formplugin/MeasureciFormPlugin.java | 11 +-- .../formplugin/RecosMeasurecosFormPlugin.java | 67 +++++++++++++------ .../repmd/formplugin/WorkQuantityPlugin.java | 23 ++++++- 4 files changed, 94 insertions(+), 31 deletions(-) diff --git a/main/java/shkd/repc/recos/domain/Calculation.java b/main/java/shkd/repc/recos/domain/Calculation.java index 0ab8d17..23aebff 100644 --- a/main/java/shkd/repc/recos/domain/Calculation.java +++ b/main/java/shkd/repc/recos/domain/Calculation.java @@ -26,9 +26,13 @@ public class Calculation { //工程量 Double entry_workload; + //估算口径 + String entry_measureplanidx; + //备注 + String entry_description; - public Calculation(String entry_longnumber, String entry_accountname, String entry_workloadunit, Double entry_adjustcoefficient, Double entry_amount,Double entry_price,Double entry_workload) { + public Calculation(String entry_longnumber, String entry_accountname, String entry_workloadunit, Double entry_adjustcoefficient, Double entry_amount,Double entry_price,Double entry_workload,String entry_measureplanidx,String entry_description) { this.entry_longnumber = entry_longnumber; this.entry_accountname = entry_accountname; this.entry_workloadunit = entry_workloadunit; @@ -36,6 +40,8 @@ public class Calculation { this.entry_amount = entry_amount; this.entry_price = entry_price; this.entry_workload = entry_workload; + this.entry_measureplanidx = entry_measureplanidx; + this.entry_description = entry_description; } public String getEntry_longnumber() { @@ -95,6 +101,22 @@ public class Calculation { this.entry_workload = entry_workload; } + public String getEntry_measureplanidx() { + return entry_measureplanidx; + } + + public void setEntry_measureplanidx(String entry_measureplanidx) { + this.entry_measureplanidx = entry_measureplanidx; + } + + public String getEntry_description() { + return entry_description; + } + + public void setEntry_description(String entry_description) { + this.entry_description = entry_description; + } + public Calculation() { } } diff --git a/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java b/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java index 6016e3a..c653702 100644 --- a/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java +++ b/main/java/shkd/repc/recos/formplugin/MeasureciFormPlugin.java @@ -41,16 +41,7 @@ public class MeasureciFormPlugin extends AbstractFormPlugin { DynamicObjectCollection qeug_entryentity = gcl.getDynamicObjectCollection("qeug_entryentity");//面积 for (int i = 0; i