violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge:选装、替换、加装增加字段，携带到合同

Browse Source
This commit is contained in:
zzs 2024-12-20 11:24:58 +08:00
parent 632d9e21c2
commit 6814db3516
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java
View File

@ -77,6 +77,9 @@ 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);
if (mechanical.containsProperty("yem_model_config_c")) {
model.setValue("yem_model_config_c", mechanical.getDynamicObject("yem_model_config_c"), createRow);
}
}
}
}
@ -114,6 +117,8 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin {
model.setValue("yem_specification", optional.getString("yem_specification_o"), entryRow);
model.setValue("yem_remarke", optional.getString("yem_remarke"), entryRow);
model.setValue("yem_entryid", optional.getPkValue(), entryRow);
model.setValue("yem_model_config_c", optional.getDynamicObject("yem_model_config_c"), entryRow);
model.setValue("yem_ruconfigure_c",optional.getString("yem_ruconfigure_c"),entryRow);
}
}
@ -172,6 +177,7 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin {
parentModel.setValue("yem_configurtype", "A", optionalRow);
parentModel.setValue("yem_configurname", model.getValue("yem_profilenamea", selectRow), optionalRow);
parentModel.setValue("yem_configurtypeen", model.getValue("yem_configure", selectRow), optionalRow);
parentModel.setValue("yem_configurtyperu", model.getValue("yem_ruconfigure_c", selectRow), optionalRow);
parentModel.setValue("yem_specification_o", model.getValue("yem_specification", selectRow), optionalRow);
// parentModel.setValue("yem_marketprice", marketPrice, optionalRow);
// parentModel.setValue("yem_marketraiseprice", marketRaisePrice, optionalRow);
@ -179,6 +185,13 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin {
parentModel.setValue("yem_arguments", model.getValue("yem_parameter", 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);
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);
}
}
}
}

13
src/main/java/com/yem/wm/im/priceLibrary/form/ReplaceFormPlugIn.java
View File

@ -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,6 +108,10 @@ 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_ruconfigure_c",replaceable.getString("yem_ruconfigure_r"),entryRow);
model.setValue("yem_model_config_r", replaceable.getDynamicObject("yem_model_config_r"), entryRow);
}
}
@ -164,12 +169,20 @@ public class ReplaceFormPlugIn extends AbstractFormPlugin implements Plugin {
parentModel.setValue("yem_configurtype", "B", optionalRow);
parentModel.setValue("yem_configurname", model.getValue("yem_profilenamea", selectRow), optionalRow);
parentModel.setValue("yem_configurtypeen", model.getValue("yem_configure", selectRow), optionalRow);
parentModel.setValue("yem_configurtyperu",model.getValue("yem_ruconfigure_c",selectRow),optionalRow);
parentModel.setValue("yem_specification_o", model.getValue("yem_specification", selectRow), optionalRow);
// parentModel.setValue("yem_marketprice", marketPrice, optionalRow);
// parentModel.setValue("yem_marketraiseprice", marketRaisePrice, optionalRow);
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_r", optionalRow);
DynamicObject parentDataEntity = parentModel.getDataEntity(true);
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);
}
}
}

9
src/main/java/com/yem/wm/im/priceLibrary/form/RetrofittingFormPlugIn.java
View File

@ -105,6 +105,8 @@ public class RetrofittingFormPlugIn extends AbstractFormPlugin implements Plugin
model.setValue("yem_specification",optional.getString("yem_specification_a"),entryRow);
model.setValue("yem_remarke",optional.getString("yem_remarka"),entryRow);
model.setValue("yem_entryid",optional.getPkValue(),entryRow);
model.setValue("yem_ruconfigure_c", optional.getString("yem_ruconfigure_a"), entryRow);
model.setValue("yem_model_config_r", optional.getDynamicObject("yem_model_config_a"), entryRow);
}
}
@ -161,12 +163,19 @@ public class RetrofittingFormPlugIn extends AbstractFormPlugin implements Plugin
parentModel.setValue("yem_configurtype","C",optionalRow);
parentModel.setValue("yem_configurname",model.getValue("yem_profilenamea",selectRow),optionalRow);
parentModel.setValue("yem_configurtypeen",model.getValue("yem_configure",selectRow),optionalRow);
parentModel.setValue("yem_configurtyperu",model.getValue("yem_ruconfigure_c",selectRow),optionalRow);
parentModel.setValue("yem_specification_o",model.getValue("yem_specification",selectRow),optionalRow);
// parentModel.setValue("yem_marketprice",marketPrice,optionalRow);
// parentModel.setValue("yem_marketraiseprice",marketRaisePrice,optionalRow);
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_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);
}
}
}