Merge branch 'dep_yangw_sec' into dep_yangw

ProductionSystem/Forms/HomeForm.cs

@@ -66,7 +66,10 @@ namespace ProductionSystem.Forms
 
             cmbProductType.SelectedItem = new ListItem { Value = Program.ProductType, Text = Program.ProductType };
 
-
+            //var temp = _paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ1_DB);
+            //string str1 = temp.PZF1.TargetVal;
+            //string str2 = temp.PZF1.Lin;
+            //string str3 = temp.PZF1.Com;
 
         }
 

ProductionSystem_Model/Enum/ModeTypeEnum.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProductionSystem_Model.Enum
+{
+    /// <summary>
+    /// 模式枚举
+    /// </summary>
+    public enum ModeTypeEnum
+    {
+        [Description("步骤(模式)1")]
+        BZ1_DB = 1,
+        [Description("步骤(模式)2")]
+        BZ2_DB = 2,
+        [Description("步骤(模式)3")]
+        BZ3_DB = 3,
+        [Description("步骤(模式)4")]
+        BZ4_DB = 4,
+        [Description("步骤(模式)5")]
+        BZ5_DB = 5,
+        [Description("步骤(模式)6")]
+        BZ6_DB = 6,
+    }
+}

ProductionSystem_Model/ProductionSystem_Model.csproj

@@ -117,6 +117,7 @@
     <Compile Include="DbModel\Ux.cs" />
     <Compile Include="Enum\ColorEnum.cs" />
     <Compile Include="Enum\FrameTypeEnum.cs" />
+    <Compile Include="Enum\ModeTypeEnum.cs" />
     <Compile Include="Enum\MsgFormatEnum.cs" />
     <Compile Include="Enum\MsgTypeEnum.cs" />
     <Compile Include="Enum\ProtocolTypeEnum.cs" />
@@ -137,7 +138,7 @@
     <Compile Include="ViewModel\Request\Test\TestStepVM.cs" />
     <Compile Include="ViewModel\Response\Para\ParaColVM.cs" />
     <Compile Include="ViewModel\Response\Para\ParaConfigVM.cs" />
-    <Compile Include="ViewModel\Response\Para\ParaTargetValVM.cs" />
+    <Compile Include="ViewModel\Response\Para\EditionType.cs" />
     <Compile Include="ViewModel\Response\Para\PointKeyValue.cs" />
     <Compile Include="ViewModel\Response\Protocol\ProtocolDetailInfo.cs" />
     <Compile Include="ViewModel\Response\Protocol\ProtocolDetailParaVM.cs" />

ProductionSystem_Model/ViewModel/Response/Para/EditionType.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProductionSystem_Model.ViewModel.Response.Para
+{
+    public class EditionPara
+    {
+        //目标值
+        public string TargetVal { get; set; }
+        //通讯方式
+        public string Lin { get; set; }
+        //端口号
+        public string Com { get; set; }
+        //错误信息
+        public string Err {  get; set; }
+    }
+
+    public class EditonType
+    {
+
+        public EditonType()
+        {
+            STF1 = new EditionPara();
+            STF2 = new EditionPara();
+            PZF1 = new EditionPara();
+            PZF2 = new EditionPara();
+            SB1 = new EditionPara();
+            SB2 = new EditionPara();
+            SB3 = new EditionPara();
+        }
+        public EditionPara STF1 { get; set; }
+        public EditionPara STF2 { get; set; }
+        public EditionPara PZF1 { get; set; }
+        public EditionPara PZF2 { get; set; }
+        public EditionPara SB1 { get; set; }
+        public EditionPara SB2 { get; set; }
+        public EditionPara SB3{ get; set; }
+    }
+
+}

ProductionSystem_Model/ViewModel/Response/Para/ParaTargetValVM.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProductionSystem_Model.ViewModel.Response.Para
-{
-    public class ParaTargetValVM
-    {
-        public string STF1TargetVal { get; set; }
-        public string STF2TargetVal { get; set; }
-        public string PZF1TargetVal { get; set; }
-        public string PZF2TargetVal { get; set; }
-        public string SB1TargetVal { get; set; }
-        public string SB2TargetVal { get; set; }
-        public string SB3TargetVal { get; set; }
-    }
-}

ProductionSystem_Service/ParaConfigService.cs

@@ -1,9 +1,12 @@
 using ProductionSystem_Log;
 using ProductionSystem_Model.DbModel.Para;
+using ProductionSystem_Model.DbModel.Protocol;
+using ProductionSystem_Model.Enum;
 using ProductionSystem_Model.ViewModel.Response.Para;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ProductionSystem_Service
 {
@@ -95,63 +98,121 @@ namespace ProductionSystem_Service
         {
             try
             {
-                var temp = db.Queryable<T_ParaConfig>().Where(m => m.ParaCategory == paraCategory && m.IsActive);
+                var temp1 = db.Queryable<T_ParaConfig>().Where(m => m.ParaCategory == paraCategory && m.IsActive);
-                return temp;
+                return temp1;
             }catch (Exception ex)
             {
                 LogHelper.Error(ex, "执行ParaConfigService下QueryTargetValWithParaCodeByParaCategery时异常");
                 return null;
             }
         }
+        private T_ParaColumnConfig QueryLinByParaCategeryAndParaCode(string paraCategory,string paraCode)
+        {
+            
+            T_ParaColumnConfig temp1 = db.Queryable<T_ParaColumnConfig>().
+                Where(m => m.ParaCategory == paraCategory && m.ParaCode == paraCode && m.IsActive).
+                First();
+            if (temp1 == null)
+            {
+                throw new Exception("未维护数据！请先维护！");
+            }
+            else
+            {
+                var temp2 = db.Queryable<T_ParaColumnConfig>().
+                Where(m => m.ParaCategory == paraCategory && m.ParaCode == paraCode && m.IsActive).
+                First().ProtocolType;
+                if (temp2 == null)
+                {
+                    temp2 = "未配置通讯方式";
+                }
+                return db.Queryable<T_ParaColumnConfig>().Where(m => m.ParaCategory == paraCategory && m.ParaCode == paraCode && m.IsActive).First();
+            }         
+        }
+        private T_Protocol_Config QueryComByLin(string lin)
+        {
+            T_Protocol_Config temp1 = db.Queryable<T_Protocol_Config>().Where(m => m.ProtocolCode == lin && m.IsActive).First();
+            if (temp1 == null)
+            {
+                throw new Exception("未维护数据！请先维护！");
+            }
+            string temp3 = db.Queryable<T_Protocol_Config>().Where(m => m.ProtocolCode == lin && m.IsActive).First().ProtocolType;
+            if (temp3 == null)
+            {
+                temp3 = "未配置串口";
+            }
+            return db.Queryable<T_Protocol_Config>().Where(m => m.ProtocolCode == lin && m.IsActive).First();
+        }
 
         /// <summary>
-        /// 根据参数种类查询有效参数配置项,例如传“BZ1”、“BZ2”
+        /// 根据参数种类查询有效参数配置项,例如传“BZ1_DB”、“BZ2_DB”
         /// </summary>
         /// <param name="paraCategory"></param>
         /// <returns></returns>
-        public ParaTargetValVM GetParaTargetVal(string paraCategory)
+        public EditonType GetParaTargetVal(ModeTypeEnum modeTypeEnum)
         {
-            ParaTargetValVM paraTargetVal = new ParaTargetValVM();
+            EditonType editonType = new EditonType();
-            var paraConfig = QueryTargetValWithParaCodeByParaCategery(paraCategory).ToList();
+            var paraConfig = QueryTargetValWithParaCodeByParaCategery(modeTypeEnum.ToString()).ToList();
             for (int i = 0; i < paraConfig.Count; i++)
             {
-                if(paraConfig[i].ParaCode == "STF1MS")
+                if(paraConfig[i].ParaCode == modeTypeEnum.ToString())
                 {
-                    paraTargetVal.STF1TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.STF1.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.STF1.TargetVal = "空值"; }
+                    editonType.STF1.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.STF1.Com = QueryComByLin(editonType.STF1.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "STF2MS")
+                else if (paraConfig[i].ParaCode == "FKSTF2ZT_DB")
                 {
-                    paraTargetVal.STF2TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.STF2.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.STF2.TargetVal = "空值"; }
+                    editonType.STF2.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.STF2.Com = QueryComByLin(editonType.STF2.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "DZPZF1")
+                else if (paraConfig[i].ParaCode == "DZPZF1_DB")
                 {
-                    paraTargetVal.PZF1TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.PZF1.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.PZF1.TargetVal = "空值"; }
+                    editonType.PZF1.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;              
+                    editonType.PZF1.Com = QueryComByLin(editonType.PZF1.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "DZPZF2")
+                else if (paraConfig[i].ParaCode == "DZPZF2_DB")
                 {
-                    paraTargetVal.PZF2TargetVal = paraConfig[i].TargetVal.ToString();
+
+                    if (paraConfig[i].TargetVal != null) { editonType.PZF2.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.PZF2.TargetVal = "空值"; }
+                    editonType.PZF2.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.PZF2.Com = QueryComByLin(editonType.PZF2.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "SB1ZS")
+                else if (paraConfig[i].ParaCode == "SB1ZS_DB")
                 {
-                    paraTargetVal.SB1TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.SB1.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.SB1.TargetVal = "空值"; }
+                    editonType.SB1.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.SB1.Com = QueryComByLin(editonType.SB1.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "SB2ZS")
+                else if (paraConfig[i].ParaCode == "SB2ZS_DB")
                 {
-                    paraTargetVal.SB2TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.SB2.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.SB2.TargetVal = "空值"; }
+                    editonType.SB2.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.SB2.Com = QueryComByLin(editonType.SB2.Lin).Port;
                     continue;
                 }
-                else if (paraConfig[i].ParaCode == "SB3ZS")
+                else if (paraConfig[i].ParaCode == "SB3ZS_DB")
                 {
-                    paraTargetVal.SB3TargetVal = paraConfig[i].TargetVal.ToString();
+                    if (paraConfig[i].TargetVal != null) { editonType.SB3.TargetVal = paraConfig[i].TargetVal.ToString(); }
+                    else { editonType.SB3.TargetVal = "空值"; }
+                    editonType.SB3.Lin = QueryLinByParaCategeryAndParaCode(modeTypeEnum.ToString(), paraConfig[i].ParaCode).ProtocolType;
+                    editonType.SB3.Com = QueryComByLin(editonType.SB3.Lin).Port;
                     continue;
                 }              
             }
-            return paraTargetVal;
+            return editonType;
         }
 
         /// <summary>