修改排序

BlankApp1/BlankApp1/App.config

@@ -2,11 +2,11 @@
 <configuration>
 	<appSettings>
 		<!--连接字符串 SQL Server-->
-		<add key="MySql" value="Data Source=localhost;Database=plc_point_db2;User Id='root';Password='521125';port=3306;charset=utf8mb4;"/>
+		<add key="MySql" value="Data Source=localhost;Database=plc_point_db3;User Id='root';Password='521125';port=3306;charset=utf8mb4;"/>
 	    <!--1表示欧姆龙PLC，2表示为三菱PLC-->
 		<add key="PLCType" value="2"/>
-		<add key="PLCIp" value="192.168.3.39"/>
-		<add key="PLCPort" value="6000"/>
+		<add key="PLCIp" value="192.168.0.38"/>
+		<add key="PLCPort" value="2000"/>
 		<add key="DelayTime" value="20"/>
 		<add key="LongDelayTime" value="60"/>
 	

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/AddItemDetailViewModel.cs

@@ -55,6 +55,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             _logger = logger;
             CloseCommand = new DelegateCommand(Close);
             SureCommand = new DelegateCommand<string>(Sure);
+            CancelCommand = new DelegateCommand<string>(Cancel);
             ResetCommand = new DelegateCommand<string>(ResetMethod);
             AddDetailCommand = new DelegateCommand<string>(AddPLCDetail);
             EditInCommand = new DelegateCommand<object>(EditIn);
@@ -70,6 +71,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
 
             GetConfigOption();
         }
+
+    
         #region IDIALOG实现
         public string Title { set; get; } = "新增测试项";
 
@@ -131,6 +134,15 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             //清空测试项的内容
             CleanContent();
         }
+        private void Cancel(string obj)
+        {
+            RequestClose?.Invoke(new DialogResult(ButtonResult.No));
+        }
+        /// <summary>
+        /// 打开详情
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="conList"></param>
         private void OpenEditDialog(Object obj, ObservableCollection<BasPlcItemConfigDto> conList)
         {
             int id = Convert.ToInt32(obj);
@@ -638,6 +650,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         #region 命令绑定
         public DelegateCommand CloseCommand { set; get; }
         public DelegateCommand<string> SureCommand { set; get; }
+        public DelegateCommand<string> CancelCommand { set; get; }
+        
         public DelegateCommand<string> ResetCommand { set; get; }
         public DelegateCommand<string> OpenExistCommand { set; get; }
         

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditItemDetailViewModel.cs

@@ -40,6 +40,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         private List<OptionConfigDto> _optionConfigs;
         private bas_plc_test_scheme bas_Plc_Test_Scheme;//测试方案
         private int schDtlMainId = 0;//测试方案明细主键id
+        private int globalSort = 0;
         private int delayTime = Convert.ToInt32(ConfigurationManager.AppSettings["DelayTime"]);
         private int longDelayTime = Convert.ToInt32(ConfigurationManager.AppSettings["LongDelayTime"]);
         public EditItemDetailViewModel(IDialogService dialog, IEventAggregator aggregator, IRegionManager regionManager, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBasicDeviceKindService iBasicDeviceKindService, IMapper mapper, ILogger logger)
@@ -143,6 +144,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                     DeviceKindName = bas_Plc_Test_Scheme.devicekind_name;
 
                 }
+                globalSort = findresult.Sort;
                 TestName = findresult.ItemName;
                 SelectTest = findresult.ItemType;
                 SelectTime = findresult.ItemTime.ToString();
@@ -632,7 +634,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 {
                     long id = finsScheHave.scheme_id;
                     //增加或修改方案明细表
-                    AddOrEditDetailsToDb(id);
+                    EditDetailsToDb(id);
 
                 }
                 //更新已有的测试项
@@ -653,7 +655,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
         /// <summary>
         /// 方案明细添加到数据库
         /// </summary>
-        private void AddOrEditDetailsToDb(long scheduleId)
+        private void EditDetailsToDb(long scheduleId)
         {
             //前置项json转化
             string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
@@ -662,11 +664,10 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
             //输出项json转化
             string outJsonStr = ModelToJsonToStr(SelectOutJudge, OutSelectLogic, OutDetail, OutConList);
             //添加达到测试主表
-            //增加测试方案
+            //修改测试方案
             BasicPlcTestSchemeDtlDto schDtlDto = new BasicPlcTestSchemeDtlDto();
             schDtlDto.SchemeId = scheduleId;
             schDtlDto.ItemName = TestName;
-
             schDtlDto.ItemType = SelectTest;
             schDtlDto.ItemTime =Convert.ToInt32(SelectTime);
             schDtlDto.Precondition = prefixJsonStr;
@@ -692,6 +693,7 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                             bas_plc_test_scheme_dtl schDtlEntityEdit = _mapper.Map<BasicPlcTestSchemeDtlDto, bas_plc_test_scheme_dtl>(schDtlDto);
                             //ItemType 转化
                             schDtlEntityEdit.item_type = StrToItemType(schDtlDto.ItemType);
+                            schDtlEntityEdit.sort = globalSort;
                             bool isSucc = _basicPlcTestSchemeDtlService.Edit(schDtlEntityEdit);
                             if (isSucc)
                             {