From 2040adef3000d4641d5cd97c23b23272931eccfd Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 12 Nov 2024 17:45:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E8=AE=A2=E8=88=B1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E4=BF=9D=E5=AD=98=E6=B1=87=E6=80=BB=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=86=E5=BD=95=E6=95=B0=E9=87=8F=202.?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d755bffaeed4fb1a04b76fef060fe01614182edb) --- .../op/IntebilllogonSaveEdit.java | 9 +- .../wm/bc/bill/op/SalesorderSignatureOp.java | 8 +- .../yem/wm/bc/bill/op/YemBillUnAuditOp.java | 3 +- .../op/ExportCostAmountValidatorOp.java | 6 +- .../es/exportcost/op/ExportCostSubmitOp.java | 6 +- .../op/ExportInvoiceAuditOp.java | 4 +- .../exportinvoice/op/ExportInvoiceDelOP.java | 7 +- .../exportinvoice/op/ExportInvoiceSaveOP.java | 10 +- .../op/ExportInvoiceSubmitOp.java | 9 +- .../framework/op/FrameworkContractDelOp.java | 5 +- .../op/SalesContracSignatureOp.java | 8 +- .../op/SalesContracUnauditOp.java | 8 +- .../salescontrac/op/SalescontracSubmitOp.java | 5 +- .../salesorder/op/CreateCreditNoteBillOp.java | 21 +- .../yem/wm/es/salesorder/op/NewVersionOp.java | 6 +- .../salesorder/op/SaleOrdeAddGenerateOp.java | 5 +- .../salesorder/op/SaleOrdeDelGenerateOp.java | 5 +- .../salesorder/op/SaleOrdeExportisVoid.java | 3 +- .../salesorder/op/SaleOrderBillCancelOp.java | 3 +- .../wm/es/salesorder/op/SaleOrderDelOp.java | 4 +- .../es/salesorder/op/SaleOrderUnSubmitOp.java | 16 +- .../es/salesorder/op/SalesOrderAuditOp.java | 20 +- .../es/salesorder/op/SalesOrderUnAuditOp.java | 19 +- .../es/storagetrans/op/StorageTransDelOp.java | 5 +- .../storagetrans/op/StorageTransSaveOp.java | 349 ++++++++---------- .../storagetrans/op/StorageTransSubmitOp.java | 6 +- .../op/StorageTransUnAuditOp.java | 3 +- .../xsalesorder/op/XSalesOrderSubmitOp.java | 7 +- .../fm/gathering/op/ClaimCentersSaveOp.java | 5 +- .../wm/fm/gathering/op/CreatePlusMinusOp.java | 10 +- .../fm/gathering/op/UnCreatePlusMinusOp.java | 3 +- .../lettercredit/op/LetterCreditAuditOp.java | 3 +- .../op/LetterCreditUnAuditOp.java | 4 +- .../im/clientdemand/op/DetailedInfoDelOp.java | 5 +- .../clientdemand/op/DetailedInfoDeletOp.java | 3 +- .../csrCreditLine/op/CsrCreditLineDelOp.java | 3 +- .../csrCreditLine/op/CsrCreditLineSaveOp.java | 7 +- .../op/CsrCreditLineSubmitOp.java | 6 +- .../op/DebCredNewAuditPlugin.java | 3 +- .../debcrednotenew/op/DebCredNewSubmitOp.java | 3 +- .../op/DeliverNoticeEASSubmitOp.java | 8 +- .../op/DeliverNoticeNewAuditOp.java | 4 +- .../op/DeliverNoticeNewUnAuditOp.java | 8 +- .../op/DeliverNoticeSubmitOp.java | 34 +- .../op/DeliverNoticesSubmitOp.java | 33 +- .../im/inquirylist/op/InquirylistAudit.java | 15 +- .../im/intauditbusa/op/IntAuditBuSaDelOp.java | 6 +- .../op/IntAuditBuSaUnAuditOp.java | 6 +- .../priceLibrary/op/PriceLibrarySubmitOp.java | 14 +- .../im/sourceapply/op/SourceApplyDelOp.java | 7 +- .../op/TrackTaskConsoleSaveOp.java | 39 +- .../op/TracktaskconsoleSubmitOp.java | 12 +- .../op/TransFerOrderSubmitMustInputOp.java | 17 +- .../wm/syn/cmmp/addnew/OrderProReqBill.java | 35 +- .../wm/syn/cmmp/addnew/OrderProReqBillCG.java | 34 +- .../syn/cmmp/addnew/OrderProReqBillWMI.java | 34 +- .../cmmp/delete/OrderProReqBillDelCMMP.java | 11 +- .../com/yem/wm/syn/eas/GathEringService.java | 21 +- .../wm/syn/eas/ImInQuirylistPJService.java | 21 +- .../com/yem/wm/syn/eas/PayapplyService.java | 33 +- .../wm/syn/eas/YemDelivernoticeService.java | 45 +-- .../syn/eas/YemOrderproreqbillWGService.java | 23 +- .../wm/syn/eas/YemTransferorderService.java | 77 +--- .../wm/syn/eas/form/fi/PayapplyUnSubmit.java | 4 +- .../eas/form/im/ImInQuirylistPJUnSubmit.java | 4 +- .../eas/submit/op/ESDelivernoticePlugIn.java | 7 +- .../submit/op/ImGiftApplyLyServicePlugIn.java | 9 +- .../eas/submit/op/ImInQuiryListPlugIn.java | 6 +- .../syn/eas/submit/op/OrderProReqPlugIn.java | 7 +- .../eas/submit/op/TransFerOrderPlugIn.java | 7 +- .../wm/syn/eas/unaudit/GathEringUnAudit.java | 21 +- .../syn/eas/unaudit/ImGiftApplyUnAudit.java | 18 +- .../syn/eas/unaudit/ImInquiryListUnAudit.java | 18 +- .../wm/syn/eas/unaudit/PayapplyUnAudit.java | 5 +- .../unaudit/YemEsDelivernoticeUnAudit.java | 4 +- .../unaudit/YemOrderproreqbillWGUnAudit.java | 7 +- .../eas/unaudit/YemTransferorderUnAudit.java | 5 +- .../op/AttachmentsEffectchangeOp.java | 7 +- .../yem/wm/sys/opplugin/op/NewVersionOp.java | 7 +- .../wm/sys/opplugin/op/VerifyExistOrPush.java | 5 - 80 files changed, 234 insertions(+), 1059 deletions(-) diff --git a/src/main/java/com/yem/ia/intebilllogon/op/IntebilllogonSaveEdit.java b/src/main/java/com/yem/ia/intebilllogon/op/IntebilllogonSaveEdit.java index 9de27026..6a61f56d 100644 --- a/src/main/java/com/yem/ia/intebilllogon/op/IntebilllogonSaveEdit.java +++ b/src/main/java/com/yem/ia/intebilllogon/op/IntebilllogonSaveEdit.java @@ -19,14 +19,7 @@ public class IntebilllogonSaveEdit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_isvmi"); -// fieldKeys.add("yem_businesssort"); -// fieldKeys.add("yem_qty"); -// fieldKeys.add("yem_resourcenog"); -// fieldKeys.add("yem_es_salesorder_z"); -// fieldKeys.add("yem_vehicleno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/bc/bill/op/SalesorderSignatureOp.java b/src/main/java/com/yem/wm/bc/bill/op/SalesorderSignatureOp.java index 8adb0120..f6b326ef 100644 --- a/src/main/java/com/yem/wm/bc/bill/op/SalesorderSignatureOp.java +++ b/src/main/java/com/yem/wm/bc/bill/op/SalesorderSignatureOp.java @@ -39,13 +39,7 @@ public class SalesorderSignatureOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sigforminstid"); - fieldKeys.add("yem_sigflowinstid"); - fieldKeys.add("yem_sigstatus"); - fieldKeys.add("yem_siguser"); - fieldKeys.add("yem_sigdatetime"); - fieldKeys.add("yem_sigmag"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/bc/bill/op/YemBillUnAuditOp.java b/src/main/java/com/yem/wm/bc/bill/op/YemBillUnAuditOp.java index 22c1aae6..0eba65e1 100644 --- a/src/main/java/com/yem/wm/bc/bill/op/YemBillUnAuditOp.java +++ b/src/main/java/com/yem/wm/bc/bill/op/YemBillUnAuditOp.java @@ -23,8 +23,7 @@ public class YemBillUnAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_forminstid"); - fieldKeys.add("yem_flowinstid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); super.onPreparePropertys(e); } diff --git a/src/main/java/com/yem/wm/es/exportcost/op/ExportCostAmountValidatorOp.java b/src/main/java/com/yem/wm/es/exportcost/op/ExportCostAmountValidatorOp.java index f1ffb619..f6df5ba4 100644 --- a/src/main/java/com/yem/wm/es/exportcost/op/ExportCostAmountValidatorOp.java +++ b/src/main/java/com/yem/wm/es/exportcost/op/ExportCostAmountValidatorOp.java @@ -14,11 +14,7 @@ public class ExportCostAmountValidatorOp extends AbstractOperationServicePlugIn @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_applyamt_b"); - fieldKeys.add("yem_splitcost"); - fieldKeys.add("yem_applyforamt"); - fieldKeys.add("yem_csotdetail"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/exportcost/op/ExportCostSubmitOp.java b/src/main/java/com/yem/wm/es/exportcost/op/ExportCostSubmitOp.java index be0eba04..e6df5d58 100644 --- a/src/main/java/com/yem/wm/es/exportcost/op/ExportCostSubmitOp.java +++ b/src/main/java/com/yem/wm/es/exportcost/op/ExportCostSubmitOp.java @@ -13,11 +13,7 @@ public class ExportCostSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_applyamt_b"); - fieldKeys.add("yem_splitcost"); - fieldKeys.add("yem_applyforamt"); - fieldKeys.add("yem_csotdetail"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceAuditOp.java b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceAuditOp.java index 715781a4..cd932976 100644 --- a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceAuditOp.java +++ b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceAuditOp.java @@ -19,9 +19,7 @@ public class ExportInvoiceAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("auditdate"); - fieldKeys.add("yem_exratedate"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceDelOP.java b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceDelOP.java index 1e1c7815..4f87531b 100644 --- a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceDelOP.java +++ b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceDelOP.java @@ -23,12 +23,7 @@ public class ExportInvoiceDelOP extends AbstractOperationServicePlugIn{ @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_exportinvoice_c"); - fieldKeys.add("yem_sourcebillid_ec"); - fieldKeys.add("yem_sourcebillentryid"); - fieldKeys.add("yem_cusqty"); - fieldKeys.add("billno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java index e399d24b..3ba60b88 100644 --- a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java +++ b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSaveOP.java @@ -27,15 +27,7 @@ public class ExportInvoiceSaveOP extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_exportinvoice_c"); - fieldKeys.add("yem_sourcebillid_ec"); - fieldKeys.add("yem_sourcebillentryid"); - fieldKeys.add("yem_cusqty"); - fieldKeys.add("billno"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("yem_seatransfee"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSubmitOp.java b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSubmitOp.java index 0c8d5df0..a0de8e6c 100644 --- a/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSubmitOp.java +++ b/src/main/java/com/yem/wm/es/exportinvoice/op/ExportInvoiceSubmitOp.java @@ -16,14 +16,7 @@ public class ExportInvoiceSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("yem_sourcebilltype"); - fieldKeys.add("yem_seatransfee"); - fieldKeys.add("yem_seabase"); - fieldKeys.add("yem_insurefeecurrba"); - fieldKeys.add("yem_commission"); - fieldKeys.add("yem_shareamtc"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/framework/op/FrameworkContractDelOp.java b/src/main/java/com/yem/wm/es/framework/op/FrameworkContractDelOp.java index 81637d0b..d6b638ef 100644 --- a/src/main/java/com/yem/wm/es/framework/op/FrameworkContractDelOp.java +++ b/src/main/java/com/yem/wm/es/framework/op/FrameworkContractDelOp.java @@ -18,10 +18,7 @@ public class FrameworkContractDelOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_entryentitys"); - fieldKeys.add("yem_salecontract"); - fieldKeys.add("yem_contractamount"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracSignatureOp.java b/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracSignatureOp.java index 3ddff178..ff735c50 100644 --- a/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracSignatureOp.java +++ b/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracSignatureOp.java @@ -39,13 +39,7 @@ public class SalesContracSignatureOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sigforminstid"); - fieldKeys.add("yem_sigflowinstid"); - fieldKeys.add("yem_sigstatus"); - fieldKeys.add("yem_siguser"); - fieldKeys.add("yem_sigdatetime"); - fieldKeys.add("yem_sigmag"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void beforeExecuteOperationTransaction(BeforeOperationArgs e) { diff --git a/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java b/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java index 854f4cd4..d494414f 100644 --- a/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java +++ b/src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java @@ -25,13 +25,7 @@ public class SalesContracUnauditOp extends AbstractOperationServicePlugIn { public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_managersign"); - fieldKeys.add("yem_sigstatus"); - fieldKeys.add("yem_siguser"); - fieldKeys.add("yem_sigdatetime"); - fieldKeys.add("yem_sigforminstid"); - fieldKeys.add("yem_sigflowinstid"); - fieldKeys.add("yem_sigmag"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salescontrac/op/SalescontracSubmitOp.java b/src/main/java/com/yem/wm/es/salescontrac/op/SalescontracSubmitOp.java index 4c638fca..dfb833f5 100644 --- a/src/main/java/com/yem/wm/es/salescontrac/op/SalescontracSubmitOp.java +++ b/src/main/java/com/yem/wm/es/salescontrac/op/SalescontracSubmitOp.java @@ -18,10 +18,7 @@ public class SalescontracSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_internationalrate"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_currencybase"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void onAddValidators(AddValidatorsEventArgs e) { diff --git a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java index 07ab8d88..e2f70887 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/CreateCreditNoteBillOp.java @@ -32,26 +32,7 @@ public class CreateCreditNoteBillOp extends AbstractOperationServicePlugIn imple @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_accfunddetail"); - fieldKeys.add("yem_userate"); - fieldKeys.add("yem_debcuseamt"); - fieldKeys.add("org"); - fieldKeys.add("yem_customer"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_currencybase"); - fieldKeys.add("yem_operator"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_quotation"); - fieldKeys.add("yem_exratetable"); - fieldKeys.add("yem_usedebcrednoteno"); - fieldKeys.add("yem_debcredtype"); - fieldKeys.add("yem_ordercurr"); - fieldKeys.add("yem_remark"); - fieldKeys.add("billno"); - fieldKeys.add("yem_debcreditid"); - fieldKeys.add("yem_debcrednotecurr"); - fieldKeys.add("yem_debcrednoteno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/NewVersionOp.java b/src/main/java/com/yem/wm/es/salesorder/op/NewVersionOp.java index e2e6a723..d8ec7613 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/NewVersionOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/NewVersionOp.java @@ -16,11 +16,7 @@ import java.util.List; public class NewVersionOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_intauditbusano"); - fieldKeys.add("yem_intauditbusaid"); - fieldKeys.add("billno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java index de528ebe..90dd57fc 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeAddGenerateOp.java @@ -40,10 +40,7 @@ import java.util.Map; public class SaleOrdeAddGenerateOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_intauditbusano"); - fieldKeys.add("yem_intauditbusaid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeDelGenerateOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeDelGenerateOp.java index b936adfd..00843850 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeDelGenerateOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeDelGenerateOp.java @@ -27,10 +27,7 @@ import java.util.List; public class SaleOrdeDelGenerateOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_intauditbusano"); - fieldKeys.add("yem_intauditbusaid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeExportisVoid.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeExportisVoid.java index 4e4e8f6e..8dc0d065 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeExportisVoid.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrdeExportisVoid.java @@ -29,8 +29,7 @@ import java.util.List; public class SaleOrdeExportisVoid extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("billstatus"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderBillCancelOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderBillCancelOp.java index af4d4a2f..58665217 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderBillCancelOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderBillCancelOp.java @@ -19,8 +19,7 @@ public class SaleOrderBillCancelOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("billstatus"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderDelOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderDelOp.java index 0e5fff11..a370656b 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderDelOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderDelOp.java @@ -15,9 +15,7 @@ public class SaleOrderDelOp extends AbstractOperationServicePlugIn implements Pl @Override public void onPreparePropertys(PreparePropertysEventArgs e) { List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_intauditbusano"); - fieldKeys.add("yem_intauditbusaid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderUnSubmitOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderUnSubmitOp.java index 320b8cb2..9c950fa6 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderUnSubmitOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SaleOrderUnSubmitOp.java @@ -27,21 +27,7 @@ public class SaleOrderUnSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_newprice"); - fieldKeys.add("yem_newsalediffprice"); - fieldKeys.add("yem_debcrednoteno"); - fieldKeys.add("yem_customer"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_cn"); - fieldKeys.add("yem_client"); - fieldKeys.add("yem_productcategorie"); - fieldKeys.add("billstatus"); - fieldKeys.add("yem_im_entryentity_m"); - fieldKeys.add("org"); - fieldKeys.add("yem_fundusetype"); - fieldKeys.add("yem_currency"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java index c718a747..dae94ba4 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java @@ -33,25 +33,7 @@ public class SalesOrderAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer"); - fieldKeys.add("id"); - fieldKeys.add("org"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("billno"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_giftcurrency"); - fieldKeys.add("yem_giftdecimal"); - fieldKeys.add("yem_operator"); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_giftamountsum"); - fieldKeys.add("yem_giftamountsumbase"); - fieldKeys.add("yem_es_salesorder_l"); - fieldKeys.add("yem_isnewagent"); - fieldKeys.add("yem_offeramount"); - fieldKeys.add("yem_managersign"); - fieldKeys.add("billstatus"); - fieldKeys.add("yem_signdate"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderUnAuditOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderUnAuditOp.java index e3fe5959..364807fb 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderUnAuditOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderUnAuditOp.java @@ -33,24 +33,7 @@ public class SalesOrderUnAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer"); - fieldKeys.add("id"); - fieldKeys.add("org"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("billno"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_giftcurrency"); - fieldKeys.add("yem_giftdecimal"); - fieldKeys.add("yem_operator"); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_giftamountsum"); - fieldKeys.add("yem_giftamountsumbase"); - fieldKeys.add("yem_es_salesorder_l"); - fieldKeys.add("yem_isnewagent"); - fieldKeys.add("yem_managersign"); - fieldKeys.add("billstatus"); - fieldKeys.add("yem_currency"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransDelOp.java b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransDelOp.java index 96091450..ac7a01dd 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransDelOp.java +++ b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransDelOp.java @@ -20,9 +20,6 @@ public class StorageTransDelOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_unpackingqty"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } } diff --git a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSaveOp.java b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSaveOp.java index cb6d266a..7765559d 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSaveOp.java +++ b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSaveOp.java @@ -30,60 +30,7 @@ public class StorageTransSaveOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - e.getFieldKeys().add("yem_qty"); - e.getFieldKeys().add("yem_bigcabinet"); - e.getFieldKeys().add("yem_mincabinet"); - e.getFieldKeys().add("yem_bigcabinetnumbers"); - e.getFieldKeys().add("yem_mincabinetnumbers"); - e.getFieldKeys().add("yem_boxvolume1"); - e.getFieldKeys().add("yem_contractnumbers_m"); - e.getFieldKeys().add("yem_businesssort"); - e.getFieldKeys().add("yem_products"); - e.getFieldKeys().add("yem_salesmethod"); - e.getFieldKeys().add("yem_productmodel"); - e.getFieldKeys().add("yem_resourcenog"); - e.getFieldKeys().add("yem_materiel"); - e.getFieldKeys().add("yem_unit"); - e.getFieldKeys().add("yem_cubetype"); - e.getFieldKeys().add("yem_cubenumber"); - e.getFieldKeys().add("yem_remarks"); - e.getFieldKeys().add("yem_pieceqty"); - e.getFieldKeys().add("yem_piece"); - e.getFieldKeys().add("yem_weightunit"); - e.getFieldKeys().add("yem_grossweight"); - e.getFieldKeys().add("yem_lenghtunit"); - e.getFieldKeys().add("yem_long"); - e.getFieldKeys().add("yem_high"); - e.getFieldKeys().add("yem_wide"); - e.getFieldKeys().add("yem_vol"); - e.getFieldKeys().add("yem_volm3"); - e.getFieldKeys().add("yem_volm3sum"); - e.getFieldKeys().add("yem_grossweightsum"); - e.getFieldKeys().add("yem_baseunit"); - e.getFieldKeys().add("yem_baseqty"); - e.getFieldKeys().add("yem_shipmentnumbers_m"); - e.getFieldKeys().add("yem_corebilltype_e"); - e.getFieldKeys().add("yem_corebillno_d"); - e.getFieldKeys().add("yem_corebillid_d"); - e.getFieldKeys().add("yem_coreentryid"); - e.getFieldKeys().add("yem_resourceid"); - e.getFieldKeys().add("yem_material"); - e.getFieldKeys().add("yem_units"); - e.getFieldKeys().add("yem_shipmentqty"); - e.getFieldKeys().add("yem_residueqty"); - e.getFieldKeys().add("yem_packstyle"); - e.getFieldKeys().add("yem_baseunit_if"); - e.getFieldKeys().add("yem_baseqty_if"); - e.getFieldKeys().add("yem_salenumberno"); - e.getFieldKeys().add("yem_outnumberno"); - e.getFieldKeys().add("yem_sourcebillno_d"); - e.getFieldKeys().add("yem_sourcebilltype_e"); - e.getFieldKeys().add("yem_sourcebillid_d"); - e.getFieldKeys().add("yem_sourceentryid"); - e.getFieldKeys().add("yem_totalcontractno"); - e.getFieldKeys().add("yem_totalcontractno"); - e.getFieldKeys().add("yem_shipmentnumbers_m"); - e.getFieldKeys().add("yem_totalshippingno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override @@ -102,160 +49,174 @@ public class StorageTransSaveOp extends AbstractOperationServicePlugIn { super.endOperationTransaction(e); DynamicObject[] storageTrans = e.getDataEntities(); for (DynamicObject storageTran : storageTrans) { - - DynamicObject enCasement = BusinessDataServiceHelper.loadSingle("yem_im_encasement", - new QFilter[]{new QFilter("yem_sourcebillid", QCP.equals, storageTran.getPkValue()), - new QFilter("yem_sourcebilltype", QCP.equals, storageTran.getDynamicObjectType().getName())}); - if (YEM.isNotEmpty(enCasement)) { - Map> map = new HashMap(); - DynamicObjectCollection materialInfos = storageTran.getDynamicObjectCollection("yem_es_materialinfo"); - for (DynamicObject materialInfo : materialInfos) { - Map entryMap = new HashMap(); - entryMap.put("yem_businesssort", materialInfo.get("yem_businesssort"));//业务分类 - entryMap.put("yem_products", materialInfo.get("yem_products"));//产品分类 - entryMap.put("yem_salesmethod", materialInfo.get("yem_salesmethod"));//销售方式 - entryMap.put("yem_productmodel", materialInfo.get("yem_productmodel"));//基础机型 - entryMap.put("yem_resourcenog", materialInfo.get("yem_resourcenog"));//资源号 - entryMap.put("yem_materiel", materialInfo.get("yem_materiel"));//物料编码 - entryMap.put("yem_unit", materialInfo.get("yem_unit"));//计量单位 - entryMap.put("yem_qty", materialInfo.get("yem_qty"));//数量 - entryMap.put("yem_cubetype", materialInfo.get("yem_cubetype"));//箱型 - entryMap.put("yem_cubenumber", materialInfo.get("yem_cubenumber"));//箱量 - entryMap.put("yem_bigcabinet", materialInfo.get("yem_bigcabinet"));//大柜 - entryMap.put("yem_bigcabinetnumbers", materialInfo.get("yem_bigcabinetnumbers"));//大柜数量 - entryMap.put("yem_mincabinet", materialInfo.get("yem_mincabinet"));//小柜 - entryMap.put("yem_mincabinetnumbers", materialInfo.get("yem_mincabinetnumbers"));//小柜数量 - entryMap.put("yem_remarks", materialInfo.get("yem_remarks"));//备注 - entryMap.put("yem_packstyle", materialInfo.get("yem_packstyle"));//包装方式 - entryMap.put("yem_pieceqty", materialInfo.get("yem_pieceqty"));//单件数量 - entryMap.put("yem_piece", materialInfo.get("yem_piece"));//件数 - entryMap.put("yem_weightunit", materialInfo.get("yem_weightunit"));//重量计量单位 - entryMap.put("yem_grossweight", materialInfo.get("yem_grossweight"));//毛重 - entryMap.put("yem_lenghtunit", materialInfo.get("yem_lenghtunit"));//长度计量单位 - entryMap.put("yem_long", materialInfo.get("yem_long"));//长 - entryMap.put("yem_high", materialInfo.get("yem_high"));//宽 - entryMap.put("yem_wide", materialInfo.get("yem_wide"));//高 - entryMap.put("yem_vol", materialInfo.get("yem_vol"));//体积 - entryMap.put("yem_volm3", materialInfo.get("yem_volm3"));//体积M3 - entryMap.put("yem_volm3sum", materialInfo.get("yem_volm3sum"));//总体积M3 - entryMap.put("yem_grossweightsum", materialInfo.get("yem_grossweightsum"));//总毛重 - entryMap.put("yem_baseunit", materialInfo.get("yem_baseunit"));//基本计量单位 - entryMap.put("yem_baseqty", materialInfo.get("yem_baseqty"));//基本单位数量 - entryMap.put("yem_contractnumbers_m", materialInfo.get("yem_contractnumbers_m"));//外销合同号 - entryMap.put("yem_shipmentnumbers_m", materialInfo.get("yem_shipmentnumbers_m"));//出运明细单号 - entryMap.put("yem_corebilltype_e", materialInfo.get("yem_corebilltype_e"));//核心单类型 - entryMap.put("yem_corebillno_d", materialInfo.get("yem_corebillno_d"));//核心单编号 - entryMap.put("yem_corebillid_d", materialInfo.get("yem_corebillid_d"));//核心单据id - entryMap.put("yem_coreentryid", materialInfo.get("yem_coreentryid"));//核心单据分录id - map.put(materialInfo.getLong("id"), entryMap); + extracted(e, storageTran, storageTrans); + DynamicObjectCollection yemEsMaterialinfo = storageTran.getDynamicObjectCollection("yem_es_materialinfo"); + if (!yemEsMaterialinfo.isEmpty()){ + BigDecimal yemQty = BigDecimal.ZERO; + for (DynamicObject dynamicObject : yemEsMaterialinfo) { + String yemBusinesssort = dynamicObject.getString("yem_businesssort"); + boolean yemIfgift = dynamicObject.getBoolean("yem_ifgift"); + if ("Z".equals(yemBusinesssort)&&!yemIfgift){ + yemQty =yemQty.add(dynamicObject.getBigDecimal("yem_qty")); + } } + storageTran.set("yem_ordersumnumber",yemQty); + } + } + } + + private void extracted(EndOperationTransactionArgs e, DynamicObject storageTran, DynamicObject[] storageTrans) { + DynamicObject enCasement = BusinessDataServiceHelper.loadSingle("yem_im_encasement", + new QFilter[]{new QFilter("yem_sourcebillid", QCP.equals, storageTran.getPkValue()), + new QFilter("yem_sourcebilltype", QCP.equals, storageTran.getDynamicObjectType().getName())}); + if (YEM.isNotEmpty(enCasement)) { + Map> map = new HashMap(); + DynamicObjectCollection materialInfos = storageTran.getDynamicObjectCollection("yem_es_materialinfo"); + for (DynamicObject materialInfo : materialInfos) { + Map entryMap = new HashMap(); + entryMap.put("yem_businesssort", materialInfo.get("yem_businesssort"));//业务分类 + entryMap.put("yem_products", materialInfo.get("yem_products"));//产品分类 + entryMap.put("yem_salesmethod", materialInfo.get("yem_salesmethod"));//销售方式 + entryMap.put("yem_productmodel", materialInfo.get("yem_productmodel"));//基础机型 + entryMap.put("yem_resourcenog", materialInfo.get("yem_resourcenog"));//资源号 + entryMap.put("yem_materiel", materialInfo.get("yem_materiel"));//物料编码 + entryMap.put("yem_unit", materialInfo.get("yem_unit"));//计量单位 + entryMap.put("yem_qty", materialInfo.get("yem_qty"));//数量 + entryMap.put("yem_cubetype", materialInfo.get("yem_cubetype"));//箱型 + entryMap.put("yem_cubenumber", materialInfo.get("yem_cubenumber"));//箱量 + entryMap.put("yem_bigcabinet", materialInfo.get("yem_bigcabinet"));//大柜 + entryMap.put("yem_bigcabinetnumbers", materialInfo.get("yem_bigcabinetnumbers"));//大柜数量 + entryMap.put("yem_mincabinet", materialInfo.get("yem_mincabinet"));//小柜 + entryMap.put("yem_mincabinetnumbers", materialInfo.get("yem_mincabinetnumbers"));//小柜数量 + entryMap.put("yem_remarks", materialInfo.get("yem_remarks"));//备注 + entryMap.put("yem_packstyle", materialInfo.get("yem_packstyle"));//包装方式 + entryMap.put("yem_pieceqty", materialInfo.get("yem_pieceqty"));//单件数量 + entryMap.put("yem_piece", materialInfo.get("yem_piece"));//件数 + entryMap.put("yem_weightunit", materialInfo.get("yem_weightunit"));//重量计量单位 + entryMap.put("yem_grossweight", materialInfo.get("yem_grossweight"));//毛重 + entryMap.put("yem_lenghtunit", materialInfo.get("yem_lenghtunit"));//长度计量单位 + entryMap.put("yem_long", materialInfo.get("yem_long"));//长 + entryMap.put("yem_high", materialInfo.get("yem_high"));//宽 + entryMap.put("yem_wide", materialInfo.get("yem_wide"));//高 + entryMap.put("yem_vol", materialInfo.get("yem_vol"));//体积 + entryMap.put("yem_volm3", materialInfo.get("yem_volm3"));//体积M3 + entryMap.put("yem_volm3sum", materialInfo.get("yem_volm3sum"));//总体积M3 + entryMap.put("yem_grossweightsum", materialInfo.get("yem_grossweightsum"));//总毛重 + entryMap.put("yem_baseunit", materialInfo.get("yem_baseunit"));//基本计量单位 + entryMap.put("yem_baseqty", materialInfo.get("yem_baseqty"));//基本单位数量 + entryMap.put("yem_contractnumbers_m", materialInfo.get("yem_contractnumbers_m"));//外销合同号 + entryMap.put("yem_shipmentnumbers_m", materialInfo.get("yem_shipmentnumbers_m"));//出运明细单号 + entryMap.put("yem_corebilltype_e", materialInfo.get("yem_corebilltype_e"));//核心单类型 + entryMap.put("yem_corebillno_d", materialInfo.get("yem_corebillno_d"));//核心单编号 + entryMap.put("yem_corebillid_d", materialInfo.get("yem_corebillid_d"));//核心单据id + entryMap.put("yem_coreentryid", materialInfo.get("yem_coreentryid"));//核心单据分录id + map.put(materialInfo.getLong("id"), entryMap); + } // List sourceEntryIdList = new ArrayList<>(); - List removeList = new ArrayList(); - DynamicObjectCollection imMaterialInfos = enCasement.getDynamicObjectCollection("yem_im_materialinfo_mi"); - for (int i = 0; i < imMaterialInfos.size(); i++) { - DynamicObject imMaterialInfo = imMaterialInfos.get(i); - long sourceEntryId = imMaterialInfo.getLong("yem_sourceentryid"); - if (map.containsKey(sourceEntryId)) { - //移除装箱单本地数据 - map.remove(sourceEntryId); - } else { - removeList.add(imMaterialInfo); - // sourceEntryIdList.add(i); - } + List removeList = new ArrayList(); + DynamicObjectCollection imMaterialInfos = enCasement.getDynamicObjectCollection("yem_im_materialinfo_mi"); + for (int i = 0; i < imMaterialInfos.size(); i++) { + DynamicObject imMaterialInfo = imMaterialInfos.get(i); + long sourceEntryId = imMaterialInfo.getLong("yem_sourceentryid"); + if (map.containsKey(sourceEntryId)) { + //移除装箱单本地数据 + map.remove(sourceEntryId); + } else { + removeList.add(imMaterialInfo); + // sourceEntryIdList.add(i); } - if (removeList.size() > 0) { + } + if (removeList.size() > 0) { // imMaterialInfos.removeAll(sourceEntryIdList); - //移除储运托单删除行内容 - for (DynamicObject dy : removeList) { - imMaterialInfos.remove(dy); - } + //移除储运托单删除行内容 + for (DynamicObject dy : removeList) { + imMaterialInfos.remove(dy); } - Set entryIds = map.keySet(); - for (Long entryId : entryIds) { - Map stringObjectMap = map.get(entryId); - DynamicObject addNew = imMaterialInfos.addNew(); + } + Set entryIds = map.keySet(); + for (Long entryId : entryIds) { + Map stringObjectMap = map.get(entryId); + DynamicObject addNew = imMaterialInfos.addNew(); - addNew.set("yem_businesssort", stringObjectMap.get("yem_businesssort"));//业务分类 - addNew.set("yem_products", stringObjectMap.get("yem_products"));//产品分类 - addNew.set("yem_salesmethod", stringObjectMap.get("yem_salesmethod"));//销售方式 - addNew.set("yem_productmodel", stringObjectMap.get("yem_productmodel"));//基础机型 - addNew.set("yem_resourceid", stringObjectMap.get("yem_resourcenog"));//资源号 - addNew.set("yem_material", stringObjectMap.get("yem_materiel"));//物料编码 - addNew.set("yem_units", stringObjectMap.get("yem_unit"));//计量单位 - addNew.set("yem_shipmentqty", stringObjectMap.get("yem_qty"));//储运数量 - addNew.set("yem_cubetype", stringObjectMap.get("yem_cubetype"));//箱型 - addNew.set("yem_cubenumber", stringObjectMap.get("yem_cubenumber"));//箱量 - addNew.set("yem_bigcabinet", stringObjectMap.get("yem_bigcabinet"));//大柜 - addNew.set("yem_bigcabinetnumbers", stringObjectMap.get("yem_bigcabinetnumbers"));//大柜数量 - addNew.set("yem_mincabinet", stringObjectMap.get("yem_mincabinet"));//小柜 - addNew.set("yem_mincabinetnumbers", stringObjectMap.get("yem_mincabinetnumbers"));//小柜数量 - addNew.set("yem_residueqty", stringObjectMap.get("yem_qty"));//剩余数量 - addNew.set("yem_remarks", stringObjectMap.get("yem_remarks"));//备注 - addNew.set("yem_packstyle", stringObjectMap.get("yem_packstyle"));//包装方式 - addNew.set("yem_pieceqty", stringObjectMap.get("yem_pieceqty"));//单件数量 - addNew.set("yem_piece", stringObjectMap.get("yem_piece"));//件数 - addNew.set("yem_weightunit", stringObjectMap.get("yem_weightunit"));//重量计量单位 - addNew.set("yem_grossweight", stringObjectMap.get("yem_grossweight"));//毛重 - addNew.set("yem_lenghtunit", stringObjectMap.get("yem_lenghtunit"));//长度计量单位 - addNew.set("yem_long", stringObjectMap.get("yem_long"));//长 - addNew.set("yem_wide", stringObjectMap.get("yem_wide"));//宽 - addNew.set("yem_high", stringObjectMap.get("yem_high"));//高 - addNew.set("yem_vol", stringObjectMap.get("yem_vol"));//体积 - addNew.set("yem_volm3", stringObjectMap.get("yem_volm3"));//体积M3 - addNew.set("yem_volm3sum", stringObjectMap.get("yem_volm3sum"));//总体积M3 - addNew.set("yem_grossweightsum", stringObjectMap.get("yem_grossweightsum"));//总毛重 - addNew.set("yem_baseunit_if", stringObjectMap.get("yem_baseunit"));//基本计量单位 - addNew.set("yem_baseqty_if", stringObjectMap.get("yem_baseqty"));//基本单位数量 - addNew.set("yem_salenumberno", stringObjectMap.get("yem_contractnumbers_m"));//外销合同号 - addNew.set("yem_outnumberno", stringObjectMap.get("yem_shipmentnumbers_m"));//出运明细单号 - addNew.set("yem_sourcebillno_d", storageTran.getString("billno"));//源单编号 - addNew.set("yem_sourcebilltype_e", storageTran.getDynamicObjectType().getName());//源单类型 - addNew.set("yem_sourcebillid_d", storageTran.getPkValue());//源单id - addNew.set("yem_sourceentryid", entryId);//来源单据分录id - addNew.set("yem_corebilltype_e", stringObjectMap.get("yem_corebilltype_e"));//核心单类型 - addNew.set("yem_corebillno_d", stringObjectMap.get("yem_corebillno_d"));//核心单编号 - addNew.set("yem_corebillid_d", stringObjectMap.get("yem_corebillid_d"));//核心单据id - addNew.set("yem_coreentryid", stringObjectMap.get("yem_coreentryid"));//核心单据分录id - repairRelation(storageTran, "yem_es_materialinfo", addNew); - } - //反写装箱单数量 - DynamicObjectCollection yem_es_materialinfo = storageTran.getDynamicObjectCollection("yem_es_materialinfo"); - for (DynamicObject dt : yem_es_materialinfo) { - DynamicObjectCollection materialinfo_mi = enCasement.getDynamicObjectCollection("yem_im_materialinfo_mi"); - for (DynamicObject miSon : materialinfo_mi) { - long aLong = miSon.getLong("yem_sourceentryid"); - if (((long) dt.getPkValue()) == aLong) { - BigDecimal yemQty = dt.getBigDecimal("yem_qty"); - BigDecimal yemQtyMi = miSon.getBigDecimal("yem_shipmentqty"); - BigDecimal yemPackingqty = miSon.getBigDecimal("yem_packingqty"); - //数量增加 - if (yemQty.compareTo(yemQtyMi) > 0) { + addNew.set("yem_businesssort", stringObjectMap.get("yem_businesssort"));//业务分类 + addNew.set("yem_products", stringObjectMap.get("yem_products"));//产品分类 + addNew.set("yem_salesmethod", stringObjectMap.get("yem_salesmethod"));//销售方式 + addNew.set("yem_productmodel", stringObjectMap.get("yem_productmodel"));//基础机型 + addNew.set("yem_resourceid", stringObjectMap.get("yem_resourcenog"));//资源号 + addNew.set("yem_material", stringObjectMap.get("yem_materiel"));//物料编码 + addNew.set("yem_units", stringObjectMap.get("yem_unit"));//计量单位 + addNew.set("yem_shipmentqty", stringObjectMap.get("yem_qty"));//储运数量 + addNew.set("yem_cubetype", stringObjectMap.get("yem_cubetype"));//箱型 + addNew.set("yem_cubenumber", stringObjectMap.get("yem_cubenumber"));//箱量 + addNew.set("yem_bigcabinet", stringObjectMap.get("yem_bigcabinet"));//大柜 + addNew.set("yem_bigcabinetnumbers", stringObjectMap.get("yem_bigcabinetnumbers"));//大柜数量 + addNew.set("yem_mincabinet", stringObjectMap.get("yem_mincabinet"));//小柜 + addNew.set("yem_mincabinetnumbers", stringObjectMap.get("yem_mincabinetnumbers"));//小柜数量 + addNew.set("yem_residueqty", stringObjectMap.get("yem_qty"));//剩余数量 + addNew.set("yem_remarks", stringObjectMap.get("yem_remarks"));//备注 + addNew.set("yem_packstyle", stringObjectMap.get("yem_packstyle"));//包装方式 + addNew.set("yem_pieceqty", stringObjectMap.get("yem_pieceqty"));//单件数量 + addNew.set("yem_piece", stringObjectMap.get("yem_piece"));//件数 + addNew.set("yem_weightunit", stringObjectMap.get("yem_weightunit"));//重量计量单位 + addNew.set("yem_grossweight", stringObjectMap.get("yem_grossweight"));//毛重 + addNew.set("yem_lenghtunit", stringObjectMap.get("yem_lenghtunit"));//长度计量单位 + addNew.set("yem_long", stringObjectMap.get("yem_long"));//长 + addNew.set("yem_wide", stringObjectMap.get("yem_wide"));//宽 + addNew.set("yem_high", stringObjectMap.get("yem_high"));//高 + addNew.set("yem_vol", stringObjectMap.get("yem_vol"));//体积 + addNew.set("yem_volm3", stringObjectMap.get("yem_volm3"));//体积M3 + addNew.set("yem_volm3sum", stringObjectMap.get("yem_volm3sum"));//总体积M3 + addNew.set("yem_grossweightsum", stringObjectMap.get("yem_grossweightsum"));//总毛重 + addNew.set("yem_baseunit_if", stringObjectMap.get("yem_baseunit"));//基本计量单位 + addNew.set("yem_baseqty_if", stringObjectMap.get("yem_baseqty"));//基本单位数量 + addNew.set("yem_salenumberno", stringObjectMap.get("yem_contractnumbers_m"));//外销合同号 + addNew.set("yem_outnumberno", stringObjectMap.get("yem_shipmentnumbers_m"));//出运明细单号 + addNew.set("yem_sourcebillno_d", storageTran.getString("billno"));//源单编号 + addNew.set("yem_sourcebilltype_e", storageTran.getDynamicObjectType().getName());//源单类型 + addNew.set("yem_sourcebillid_d", storageTran.getPkValue());//源单id + addNew.set("yem_sourceentryid", entryId);//来源单据分录id + addNew.set("yem_corebilltype_e", stringObjectMap.get("yem_corebilltype_e"));//核心单类型 + addNew.set("yem_corebillno_d", stringObjectMap.get("yem_corebillno_d"));//核心单编号 + addNew.set("yem_corebillid_d", stringObjectMap.get("yem_corebillid_d"));//核心单据id + addNew.set("yem_coreentryid", stringObjectMap.get("yem_coreentryid"));//核心单据分录id + repairRelation(storageTran, "yem_es_materialinfo", addNew); + } + //反写装箱单数量 + DynamicObjectCollection yem_es_materialinfo = storageTran.getDynamicObjectCollection("yem_es_materialinfo"); + for (DynamicObject dt : yem_es_materialinfo) { + DynamicObjectCollection materialinfo_mi = enCasement.getDynamicObjectCollection("yem_im_materialinfo_mi"); + for (DynamicObject miSon : materialinfo_mi) { + long aLong = miSon.getLong("yem_sourceentryid"); + if (((long) dt.getPkValue()) == aLong) { + BigDecimal yemQty = dt.getBigDecimal("yem_qty"); + BigDecimal yemQtyMi = miSon.getBigDecimal("yem_shipmentqty"); + BigDecimal yemPackingqty = miSon.getBigDecimal("yem_packingqty"); + //数量增加 + if (yemQty.compareTo(yemQtyMi) > 0) { + miSon.set("yem_shipmentqty", yemQty); + } + //数量减少 + if (yemQty.compareTo(yemQtyMi) < 0) { + if (yemQty.compareTo(yemPackingqty) > 0) { miSon.set("yem_shipmentqty", yemQty); } - //数量减少 - if (yemQty.compareTo(yemQtyMi) < 0) { - if (yemQty.compareTo(yemPackingqty) > 0) { - miSon.set("yem_shipmentqty", yemQty); - } - } } } } - OperationResult save = OperationServiceHelper.executeOperate("save", enCasement.getDataEntityType().getName(), new DynamicObject[]{enCasement}, OperateOption.create()); - if (!save.isSuccess()) { - throw new KDBizException("下游装箱单保存失败！"); - } - OperationServiceHelper.executeOperate("save", enCasement.getDataEntityType().getName(), new Object[]{enCasement.getPkValue()}, OperateOption.create()); } - - - if ("save".equals(e.getOperationKey())) { - // 单据保存时根据明细信息 大柜和小柜数量不为空的明细行 的箱型箱量，去重合并拼接生成 - for (DynamicObject entity : storageTrans) { - BoxTypeDataGen.genBoxTypeData(entity); - } + OperationResult save = OperationServiceHelper.executeOperate("save", enCasement.getDataEntityType().getName(), new DynamicObject[]{enCasement}, OperateOption.create()); + if (!save.isSuccess()) { + throw new KDBizException("下游装箱单保存失败！"); } + OperationServiceHelper.executeOperate("save", enCasement.getDataEntityType().getName(), new Object[]{enCasement.getPkValue()}, OperateOption.create()); + } + + if ("save".equals(e.getOperationKey())) { + // 单据保存时根据明细信息 大柜和小柜数量不为空的明细行 的箱型箱量，去重合并拼接生成 + for (DynamicObject entity : storageTrans) { + BoxTypeDataGen.genBoxTypeData(entity); + } } } diff --git a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSubmitOp.java b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSubmitOp.java index a31271e3..2682bca8 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSubmitOp.java +++ b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransSubmitOp.java @@ -21,11 +21,9 @@ import java.util.*; * @Created by ZZSLL */ -public class StorageTransSubmitOp extends AbstractOperationServicePlugIn -{ +public class StorageTransSubmitOp extends AbstractOperationServicePlugIn { @Override - public void onPreparePropertys(PreparePropertysEventArgs e) - { + public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); List fieldKeys = e.getFieldKeys(); fieldKeys.addAll(this.billEntityType.getAllFields().keySet()); diff --git a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransUnAuditOp.java b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransUnAuditOp.java index 543f1047..714e8390 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransUnAuditOp.java +++ b/src/main/java/com/yem/wm/es/storagetrans/op/StorageTransUnAuditOp.java @@ -27,8 +27,7 @@ public class StorageTransUnAuditOp extends AbstractOperationServicePlugIn implem @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void endOperationTransaction(EndOperationTransactionArgs e) { diff --git a/src/main/java/com/yem/wm/es/xsalesorder/op/XSalesOrderSubmitOp.java b/src/main/java/com/yem/wm/es/xsalesorder/op/XSalesOrderSubmitOp.java index d4631b2a..1d0d2582 100644 --- a/src/main/java/com/yem/wm/es/xsalesorder/op/XSalesOrderSubmitOp.java +++ b/src/main/java/com/yem/wm/es/xsalesorder/op/XSalesOrderSubmitOp.java @@ -20,12 +20,7 @@ public class XSalesOrderSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_shippingqty"); - fieldKeys.add("yem_orderqty"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/fm/gathering/op/ClaimCentersSaveOp.java b/src/main/java/com/yem/wm/fm/gathering/op/ClaimCentersSaveOp.java index 41dd4a0e..77ff97d2 100644 --- a/src/main/java/com/yem/wm/fm/gathering/op/ClaimCentersSaveOp.java +++ b/src/main/java/com/yem/wm/fm/gathering/op/ClaimCentersSaveOp.java @@ -16,10 +16,7 @@ public class ClaimCentersSaveOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_salcontractno"); - fieldKeys.add("yem_salcontractamt"); - fieldKeys.add("yem_salcontractclaamt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/fm/gathering/op/CreatePlusMinusOp.java b/src/main/java/com/yem/wm/fm/gathering/op/CreatePlusMinusOp.java index 1726e6a9..531d2239 100644 --- a/src/main/java/com/yem/wm/fm/gathering/op/CreatePlusMinusOp.java +++ b/src/main/java/com/yem/wm/fm/gathering/op/CreatePlusMinusOp.java @@ -36,15 +36,7 @@ public class CreatePlusMinusOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_salcontractno"); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_bizstatus"); - fieldKeys.add("yem_bizstatus"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/fm/gathering/op/UnCreatePlusMinusOp.java b/src/main/java/com/yem/wm/fm/gathering/op/UnCreatePlusMinusOp.java index 0dd79401..fd0c9031 100644 --- a/src/main/java/com/yem/wm/fm/gathering/op/UnCreatePlusMinusOp.java +++ b/src/main/java/com/yem/wm/fm/gathering/op/UnCreatePlusMinusOp.java @@ -29,8 +29,7 @@ public class UnCreatePlusMinusOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditAuditOp.java b/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditAuditOp.java index 76eaf9d9..3ce4515a 100644 --- a/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditAuditOp.java +++ b/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditAuditOp.java @@ -21,8 +21,7 @@ public class LetterCreditAuditOp extends AbstractOperationServicePlugIn { public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_fm_materialinfo"); - fieldKeys.add("yem_salecontract"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditUnAuditOp.java b/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditUnAuditOp.java index 7119a1e9..8c8567cc 100644 --- a/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditUnAuditOp.java +++ b/src/main/java/com/yem/wm/fm/lettercredit/op/LetterCreditUnAuditOp.java @@ -19,9 +19,7 @@ public class LetterCreditUnAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_fm_materialinfo"); - fieldKeys.add("yem_salecontract"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDelOp.java b/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDelOp.java index 0fddca37..e3811a94 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDelOp.java +++ b/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDelOp.java @@ -14,10 +14,7 @@ import java.util.List; public class DetailedInfoDelOp extends AbstractOperationServicePlugIn implements Plugin { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_im_detailedinfor"); - fieldKeys.add("yem_intauditbusano"); - fieldKeys.add("yem_intauditbusaid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDeletOp.java b/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDeletOp.java index 6203caa1..4eda3ef4 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDeletOp.java +++ b/src/main/java/com/yem/wm/im/clientdemand/op/DetailedInfoDeletOp.java @@ -14,8 +14,7 @@ import java.util.List; public class DetailedInfoDeletOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_synchronization"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineDelOp.java b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineDelOp.java index d2dbcefa..96bfb5c2 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineDelOp.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineDelOp.java @@ -16,8 +16,7 @@ public class CsrCreditLineDelOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_im_info"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSaveOp.java b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSaveOp.java index fa00872c..b4f7a6da 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSaveOp.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSaveOp.java @@ -22,12 +22,7 @@ public class CsrCreditLineSaveOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer"); - fieldKeys.add("org"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_customercountry"); - fieldKeys.add("yem_type"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void beforeExecuteOperationTransaction(BeforeOperationArgs e) { diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSubmitOp.java b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSubmitOp.java index 6ef6da92..b894ecbf 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSubmitOp.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/op/CsrCreditLineSubmitOp.java @@ -15,11 +15,7 @@ public class CsrCreditLineSubmitOp extends AbstractOperationServicePlugIn implem @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer"); - fieldKeys.add("org"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_payment"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewAuditPlugin.java b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewAuditPlugin.java index 5965d3a5..0f88366b 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewAuditPlugin.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewAuditPlugin.java @@ -38,8 +38,7 @@ public class DebCredNewAuditPlugin extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_groupcusfields"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java index 075eb470..d4db9813 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java @@ -32,8 +32,7 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_groupcusfields"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeEASSubmitOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeEASSubmitOp.java index 694b9d6a..bae1b50e 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeEASSubmitOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeEASSubmitOp.java @@ -18,13 +18,7 @@ public class DeliverNoticeEASSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_org"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_warehouse"); - fieldKeys.add("yem_location"); - fieldKeys.add("yem_lotnumber"); - fieldKeys.add("yem_qty"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java index 2a0ba495..eec6c9f2 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewAuditOp.java @@ -37,9 +37,7 @@ public class DeliverNoticeNewAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_isaccgift"); - fieldKeys.add("yem_isaccgift"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewUnAuditOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewUnAuditOp.java index f0e605e2..9035c84a 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewUnAuditOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeNewUnAuditOp.java @@ -29,13 +29,7 @@ public class DeliverNoticeNewUnAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_isaccgift"); - fieldKeys.add("yem_contractallamt"); - fieldKeys.add("yem_contractadvanceamt"); - fieldKeys.add("yem_deliveramt"); - fieldKeys.add("yem_thisdeliveramt"); - fieldKeys.add("yem_thisrealityamt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeSubmitOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeSubmitOp.java index 1dd71338..baf637fb 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeSubmitOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticeSubmitOp.java @@ -36,39 +36,7 @@ public class DeliverNoticeSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_corebilltype"); - fieldKeys.add("yem_corebillid"); - fieldKeys.add("yem_totalallamount"); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("billno"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_isaccgift"); - fieldKeys.add("yem_acccurrency"); - fieldKeys.add("yem_accrate"); - fieldKeys.add("yem_saleorder"); - fieldKeys.add("yem_products"); - fieldKeys.add("yem_productstree"); - fieldKeys.add("yem_num"); - fieldKeys.add("yem_singleaccamt"); - fieldKeys.add("yem_singleaccamtbase"); - fieldKeys.add("yem_accamt"); - fieldKeys.add("yem_accamtbase"); - fieldKeys.add("yem_remarke"); - fieldKeys.add("yem_contractallamt"); - fieldKeys.add("yem_contractadvanceamt"); - fieldKeys.add("yem_deliveramt"); - fieldKeys.add("yem_thisdeliveramt"); - fieldKeys.add("yem_thisrealityamt"); - fieldKeys.add("yem_amt"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_contractnum"); - fieldKeys.add("yem_customer"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_es_materialinfo.yem_materiel"); - fieldKeys.add("yem_es_materialinfo.seq"); - fieldKeys.add("yem_company"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticesSubmitOp.java b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticesSubmitOp.java index 0961465e..c176bbf6 100644 --- a/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticesSubmitOp.java +++ b/src/main/java/com/yem/wm/im/delivernotice/op/DeliverNoticesSubmitOp.java @@ -12,38 +12,7 @@ public class DeliverNoticesSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_corebilltype"); - fieldKeys.add("yem_corebillid"); - fieldKeys.add("yem_totalallamount"); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("billno"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_isaccgift"); - fieldKeys.add("yem_acccurrency"); - fieldKeys.add("yem_accrate"); - fieldKeys.add("yem_saleorder"); - fieldKeys.add("yem_products"); - fieldKeys.add("yem_productstree"); - fieldKeys.add("yem_num"); - fieldKeys.add("yem_singleaccamt"); - fieldKeys.add("yem_singleaccamtbase"); - fieldKeys.add("yem_accamt"); - fieldKeys.add("yem_accamtbase"); - fieldKeys.add("yem_remarke"); - fieldKeys.add("yem_contractallamt"); - fieldKeys.add("yem_contractadvanceamt"); - fieldKeys.add("yem_deliveramt"); - fieldKeys.add("yem_thisdeliveramt"); - fieldKeys.add("yem_thisrealityamt"); - fieldKeys.add("yem_amt"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_contractnum"); - fieldKeys.add("yem_customer"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_es_materialinfo.yem_materiel"); - fieldKeys.add("yem_es_materialinfo.seq"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void onAddValidators(AddValidatorsEventArgs e) { diff --git a/src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java b/src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java index 8d82f729..c64ac875 100644 --- a/src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java +++ b/src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java @@ -21,20 +21,7 @@ public class InquirylistAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_multiconfig"); - fieldKeys.add("yem_productstree"); - fieldKeys.add("yem_configurtype"); - fieldKeys.add("yem_configentryid"); - fieldKeys.add("yem_marketprice"); - fieldKeys.add("yem_marketraiseprice"); - fieldKeys.add("yem_im_detailedinfor"); - fieldKeys.add("yem_configurname"); - fieldKeys.add("yem_configurtypeen"); - fieldKeys.add("yem_specification_o"); - fieldKeys.add("yem_arguments"); - fieldKeys.add("yem_remarkss"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaDelOp.java b/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaDelOp.java index 9af15583..e8f49323 100644 --- a/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaDelOp.java +++ b/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaDelOp.java @@ -25,11 +25,7 @@ public class IntAuditBuSaDelOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sourcebilltype"); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_needbillintauditno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaUnAuditOp.java b/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaUnAuditOp.java index e90c80f0..1182c0f8 100644 --- a/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaUnAuditOp.java +++ b/src/main/java/com/yem/wm/im/intauditbusa/op/IntAuditBuSaUnAuditOp.java @@ -24,11 +24,7 @@ public class IntAuditBuSaUnAuditOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("yem_sourcebillno"); -// fieldKeys.add("yem_intauditbusaid"); -// fieldKeys.add("billno"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/priceLibrary/op/PriceLibrarySubmitOp.java b/src/main/java/com/yem/wm/im/priceLibrary/op/PriceLibrarySubmitOp.java index 5f004368..dd417446 100644 --- a/src/main/java/com/yem/wm/im/priceLibrary/op/PriceLibrarySubmitOp.java +++ b/src/main/java/com/yem/wm/im/priceLibrary/op/PriceLibrarySubmitOp.java @@ -16,19 +16,7 @@ import java.util.List; public class PriceLibrarySubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_optional"); - fieldKeys.add("yem_replaceable"); - fieldKeys.add("yem_retrofitting"); - fieldKeys.add("yem_salesmarkup_o"); - fieldKeys.add("yem_profilename_o"); - fieldKeys.add("yem_replaceable"); - fieldKeys.add("yem_profilename_re"); - fieldKeys.add("yem_salesmarkup_re"); - fieldKeys.add("yem_retrofitting"); - fieldKeys.add("yem_salesmarkup_rt"); - fieldKeys.add("yem_profilename_rt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/sourceapply/op/SourceApplyDelOp.java b/src/main/java/com/yem/wm/im/sourceapply/op/SourceApplyDelOp.java index 51db1b1c..ac83a39b 100644 --- a/src/main/java/com/yem/wm/im/sourceapply/op/SourceApplyDelOp.java +++ b/src/main/java/com/yem/wm/im/sourceapply/op/SourceApplyDelOp.java @@ -18,12 +18,7 @@ import java.util.List; public class SourceApplyDelOp extends AbstractOperationServicePlugIn implements Plugin { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_sourcebilltype"); - fieldKeys.add("yem_sourcebillid"); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_sourceentryids"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/im/tracktaskconsole/op/TrackTaskConsoleSaveOp.java b/src/main/java/com/yem/wm/im/tracktaskconsole/op/TrackTaskConsoleSaveOp.java index 17f4faea..d262455d 100644 --- a/src/main/java/com/yem/wm/im/tracktaskconsole/op/TrackTaskConsoleSaveOp.java +++ b/src/main/java/com/yem/wm/im/tracktaskconsole/op/TrackTaskConsoleSaveOp.java @@ -26,44 +26,7 @@ import java.util.*; public class TrackTaskConsoleSaveOp extends AbstractOperationServicePlugIn implements Plugin { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_sourcebillid_d"); - fieldKeys.add("yem_sourceentryid"); - fieldKeys.add("yem_entrtyid"); - fieldKeys.add("yem_resourcescode"); - fieldKeys.add("yem_milltype"); - fieldKeys.add("yem_yieldway"); - fieldKeys.add("yem_prepareway"); - fieldKeys.add("yem_vehicleno"); - fieldKeys.add("yem_reformresources"); - fieldKeys.add("yem_engineno"); - fieldKeys.add("yem_enginemodel"); - fieldKeys.add("yem_enginevendor"); - fieldKeys.add("yem_currentstate"); - fieldKeys.add("yem_currentstatedate"); - fieldKeys.add("yem_assembleupline"); - fieldKeys.add("yem_upline"); - fieldKeys.add("yem_assembledownline"); - fieldKeys.add("yem_downline"); - fieldKeys.add("yem_debugst"); - fieldKeys.add("yem_debugstatdate"); - fieldKeys.add("yem_waitforinspection"); - fieldKeys.add("yem_waitforinspecdate"); - fieldKeys.add("yem_accuracytest"); - fieldKeys.add("yem_accuratdate"); - fieldKeys.add("yem_qualitytest"); - fieldKeys.add("yem_qualitytestdate"); - fieldKeys.add("yem_factputstor"); - fieldKeys.add("yem_factputstordate"); - fieldKeys.add("yem_backonline"); - fieldKeys.add("yem_backonlinedate"); - fieldKeys.add("yem_putintostorage"); - fieldKeys.add("yem_putintostoragedate"); - fieldKeys.add("yem_vehicleremark"); - fieldKeys.add("yem_ifdelivered"); - fieldKeys.add("yem_stockway"); - fieldKeys.add("yem_isvmi"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/tracktaskconsole/op/TracktaskconsoleSubmitOp.java b/src/main/java/com/yem/wm/im/tracktaskconsole/op/TracktaskconsoleSubmitOp.java index 63c2584a..842be1c2 100644 --- a/src/main/java/com/yem/wm/im/tracktaskconsole/op/TracktaskconsoleSubmitOp.java +++ b/src/main/java/com/yem/wm/im/tracktaskconsole/op/TracktaskconsoleSubmitOp.java @@ -20,17 +20,7 @@ public class TracktaskconsoleSubmitOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_nqty"); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_es_salesorder_r.yem_isvmi"); - - - fieldKeys.add("yem_es_salesorder_r"); - fieldKeys.add("yem_es_salesorder_r.seq"); - fieldKeys.add("yem_es_salesorder_r.yem_stockway"); -// fieldKeys.add("yem_intauditbusaid"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/im/transferorder/op/TransFerOrderSubmitMustInputOp.java b/src/main/java/com/yem/wm/im/transferorder/op/TransFerOrderSubmitMustInputOp.java index 91bd7caf..22abb373 100644 --- a/src/main/java/com/yem/wm/im/transferorder/op/TransFerOrderSubmitMustInputOp.java +++ b/src/main/java/com/yem/wm/im/transferorder/op/TransFerOrderSubmitMustInputOp.java @@ -18,22 +18,7 @@ public class TransFerOrderSubmitMustInputOp extends AbstractOperationServicePlug @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_materialname"); - fieldKeys.add("yem_shippersalesorg"); - fieldKeys.add("yem_deliveryinventoryorg"); - fieldKeys.add("yem_entryoutwarehouse"); - fieldKeys.add("yem_receinventoryorg"); - fieldKeys.add("yem_entryinwarehouse"); - fieldKeys.add("yem_deliverywarehouse"); - fieldKeys.add("yem_receinventory"); - fieldKeys.add("yem_supwarehouse"); - fieldKeys.add("yem_cuswarehouse"); - fieldKeys.add("yem_unit"); - fieldKeys.add("yem_baseunit"); - fieldKeys.add("yem_planindate"); - fieldKeys.add("yem_planoutdate"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java index 103b53a2..e1b381ad 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBill.java @@ -42,40 +42,7 @@ public class OrderProReqBill extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_indepcode"); - fieldKeys.add("yem_reasoncode"); - fieldKeys.add("yem_applyuser"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_contremark"); - fieldKeys.add("yem_depcode"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_isvmi"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_manufacturer"); - fieldKeys.add("yem_manufacturername"); - fieldKeys.add("yem_remarks1"); - fieldKeys.add("yem_warehouse"); - fieldKeys.add("yem_whman"); - fieldKeys.add("yem_outwhcode"); - fieldKeys.add("yem_outstockercode"); - fieldKeys.add("yem_whlocation"); - fieldKeys.add("yem_warearea"); - fieldKeys.add("yem_outpositioncode"); - fieldKeys.add("yem_outareacode"); - fieldKeys.add("yem_stockbatch"); - fieldKeys.add("yem_sup"); - fieldKeys.add("yem_transfercode"); - fieldKeys.add("yem_callinorg"); - fieldKeys.add("yem_calloutorg"); - fieldKeys.add("yem_retrievecode"); - fieldKeys.add("yem_retrievecode"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_iscmmp"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java index f3abc7e8..a56afc07 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillCG.java @@ -39,39 +39,7 @@ public class OrderProReqBillCG extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_indepcode"); - fieldKeys.add("yem_reasoncode"); - fieldKeys.add("yem_applyuser"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_contremark"); - fieldKeys.add("yem_depcode"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_isvmi"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_manufacturer"); - fieldKeys.add("yem_manufacturername"); - fieldKeys.add("yem_remarks1"); - fieldKeys.add("yem_warehouse"); - fieldKeys.add("yem_whman"); - fieldKeys.add("yem_outwhcode"); - fieldKeys.add("yem_outstockercode"); - fieldKeys.add("yem_whlocation"); - fieldKeys.add("yem_warearea"); - fieldKeys.add("yem_outpositioncode"); - fieldKeys.add("yem_outareacode"); - fieldKeys.add("yem_stockbatch"); - fieldKeys.add("yem_sup"); - fieldKeys.add("yem_receiveruser"); - fieldKeys.add("yem_arrivedate"); - fieldKeys.add("yem_buyerr"); - fieldKeys.add("yem_iscmmppj"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_qualitierr"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java index e080a286..4f3c284c 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java +++ b/src/main/java/com/yem/wm/syn/cmmp/addnew/OrderProReqBillWMI.java @@ -40,39 +40,7 @@ public class OrderProReqBillWMI extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_indepcode"); - fieldKeys.add("yem_reasoncode"); - fieldKeys.add("yem_applyuser"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_contremark"); - fieldKeys.add("yem_depcode"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_isvmi"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_manufacturer"); - fieldKeys.add("yem_manufacturername"); - fieldKeys.add("yem_remarks1"); - fieldKeys.add("yem_warehouse"); - fieldKeys.add("yem_whman"); - fieldKeys.add("yem_outwhcode"); - fieldKeys.add("yem_outstockercode"); - fieldKeys.add("yem_whlocation"); - fieldKeys.add("yem_warearea"); - fieldKeys.add("yem_outpositioncode"); - fieldKeys.add("yem_outareacode"); - fieldKeys.add("yem_stockbatch"); - fieldKeys.add("yem_sup"); - fieldKeys.add("yem_receiveruser"); - fieldKeys.add("yem_gcxm"); - fieldKeys.add("yem_yfxm"); - fieldKeys.add("yem_fyxm"); - fieldKeys.add("yem_iscmmpapply"); - fieldKeys.add("yem_bd_products"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/cmmp/delete/OrderProReqBillDelCMMP.java b/src/main/java/com/yem/wm/syn/cmmp/delete/OrderProReqBillDelCMMP.java index f905386f..93647349 100644 --- a/src/main/java/com/yem/wm/syn/cmmp/delete/OrderProReqBillDelCMMP.java +++ b/src/main/java/com/yem/wm/syn/cmmp/delete/OrderProReqBillDelCMMP.java @@ -40,16 +40,7 @@ public class OrderProReqBillDelCMMP extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_isvmi"); - fieldKeys.add("yem_iscmmppj"); - fieldKeys.add("yem_iscmmp"); - fieldKeys.add("yem_iscmmpapply"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_calloutorg"); - fieldKeys.add("yem_depcode"); - fieldKeys.add("yem_billstatusfield"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/GathEringService.java b/src/main/java/com/yem/wm/syn/eas/GathEringService.java index 220f8435..bec14b6c 100644 --- a/src/main/java/com/yem/wm/syn/eas/GathEringService.java +++ b/src/main/java/com/yem/wm/syn/eas/GathEringService.java @@ -39,26 +39,7 @@ public class GathEringService extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_financeaffirm"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_paymenttype"); - fieldKeys.add("yem_receipttype"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_sumfundsreceived"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_sumfundsreceivedba"); - fieldKeys.add("yem_receiptname"); - fieldKeys.add("yem_moneytypetl_a"); - fieldKeys.add("yem_clearing"); - fieldKeys.add("yem_comegoman"); - fieldKeys.add("yem_receipttype_a"); - fieldKeys.add("yem_receivableamt"); - fieldKeys.add("yem_receivableamtbase"); - fieldKeys.add("yem_receiptdetail"); - fieldKeys.add("yem_org"); - fieldKeys.add("yem_easbillno"); - fieldKeys.add("creator"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/eas/ImInQuirylistPJService.java b/src/main/java/com/yem/wm/syn/eas/ImInQuirylistPJService.java index 9d1c115b..9b9bcb23 100644 --- a/src/main/java/com/yem/wm/syn/eas/ImInQuirylistPJService.java +++ b/src/main/java/com/yem/wm/syn/eas/ImInQuirylistPJService.java @@ -41,26 +41,7 @@ public class ImInQuirylistPJService extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_enquirymessage"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_iscaigou"); - fieldKeys.add("yem_remark"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_im_detailedinfor"); - fieldKeys.add("yem_material"); - fieldKeys.add("yem_marketre"); - fieldKeys.add("yem_classification"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_synfalt"); - fieldKeys.add("org"); - fieldKeys.add("yem_remarks"); - fieldKeys.add("yem_pjbzwfl"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/PayapplyService.java b/src/main/java/com/yem/wm/syn/eas/PayapplyService.java index a39c25c8..cb29e730 100644 --- a/src/main/java/com/yem/wm/syn/eas/PayapplyService.java +++ b/src/main/java/com/yem/wm/syn/eas/PayapplyService.java @@ -39,38 +39,7 @@ public class PayapplyService extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("org"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("creator"); - fieldKeys.add("yem_appdepartment"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_amount"); - fieldKeys.add("yem_approvalamount"); - fieldKeys.add("yem_fktype"); - fieldKeys.add("yem_expensetype"); - fieldKeys.add("yem_plantype"); - fieldKeys.add("yem_applycause"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_applaydetail"); - fieldKeys.add("yem_e_asstacttype"); - fieldKeys.add("yem_e_asstact"); - fieldKeys.add("yem_e_assacct"); - fieldKeys.add("yem_e_bebank"); - fieldKeys.add("yem_borrowcompany"); - fieldKeys.add("yem_appdepartment"); - fieldKeys.add("yem_e_settlementtype"); - fieldKeys.add("yem_e_applyamount"); - fieldKeys.add("yem_auditamountloc"); - fieldKeys.add("yem_e_remark"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_financialorg"); - fieldKeys.add("yem_synfalt"); - fieldKeys.add("yem_account"); - fieldKeys.add("yem_applyorg"); - fieldKeys.add("yem_synceas"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java index e18dc2e1..b0d61714 100644 --- a/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java +++ b/src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java @@ -35,50 +35,7 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_customer1"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_comment"); - fieldKeys.add("yem_linkman"); - fieldKeys.add("yem_reclinkman"); - fieldKeys.add("yem_org"); - fieldKeys.add("yem_bizdate1"); - fieldKeys.add("yem_department"); - fieldKeys.add("auditor"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("auditdate"); - fieldKeys.add("yem_remark"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_unit"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_lotnumber"); - fieldKeys.add("yem_warehouse"); - fieldKeys.add("yem_baseunit"); - fieldKeys.add("yem_baseqty"); - fieldKeys.add("yem_price"); - fieldKeys.add("yem_taxrateid"); - fieldKeys.add("yem_priceandtax"); - fieldKeys.add("yem_amt"); - fieldKeys.add("yem_locamt"); - fieldKeys.add("yem_taxamount"); - fieldKeys.add("yem_curtaxamount"); - fieldKeys.add("yem_amountandtax"); - fieldKeys.add("yem_curamountandtax"); - fieldKeys.add("yem_salesorg"); - fieldKeys.add("yem_operator"); - fieldKeys.add("yem_receiveaddress"); - fieldKeys.add("yem_location"); - fieldKeys.add("yem_paymode"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_isgift"); - fieldKeys.add("EntryID"); - fieldKeys.add("yem_synfalt"); - fieldKeys.add("yem_synfalt_tag"); - fieldKeys.add("yem_saletype"); - fieldKeys.add("yem_bd_products"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_taxrate"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/YemOrderproreqbillWGService.java b/src/main/java/com/yem/wm/syn/eas/YemOrderproreqbillWGService.java index 02d8beeb..ba7473fc 100644 --- a/src/main/java/com/yem/wm/syn/eas/YemOrderproreqbillWGService.java +++ b/src/main/java/com/yem/wm/syn/eas/YemOrderproreqbillWGService.java @@ -37,28 +37,7 @@ public class YemOrderproreqbillWGService extends AbstractOperationServicePlugI @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("org"); - fieldKeys.add("yem_contremark"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("creator"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_unit"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_dept"); - fieldKeys.add("yem_biztype"); - fieldKeys.add("yem_needtype"); - fieldKeys.add("yem_applyinventoryorg"); - fieldKeys.add("yem_remarks1"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_applyuser"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override public void afterExecuteOperationTransaction(AfterOperationArgs e) { diff --git a/src/main/java/com/yem/wm/syn/eas/YemTransferorderService.java b/src/main/java/com/yem/wm/syn/eas/YemTransferorderService.java index 672fe6c8..d6672cb3 100644 --- a/src/main/java/com/yem/wm/syn/eas/YemTransferorderService.java +++ b/src/main/java/com/yem/wm/syn/eas/YemTransferorderService.java @@ -40,82 +40,7 @@ public class YemTransferorderService extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_supfinorg"); - fieldKeys.add("yem_cusfinorg"); - fieldKeys.add("yem_outdept"); - fieldKeys.add("yem_businessdirection"); - fieldKeys.add("yem_applyuser"); - fieldKeys.add("yem_supstockorg"); - fieldKeys.add("yem_cusstockorg"); - fieldKeys.add("yem_indept"); - fieldKeys.add("yem_abstract"); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_includingtax"); - fieldKeys.add("yem_initialization"); - fieldKeys.add("yem_expenseitemedit"); - fieldKeys.add("yem_rdprojects"); - fieldKeys.add("yem_project"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_batch"); - fieldKeys.add("yem_needtransfer"); - fieldKeys.add("yem_productdate"); - fieldKeys.add("yem_duedate"); - fieldKeys.add("yem_unit"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_baseunit"); - fieldKeys.add("yem_assistunit"); - fieldKeys.add("yem_price"); - fieldKeys.add("yem_assistqty"); - fieldKeys.add("yem_deliveryinventoryorg"); - fieldKeys.add("yem_shippersalesorg"); - fieldKeys.add("yem_deliverywarehouse"); - fieldKeys.add("yem_deliveryposition"); - fieldKeys.add("yem_receinventoryorg"); - fieldKeys.add("yem_receinventory"); - fieldKeys.add("yem_receposition"); - fieldKeys.add("yem_cuswarehouse"); - fieldKeys.add("yem_discountmethod"); - fieldKeys.add("yem_pricediscountrate"); - fieldKeys.add("yem_price"); - fieldKeys.add("yem_taxrate"); - fieldKeys.add("yem_pricetax"); - fieldKeys.add("yem_realitypricetax"); - fieldKeys.add("yem_amt"); - fieldKeys.add("yem_locamt"); - fieldKeys.add("yem_amounttax"); - fieldKeys.add("yem_amountfield1"); - fieldKeys.add("yem_amttax"); - fieldKeys.add("yem_baseamttax"); - fieldKeys.add("yem_planindate"); - fieldKeys.add("yem_planoutdate"); - fieldKeys.add("yem_arrangeshippingqty"); - fieldKeys.add("yem_tickoutqty"); - fieldKeys.add("yem_tickinqty"); - fieldKeys.add("yem_tickpayqtybase"); - fieldKeys.add("yem_tivkoutreceqtybase"); - fieldKeys.add("yem_amountfield2"); - fieldKeys.add("yem_tickcollectionamt"); - fieldKeys.add("yem_tivkdelicereceqty"); - fieldKeys.add("yem_remark"); - fieldKeys.add("yem_uncontrolledqty"); - fieldKeys.add("yem_qtyexceedsratio"); - fieldKeys.add("yem_qtyshortagerate"); - fieldKeys.add("yem_lifesoopcustomer"); - fieldKeys.add("yem_totalpurreturnqty"); - fieldKeys.add("yem_totasalereturnqty"); - fieldKeys.add("yem_totalpurretqtybase"); - fieldKeys.add("yem_totasaleretqtybase"); - fieldKeys.add("yem_biztype"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_baseqty"); - fieldKeys.add("yem_gift"); - fieldKeys.add("yem_businesssort"); - fieldKeys.add("yem_gift"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/eas/form/fi/PayapplyUnSubmit.java b/src/main/java/com/yem/wm/syn/eas/form/fi/PayapplyUnSubmit.java index 1779ea02..46c74d2a 100644 --- a/src/main/java/com/yem/wm/syn/eas/form/fi/PayapplyUnSubmit.java +++ b/src/main/java/com/yem/wm/syn/eas/form/fi/PayapplyUnSubmit.java @@ -16,9 +16,7 @@ public class PayapplyUnSubmit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_billtype"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/form/im/ImInQuirylistPJUnSubmit.java b/src/main/java/com/yem/wm/syn/eas/form/im/ImInQuirylistPJUnSubmit.java index 6cd0fa5f..8e654792 100644 --- a/src/main/java/com/yem/wm/syn/eas/form/im/ImInQuirylistPJUnSubmit.java +++ b/src/main/java/com/yem/wm/syn/eas/form/im/ImInQuirylistPJUnSubmit.java @@ -16,9 +16,7 @@ public class ImInQuirylistPJUnSubmit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_billtype"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/submit/op/ESDelivernoticePlugIn.java b/src/main/java/com/yem/wm/syn/eas/submit/op/ESDelivernoticePlugIn.java index adc3d0fa..0c800886 100644 --- a/src/main/java/com/yem/wm/syn/eas/submit/op/ESDelivernoticePlugIn.java +++ b/src/main/java/com/yem/wm/syn/eas/submit/op/ESDelivernoticePlugIn.java @@ -25,12 +25,7 @@ public class ESDelivernoticePlugIn extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_companyorg"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_customer1"); - fieldKeys.add("yem_es_materialinfo"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/submit/op/ImGiftApplyLyServicePlugIn.java b/src/main/java/com/yem/wm/syn/eas/submit/op/ImGiftApplyLyServicePlugIn.java index 16cf6f2a..61c33822 100644 --- a/src/main/java/com/yem/wm/syn/eas/submit/op/ImGiftApplyLyServicePlugIn.java +++ b/src/main/java/com/yem/wm/syn/eas/submit/op/ImGiftApplyLyServicePlugIn.java @@ -29,14 +29,7 @@ public class ImGiftApplyLyServicePlugIn extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_companyorg"); - fieldKeys.add("yem_materialnum"); - fieldKeys.add("yem_customer"); - fieldKeys.add("yem_im_entryentity"); - - + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/submit/op/ImInQuiryListPlugIn.java b/src/main/java/com/yem/wm/syn/eas/submit/op/ImInQuiryListPlugIn.java index 6c94dee7..c0fd086b 100644 --- a/src/main/java/com/yem/wm/syn/eas/submit/op/ImInQuiryListPlugIn.java +++ b/src/main/java/com/yem/wm/syn/eas/submit/op/ImInQuiryListPlugIn.java @@ -21,11 +21,7 @@ public class ImInQuiryListPlugIn extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_companyorg"); - fieldKeys.add("yem_im_detailedinfor"); - fieldKeys.add("yem_material"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/submit/op/OrderProReqPlugIn.java b/src/main/java/com/yem/wm/syn/eas/submit/op/OrderProReqPlugIn.java index e388fc9b..a06d7ce1 100644 --- a/src/main/java/com/yem/wm/syn/eas/submit/op/OrderProReqPlugIn.java +++ b/src/main/java/com/yem/wm/syn/eas/submit/op/OrderProReqPlugIn.java @@ -20,12 +20,7 @@ public class OrderProReqPlugIn extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_dept"); - fieldKeys.add("yem_es_materialinfo"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_realpurmateriel"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/submit/op/TransFerOrderPlugIn.java b/src/main/java/com/yem/wm/syn/eas/submit/op/TransFerOrderPlugIn.java index 8d8b00db..ae429cb9 100644 --- a/src/main/java/com/yem/wm/syn/eas/submit/op/TransFerOrderPlugIn.java +++ b/src/main/java/com/yem/wm/syn/eas/submit/op/TransFerOrderPlugIn.java @@ -20,12 +20,7 @@ public class TransFerOrderPlugIn extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_supfinorg"); - fieldKeys.add("yem_cusfinorg"); - fieldKeys.add("yem_materiel"); - fieldKeys.add("yem_es_materialinfo"); - + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/GathEringUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/GathEringUnAudit.java index 2c635d35..36882ffe 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/GathEringUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/GathEringUnAudit.java @@ -37,26 +37,7 @@ public class GathEringUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_financeaffirm"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_paymenttype"); - fieldKeys.add("yem_receipttype"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_sumfundsreceived"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_sumfundsreceivedba"); - fieldKeys.add("yem_receiptname"); - fieldKeys.add("yem_moneytypetl_a"); - fieldKeys.add("yem_clearing"); - fieldKeys.add("yem_comegoman"); - fieldKeys.add("yem_receipttype_a"); - fieldKeys.add("yem_receivableamt"); - fieldKeys.add("yem_receivableamtbase"); - fieldKeys.add("yem_receiptdetail"); - fieldKeys.add("yem_org"); - fieldKeys.add("yem_easbillno"); - fieldKeys.add("creator"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/ImGiftApplyUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/ImGiftApplyUnAudit.java index 8672830e..68dabbdf 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/ImGiftApplyUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/ImGiftApplyUnAudit.java @@ -41,23 +41,7 @@ public class ImGiftApplyUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("org"); - fieldKeys.add("yem_proposer"); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_generalasstacttype"); - fieldKeys.add("yem_provideunit"); - fieldKeys.add("yem_isacross"); - fieldKeys.add("yem_costitem"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_im_entryentity"); - fieldKeys.add("yem_materialnum"); - fieldKeys.add("yem_qty"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_reqstorageorgunit"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/ImInquiryListUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/ImInquiryListUnAudit.java index a70c6a4f..0bcf453b 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/ImInquiryListUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/ImInquiryListUnAudit.java @@ -40,23 +40,7 @@ public class ImInquiryListUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_department"); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_enquirymessage"); - fieldKeys.add("yem_bizdate"); - fieldKeys.add("yem_currency"); - fieldKeys.add("yem_exrate"); - fieldKeys.add("yem_iscaigou"); - fieldKeys.add("yem_remark"); - fieldKeys.add("creator"); - fieldKeys.add("createtime"); - fieldKeys.add("yem_im_detailedinfor"); - fieldKeys.add("yem_material"); - fieldKeys.add("yem_marketre"); - fieldKeys.add("yem_classification"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/PayapplyUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/PayapplyUnAudit.java index 032ea85b..db4c4f77 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/PayapplyUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/PayapplyUnAudit.java @@ -36,10 +36,7 @@ public class PayapplyUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_financialorg"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/YemEsDelivernoticeUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/YemEsDelivernoticeUnAudit.java index 597dcbd7..c8e0d5f1 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/YemEsDelivernoticeUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/YemEsDelivernoticeUnAudit.java @@ -31,9 +31,7 @@ public class YemEsDelivernoticeUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_org"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/YemOrderproreqbillWGUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/YemOrderproreqbillWGUnAudit.java index f5bcc225..0a90950b 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/YemOrderproreqbillWGUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/YemOrderproreqbillWGUnAudit.java @@ -28,12 +28,7 @@ public class YemOrderproreqbillWGUnAudit extends AbstractOperationServicePlugIn @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_billtype"); - fieldKeys.add("yem_dept"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_depcode"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/syn/eas/unaudit/YemTransferorderUnAudit.java b/src/main/java/com/yem/wm/syn/eas/unaudit/YemTransferorderUnAudit.java index b92e7371..8f6b9672 100644 --- a/src/main/java/com/yem/wm/syn/eas/unaudit/YemTransferorderUnAudit.java +++ b/src/main/java/com/yem/wm/syn/eas/unaudit/YemTransferorderUnAudit.java @@ -33,10 +33,7 @@ public class YemTransferorderUnAudit extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_supfinorg"); - fieldKeys.add("yem_iseas"); - fieldKeys.add("yem_synfalt"); + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/sys/opplugin/op/AttachmentsEffectchangeOp.java b/src/main/java/com/yem/wm/sys/opplugin/op/AttachmentsEffectchangeOp.java index a8356c83..a918a9fd 100644 --- a/src/main/java/com/yem/wm/sys/opplugin/op/AttachmentsEffectchangeOp.java +++ b/src/main/java/com/yem/wm/sys/opplugin/op/AttachmentsEffectchangeOp.java @@ -22,12 +22,7 @@ public class AttachmentsEffectchangeOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_masterid");//主数据内码 - fieldKeys.add("yem_version");//版本号 - fieldKeys.add("yem_effective");//已生效 - fieldKeys.add("billstatus");//单据状态 - fieldKeys.add("yem_changing");//变更中 + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/sys/opplugin/op/NewVersionOp.java b/src/main/java/com/yem/wm/sys/opplugin/op/NewVersionOp.java index 74ffc2ff..0cd6ddd2 100644 --- a/src/main/java/com/yem/wm/sys/opplugin/op/NewVersionOp.java +++ b/src/main/java/com/yem/wm/sys/opplugin/op/NewVersionOp.java @@ -50,12 +50,7 @@ public class NewVersionOp extends AbstractOperationServicePlugIn { @Override public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); - List fieldKeys = e.getFieldKeys(); - fieldKeys.add("yem_masterid");//主数据内码 - fieldKeys.add("yem_version");//版本号 - fieldKeys.add("yem_effective");//已生效 - fieldKeys.add("billstatus");//单据状态 - fieldKeys.add("yem_changing");//变更中 + e.getFieldKeys().addAll(this.billEntityType.getAllFields().keySet()); } @Override diff --git a/src/main/java/com/yem/wm/sys/opplugin/op/VerifyExistOrPush.java b/src/main/java/com/yem/wm/sys/opplugin/op/VerifyExistOrPush.java index df35ddb4..13fd62ca 100644 --- a/src/main/java/com/yem/wm/sys/opplugin/op/VerifyExistOrPush.java +++ b/src/main/java/com/yem/wm/sys/opplugin/op/VerifyExistOrPush.java @@ -34,11 +34,6 @@ public class VerifyExistOrPush extends AbstractOperationServicePlugIn { super.onPreparePropertys(e); List fieldKeys = e.getFieldKeys(); fieldKeys.addAll(this.billEntityType.getAllFields().keySet()); -// fieldKeys.add("yem_masterid");//主数据内码 -// fieldKeys.add("yem_version");//版本号 -// fieldKeys.add("yem_effective");//已生效 -// fieldKeys.add("billstatus");//单据状态 -// fieldKeys.add("yem_changing");//变更中 } @Override