|
@@ -30,6 +30,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
private readonly IMapper _mapper;
|
|
|
private readonly ILogger _logger;
|
|
|
private List<OptionConfigDto> _optionConfigs;
|
|
|
+ private bas_plc_test_scheme bas_Plc_Test_Scheme;//测试方案
|
|
|
public AddOrEditSchViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IMapper mapper,ILogger logger)
|
|
|
{
|
|
|
_dialog = dialog;
|
|
@@ -88,11 +89,12 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
{
|
|
|
//根据方案id 在方案表中查找方案名 设备名
|
|
|
int schID = Convert.ToInt32(findresult.SchemeId);
|
|
|
- var findSch = _basicPlcTestSchemeService.Find(schID);
|
|
|
- if (findSch != null)
|
|
|
+ //测试方案
|
|
|
+ bas_Plc_Test_Scheme = _basicPlcTestSchemeService.Find(schID);
|
|
|
+ if (bas_Plc_Test_Scheme != null)
|
|
|
{
|
|
|
- ScheduleName = findSch.scheme_name;
|
|
|
- DeviceName = findSch.device_name;
|
|
|
+ ScheduleName = bas_Plc_Test_Scheme.scheme_name;
|
|
|
+ DeviceName = bas_Plc_Test_Scheme.device_name;
|
|
|
|
|
|
}
|
|
|
TestName = findresult.ItemName;
|
|
@@ -442,11 +444,25 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
|
|
|
_basicPlcTestSchemeService.Add(schEntity);
|
|
|
}
|
|
|
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ //更新测试方案名称
|
|
|
+ if (Title == "编辑方案")
|
|
|
+ {
|
|
|
+ if(bas_Plc_Test_Scheme!=null)
|
|
|
+ {
|
|
|
+ bas_Plc_Test_Scheme.scheme_name = ScheduleName;
|
|
|
+ _basicPlcTestSchemeService.Edit(bas_Plc_Test_Scheme);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//查找测试方案id
|
|
|
var finsScheHave = _basicPlcTestSchemeService.FindByName(ScheduleName);
|
|
|
- if (finsScheHave != null)
|
|
|
+ if (bas_Plc_Test_Scheme != null)
|
|
|
{
|
|
|
long id = finsScheHave.scheme_id;
|
|
|
//增加或修改方案明细表
|