diff --git a/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java b/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java index 090045d..85a96e8 100644 --- a/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java +++ b/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java @@ -9,6 +9,7 @@ import kd.bos.entity.EntityMetadataCache; import kd.bos.entity.MainEntityType; import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.plugin.Plugin; +import kd.bos.entity.property.ComboProp; import kd.bos.fileservice.FileItem; import kd.bos.fileservice.FileService; import kd.bos.fileservice.FileServiceFactory; @@ -140,10 +141,17 @@ public class RecosMeasurecosFormPlugin extends AbstractFormPlugin implements Upl listvalue.add(dynamicObject.getString("entry_longnumber"));//科目编码 listvalue.add(dynamicObject.getString("entry_accountname"));//科目名称 listvalue.add(dynamicObject.getString("qeug_cwysfl"));//财务预算分类 - listvalue.add(dynamicObject.getString("entry_measureplanidx.name"));//估算口径 - DynamicObject entry_idxunit = dynamicObject.getDynamicObject("entry_idxunit"); +// listvalue.add(dynamicObject.getString("entry_measureplanidx.name"));//估算口径 + listvalue.add(dynamicObject.getString("qeug_combofield"));//估算口径 +// DynamicObject entry_idxunit = dynamicObject.getDynamicObject("entry_idxunit"); +// if (entry_idxunit!=null){ +// listvalue.add(dynamicObject.getDynamicObject("entry_idxunit").getString("name"));//单位 +// }else { +// listvalue.add(""); +// } + DynamicObject entry_idxunit = dynamicObject.getDynamicObject("qeug_entry_unit"); if (entry_idxunit!=null){ - listvalue.add(dynamicObject.getDynamicObject("entry_idxunit").getString("name"));//单位 + listvalue.add(dynamicObject.getDynamicObject("qeug_entry_unit").getString("name"));//单位 }else { listvalue.add(""); } @@ -564,13 +572,15 @@ public class RecosMeasurecosFormPlugin extends AbstractFormPlugin implements Upl sheetNameView.getModel().setValue("qeug_cwysfl",value.getQeug_cwysfl(),key);//财务预算分类 - DynamicObject measureidxexp = QueryServiceHelper.queryOne("recos_measureidxexp", "id,name,number", new QFilter("name", QCP.equals, value.getEntry_measureplanidx()).toArray()); - if (measureidxexp==null){ - sheetNameView.getModel().setValue("entry_measureplanidx",null,key); - }else { - DynamicObject recos_measureidxexp = BusinessDataServiceHelper.loadSingle(measureidxexp.getString("id"),"recos_measureidxexp"); - sheetNameView.getModel().setValue("entry_measureplanidx",recos_measureidxexp,key);//估算口径 - } +// DynamicObject measureidxexp = QueryServiceHelper.queryOne("recos_measureidxexp", "id,name,number", new QFilter("name", QCP.equals, value.getEntry_measureplanidx()).toArray()); +// if (measureidxexp==null){ +// sheetNameView.getModel().setValue("entry_measureplanidx",null,key); +// }else { +// DynamicObject recos_measureidxexp = BusinessDataServiceHelper.loadSingle(measureidxexp.getString("id"),"recos_measureidxexp"); +// sheetNameView.getModel().setValue("entry_measureplanidx",recos_measureidxexp,key);//估算口径 +// } + sheetNameView.getModel().setValue("qeug_combofield",value.getEntry_measureplanidx(),key);//估算口径 + String entry_workloadunit = value.getEntry_workloadunit(); DynamicObject unit = QueryServiceHelper.queryOne("bd_measureunits", "id,name,number", new QFilter("name", QCP.equals, entry_workloadunit).toArray());