From d7a5ebf2a220e02866346dca9f97fb6da0382997 Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 20 Dec 2024 11:38:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=80=89=E8=A3=85=E3=80=81=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=97=A0=E5=AD=97=E6=AE=B5=E8=B7=B3=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java | 8 ++++++-- .../yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java b/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java index 89b3b00a..718c6997 100644 --- a/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java +++ b/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java @@ -77,7 +77,10 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin { model.setValue("yem_parameter", mechanical.getString("yem_parameter"), createRow); model.setValue("yem_remarke", mechanical.getString("yem_remarke"), createRow); model.setValue("yem_entryid", id, createRow); - model.setValue("yem_model_config_c", mechanical.getDynamicObject("yem_model_config_c"), createRow); + DynamicObject dataEntity = model.getDataEntity(true); + if (dataEntity.containsProperty("yem_model_config_c")) { + model.setValue("yem_model_config_c", mechanical.getDynamicObject("yem_model_config_c"), createRow); + } } } } @@ -182,7 +185,8 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin { parentModel.setValue("yem_remarkss", model.getValue("yem_remarke", selectRow), optionalRow); parentModel.setValue("yem_configentryid", model.getValue("yem_entryid", selectRow), optionalRow); DynamicObject modelConfigR = (DynamicObject) model.getValue("yem_model_config_c", optionalRow); - if (modelConfigR != null) { + DynamicObject parentDataEntity = parentModel.getDataEntity(true); + if (modelConfigR != null && parentDataEntity.containsProperty("yem_cname_config") && parentDataEntity.containsProperty("yem_ename_config")) { parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); } diff --git a/src/main/java/com/yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java b/src/main/java/com/yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java index 179b6883..c2d29827 100644 --- a/src/main/java/com/yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java +++ b/src/main/java/com/yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java @@ -6,6 +6,7 @@ import com.yem.wm.utils.FunctionalCommon; import com.yem.wm.utils.YEM; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; +import kd.bos.entity.MainEntityType; import kd.bos.entity.datamodel.IDataModel; import kd.bos.form.FormShowParameter; import kd.bos.form.IFormView; @@ -107,7 +108,9 @@ public class ReplaceFormPlugIn extends AbstractFormPlugin implements Plugin { // model.setValue("yem_marketraiseprice", replaceable.getBigDecimal("yem_salesmarkup_re"), entryRow); model.setValue("yem_remarke", replaceable.getString("yem_remarkr"), entryRow); model.setValue("yem_entryid", replaceable.getPkValue(), entryRow); - model.setValue("yem_model_config_r", replaceable.getDynamicObject("yem_model_config_r"), entryRow); + if (model.getDataEntity(true).containsProperty("yem_model_config_r")) { + model.setValue("yem_model_config_r", replaceable.getDynamicObject("yem_model_config_r"), entryRow); + } } } @@ -172,7 +175,8 @@ public class ReplaceFormPlugIn extends AbstractFormPlugin implements Plugin { parentModel.setValue("yem_remarkss", model.getValue("yem_remarke", selectRow), optionalRow); parentModel.setValue("yem_configentryid", model.getValue("yem_entryid", selectRow), optionalRow); DynamicObject modelConfigR = (DynamicObject) model.getValue("yem_model_config_r", optionalRow); - if (modelConfigR != null) { + DynamicObject parentDataEntity = parentModel.getDataEntity(true); + if (modelConfigR != null && parentDataEntity.containsProperty("yem_cname_config") && parentDataEntity.containsProperty("yem_ename_config")) { parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); }