From f5efd9853c11b2c865c11cb7061ba04297f7c11f Mon Sep 17 00:00:00 2001 From: zzs Date: Tue, 31 Dec 2024 18:23:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=AF=E9=80=89=E8=A3=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BF=84=E8=AF=AD=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/im/priceLibrary/form/OptionalFormPlugIn.java | 8 +++++--- .../yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java | 8 +++++--- .../im/priceLibrary/form/RetrofittingFormPlugIn.java | 10 ++++++---- 3 files changed, 16 insertions(+), 10 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 9afa573f..7b550093 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 @@ -186,9 +186,11 @@ 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); - parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); - parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); - parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), optionalRow); + if (YEM.isNotEmpty(modelConfigR)) { + parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); + parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); + parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), 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 f944d968..e921acb8 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 @@ -178,9 +178,11 @@ public class ReplaceFormPlugIn extends AbstractFormPlugin implements Plugin { parentModel.setValue("yem_configentryid", model.getValue("yem_entryid", selectRow), optionalRow); DynamicObject modelConfigR = (DynamicObject) model.getValue("yem_model_config_r", optionalRow); DynamicObject parentDataEntity = parentModel.getDataEntity(true); - parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); - parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); - parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), optionalRow); + if (YEM.isNotEmpty(modelConfigR)) { + parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); + parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); + parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), optionalRow); + } } } diff --git a/src/main/java/com/yem/wm/im/priceLibrary/form/RetrofittingFormPlugIn.java b/src/main/java/com/yem/wm/im/priceLibrary/form/RetrofittingFormPlugIn.java index d04d8779..dbded121 100644 --- a/src/main/java/com/yem/wm/im/priceLibrary/form/RetrofittingFormPlugIn.java +++ b/src/main/java/com/yem/wm/im/priceLibrary/form/RetrofittingFormPlugIn.java @@ -170,10 +170,12 @@ public class RetrofittingFormPlugIn extends AbstractFormPlugin implements Plugin parentModel.setValue("yem_unitsetnumber", model.getValue("yem_unitsetnumber", selectRow), optionalRow); 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); - parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); - parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); - parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), optionalRow); + DynamicObject modelConfigR = (DynamicObject) model.getValue("yem_model_config_r", optionalRow); + if (YEM.isNotEmpty(modelConfigR)) { + parentModel.setValue("yem_cname_config", modelConfigR.getString("yem_standard_cname"), optionalRow); + parentModel.setValue("yem_ename_config", modelConfigR.getString("yem_standard_ename"), optionalRow); + parentModel.setValue("yem_runame_config", modelConfigR.getString("yem_standard_runame"), optionalRow); + } } }