初始化

Fine.OPCDaExcelImport/DataMode/IoModal.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fine.OPCDaClient
+{
+    /// <summary>
+    /// 对PLC的写入点\校验点\间隔时间(来自配置)
+    /// </summary>
+   public class IoModal 
+    {
+        /// <summary>
+        /// API调用名
+        /// </summary>
+        public string APIName { get; set; }   //API接口名
+        public string WriteTagName { get; set; }
+        public string CheckTagName { get; set; }
+        public string StrValue { get; set; }
+        public string CheckValue { get; set; }
+
+        public bool VerityCheck { get; set; } = true;
+        public bool IsCheck { get; set; } = true;  //是否进行标签读写校验,默认为：校验
+        public int DelayTime { get; set; }   //读写间隔延时
+        public List<Params> @Params { get; set; } = new List<Params>();
+    }
+
+    public class Params
+    {
+        public string Param { get; set; }
+        public List<WriteAndCheckKey> keys { get; set; } = new List<WriteAndCheckKey>();
+    }
+
+    public class WriteAndCheckKey
+    {
+        public string InputName { get; set; }
+        public string WriteTagName { get; set; }
+        public string CheckTagName { get; set; }
+        public string StrValue { get; set; }
+        public string CheckValue { get; set; }
+        public int DelayTime { get; set; }
+    }
+
+
+    /// <summary>
+    /// 工单信息
+    /// </summary>
+    public class GDinfo
+    {
+        /// <summary>
+        /// 当前设备/工序名称
+        /// </summary>
+        public string CurDev { get; set; }
+
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string GDNum { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string BatchNum { get; set; }
+
+        /// <summary>
+        /// 牌号
+        /// </summary>
+        public string BrandNum { get; set; }
+
+    }
+
+    public class TankInfo   //料筒信息---下发
+    {
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string TankPCH { get; set; }
+
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+        public string MaterielCode { get; set; }
+
+        /// <summary>
+        /// 物料重量
+        /// </summary>
+        public float MaterielWeight { get; set; }
+    }
+
+}

Fine.OPCDaExcelImport/DataMode/RetMsg.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fine.OPCDaClient.App
+{
+    public class RetMsg   //返回消息
+    {
+        public bool IsSetSuccessful { get; set; }  //执行比对情况反馈
+
+        //public string ExeTime { get; set; }  //执行时间
+        //public string ExeProc { get; set; }   //执行的过程操作
+
+        //public string Param { get; set; }  //下发的参数值
+        public string Message { get; set; }  //返回的消息说明
+        public int  ErrCode { get; set; }   //错误编码,在执行中的异常反馈(0-无故障、其它为故障编码)
+
+
+    }
+   
+    public class LogMsg   //返回消息
+    {
+        public string ExeTime { get; set; }  //执行时间
+        public string ExeProc { get; set; }   //执行的过程操作
+        public string Param { get; set; }  //下发的参数值
+        public RetMsg Retinfo;  //返回信息
+
+    }
+    public class LogMsg1   //返回消息
+    {
+        public string ExeTime { get; set; }  //执行时间
+        public bool IsSetSuccessful { get; set; }   //执行的过程操作
+
+        public List<RetMsg> Retinfo { get; set; }  //返回信息
+
+    }
+    /// <summary>
+    /// PLC执行结果
+    /// </summary>
+    public class PLCResultAll
+    {
+        /// <summary>
+        /// 执行结果详情
+        /// </summary>
+        public List<DataItem> PlcResults { get; set; } = new List<DataItem>();
+        /// <summary>
+        /// 批执行---总结果
+        /// </summary>
+        public bool Sucessful { get; set; } = true;
+        /// <summary>
+        /// 批执行---总消息
+        /// </summary>
+        public string Message { get; set; }
+    }
+
+    /// <summary>
+    /// 柜信息
+    /// </summary>
+    public class GPinfo  
+    {
+
+    }
+
+
+
+    public class SelYPno  //选柜操作
+    {
+        public string GDNum { get; set; }
+        public string BatchNum { get; set; }
+        public string BrandNum { get; set; }
+    }
+
+}

Fine.OPCDaExcelImport/Fine.OPCDaExcelImport.csproj

@@ -65,6 +65,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataMode\IoModal.cs" />
+    <Compile Include="DataMode\RetMsg.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -72,9 +74,12 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     <Compile Include="HttpTest.cs" />
+    <Compile Include="Init.cs" />
     <Compile Include="IoModal.cs" />
+    <Compile Include="JsonData.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Util\Enumic.cs" />
     <Compile Include="模型生成.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
@@ -139,5 +144,11 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Fine.Util\Fine.Util.csproj">
+      <Project>{95450657-3181-49B3-ABEB-8862741288BB}</Project>
+      <Name>Fine.Util</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Fine.OPCDaExcelImport/Form1.Designer.cs

@@ -102,6 +102,7 @@ namespace Fine.OPCDaExcelImport
             this.button2.TabIndex = 6;
             this.button2.Text = "测试";
             this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // button3
             // 

Fine.OPCDaExcelImport/Form1.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Fine.Test;
+using Newtonsoft.Json;
 using Npoi.Mapper;
 using System;
 using System.Collections.Generic;
@@ -10,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Collections;
 
 namespace Fine.OPCDaExcelImport
 {
@@ -259,51 +261,56 @@ namespace Fine.OPCDaExcelImport
                 MessageBox.Show("路径没有选择!");
             }
             var mapper = new Mapper(ExcelPathTxt.Text);
-            
+
             foreach (NPOI.SS.UserModel.IName item in mapper.Workbook.GetAllNames())
             {
                 List<HttpTest> https = new List<HttpTest>();
                 var data = mapper.Take<模型生成>(item.SheetName);
-                foreach (var D in data.Select(a=>a.Value))
+                foreach (var D in data.Select(a => a.Value))
                 {
-                    var method= D.测试方法.ToLower() == "get" ? "get" : "post";
+                    var method = D.测试方法.ToLower() == "get" ? "get" : "post";
                     var model = new HttpTest();
-                    if (method=="get")
+                    if (method == "get")
                     {
                         model.method = HttpMethodEnum.get;
                     }
-                    else if (method=="post")
+                    else if (method == "post")
                     {
                         model.method = HttpMethodEnum.post;
                     }
-                    model.url = "/api/"+D.API接口名1;
+                    model.url = "/api/" + D.API接口名1;
                     model.content = string.IsNullOrWhiteSpace(D.业务说明) ? D.组件封装 : D.业务说明;
                     if (model.method == HttpMethodEnum.post)
                     {
                         model.postjson = new List<string>();
-                        if (D.生成类型 == "单写") {
-                           
+                        if (D.生成类型 == "单写")
+                        {
+
                             foreach (var par in D.选写多值.Split('\n'))
                             {
                                 model.postjson.Add(par);
                             }
                         }
-                        else if (D.生成类型 == "选单写") {
+                        else if (D.生成类型 == "选单写")
+                        {
                             foreach (var par in D.选写多值.Split('\n'))
                             {
                                 model.postjson.Add(par);
                             }
                         }
-                        else if (D.生成类型 == "选多写") { 
+                        else if (D.生成类型 == "选多写")
+                        {
                         }
-                        else if (D.生成类型 == "多写1") { 
+                        else if (D.生成类型 == "多写1")
+                        {
                         }
-                        else if (D.生成类型 == "多写2") { 
+                        else if (D.生成类型 == "多写2")
+                        {
                         }
                     }
-                    https.Add(model) ;
-                   
-                    File.WriteAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory,item.SheetName+".txt"),JsonConvert.SerializeObject(https));
+                    https.Add(model);
+
+                    File.WriteAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, item.SheetName + ".txt"), JsonConvert.SerializeObject(https));
                 }
 
 
@@ -320,9 +327,9 @@ namespace Fine.OPCDaExcelImport
             {
                 foreach (var dt in item.Value)
                 {
-                    if (dt.Params.Count==0)
+                    if (dt.Params.Count == 0)
                     {
-                        stringBuilder.AppendLine( i+"-"+Txt(item.Key + "--------------" + dt.APIName).ToString());
+                        stringBuilder.AppendLine(i + "-" + Txt(item.Key + "--------------" + dt.APIName).ToString());
                         i++;
                     }
                 }
@@ -330,7 +337,8 @@ namespace Fine.OPCDaExcelImport
             richTextBox1.AppendText(stringBuilder.ToString());
         }
 
-        private StringBuilder Txt(string builder) {
+        private StringBuilder Txt(string builder)
+        {
             StringBuilder builder1 = new StringBuilder();
             builder1.AppendLine(builder);
             return builder1;
@@ -339,9 +347,9 @@ namespace Fine.OPCDaExcelImport
         private string apppath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "");
         public Dictionary<string, List<IoModal>> InitAllDirectoryCfg()
         {
-          
-                 return GetFiles(apppath, "*.json");
-     
+
+            return GetFiles(apppath, "*.json");
+
         }
 
         /// <summary>
@@ -349,12 +357,12 @@ namespace Fine.OPCDaExcelImport
         /// </summary>
         /// <param name="apppath"></param>
         /// <returns></returns>
-         Dictionary<string, List<IoModal>> GetFiles(string directory, string pattern = "*.*")
+        Dictionary<string, List<IoModal>> GetFiles(string directory, string pattern = "*.*")
         {
-            Dictionary<string,List<IoModal>> files = new Dictionary<string, List<IoModal>>();
+            Dictionary<string, List<IoModal>> files = new Dictionary<string, List<IoModal>>();
             foreach (var item in Directory.GetFiles(directory, pattern))
             {
-                files.Add(item,JsonConvert.DeserializeObject<List<IoModal>>(File.ReadAllText(item)));
+                files.Add(item, JsonConvert.DeserializeObject<List<IoModal>>(File.ReadAllText(item)));
             }
             foreach (var item in Directory.GetDirectories(directory))
             {
@@ -371,10 +379,44 @@ namespace Fine.OPCDaExcelImport
             foreach (var item in second)
             {
                 //if (!first.ContainsKey(item.Key))
-                    first.Add(item.Key, item.Value);
+                first.Add(item.Key, item.Value);
             }
 
             return first;
         }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+
+            Init.InitAll();
+            IEnumerable<OPCDaClient.IoModal> apiconfig = Init.ioConfig.SelectMany(a => a.Value);
+            var api = apiconfig.FirstOrDefault(a => JsonData.GETAPI().Any(b => b == "api/" + a.APIName));
+           
+
+            //foreach (KeyValuePair<OPCDaClient.Util.ModuleEnum, List<OPCDaClient.IoModal>> item in Init.ioConfig.OrderBy(a=>a.Key))
+            //{
+            //    string FileName = item.Key.ToString() + ".json";
+            //    foreach (var item in collection)
+            //    {
+
+            //    }
+            //}
+        }
+
+        private string JsonPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "NewJson");
+
+        private void WriteFile(string content)
+        {
+            if (!Directory.Exists(JsonPath))
+            {
+                Directory.CreateDirectory(JsonPath);
+            }
+            using (StreamWriter streamWriter = new StreamWriter(JsonPath, true, Encoding.UTF8))
+            {
+                streamWriter.Write(content);
+            }
+        }
+
+
     }
 }

Fine.OPCDaExcelImport/Init.cs

@@ -0,0 +1,120 @@
+using Fine.OPCDaClient;
+using Fine.OPCDaClient.Util;
+using Fine.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fine.Test
+{
+    public static class Init
+    {
+        public static Dictionary<ModuleEnum, List<IoModal>> ioConfig;
+
+        //加载配置文件
+        public static void InitAll()
+        {
+            ioConfig = new Dictionary<ModuleEnum, List<IoModal>>();
+            ioConfig.Add(ModuleEnum.HC, GetIO(ModuleEnum.HC));
+            ioConfig.Add(ModuleEnum.JL5K, GetIO(ModuleEnum.JL5K));
+            //ioConfig.Add(ModuleEnum.JL3KY, GetIO(ModuleEnum.JL3KY));
+            //ioConfig.Add(ModuleEnum.JL3KR, GetIO(ModuleEnum.JL3KR));
+            ioConfig.Add(ModuleEnum.ZK, GetIO(ModuleEnum.ZK));
+            ioConfig.Add(ModuleEnum.ZKTS, GetIO(ModuleEnum.ZKTS));
+            ioConfig.Add(ModuleEnum.ZKAB, GetIO(ModuleEnum.ZKAB));
+            ioConfig.Add(ModuleEnum.ZKSTOP, GetIO(ModuleEnum.ZKSTOP));
+
+
+            ioConfig.Add(ModuleEnum.L3_YR, GetIO(ModuleEnum.L3_YR));
+            ioConfig.Add(ModuleEnum.L3_ZH, GetIO(ModuleEnum.L3_ZH));
+            ioConfig.Add(ModuleEnum.L3_TSFK, GetIO(ModuleEnum.L3_TSFK));
+
+            ioConfig.Add(ModuleEnum.L3_JL1, GetIO(ModuleEnum.L3_JL1));
+            ioConfig.Add(ModuleEnum.L3_JL2, GetIO(ModuleEnum.L3_JL2));
+            ioConfig.Add(ModuleEnum.L3_JYG, GetIO(ModuleEnum.L3_JYG));
+            //ioConfig.Add(ModuleEnum.L3_YP, GetIO(ModuleEnum.L3_YP));
+        }
+
+        public static List<IoModal> GetConfig(ModuleEnum module)
+        {
+            if (ioConfig.ContainsKey(module))
+            {
+                return ioConfig[module];
+            }
+            else
+            {
+               
+                throw new Exception("读取配置异常!");
+            }
+        }
+
+        private static List<IoModal> GetIO(ModuleEnum module)
+        {
+            string jsonfile = string.Empty;
+            switch (module)
+            {
+                case ModuleEnum.HC:
+                    jsonfile = "config/IOL5KHC.json";
+                    break;
+                case ModuleEnum.JL5K:
+                    jsonfile = "config/IOL5KJL.json";
+                    break;
+                case ModuleEnum.JL3KY:
+                    jsonfile = "config/IOL3KJLY.json";
+                    break;
+                case ModuleEnum.JL3KR:
+                    jsonfile = "config/IOL3KJLR.json";
+                    break;
+                case ModuleEnum.ZK:
+                    jsonfile = "config/L5K_ZK.json";
+                    break;
+                case ModuleEnum.ZKTS:
+                    jsonfile = "config/L5K_ZK_TS.json";
+                    break;
+                case ModuleEnum.ZKAB:
+                    jsonfile = "config/L5K_ZK_AB.json";
+                    break;
+                case ModuleEnum.ZKSTOP:
+                    jsonfile = "config/L5K_ZK_STOP.json";
+                    break;
+                case ModuleEnum.L3_YR:
+                    jsonfile = "config/L3K_YP/L3KHC_YR.json";
+                    break;
+                case ModuleEnum.L3_ZH:
+                    jsonfile = "config/L3K_YP/L3KHC_ZH.json";
+                    break;
+                case ModuleEnum.L3_TSFK:
+                    jsonfile = "config/L3K_YP/L3KHC_TS.json";
+                    break;
+                case ModuleEnum.L3_JL1:
+                    jsonfile = "config/L3K_YP/L3KJL_1.json";
+                    break;
+                case ModuleEnum.L3_JL2:
+                    jsonfile = "config/L3K_YP/L3KJL_2.json";
+                    break;
+                case ModuleEnum.L3_YP:
+                    jsonfile = "config/L3K_YP/L3KJL_YP.json";
+                    break;
+                case ModuleEnum.L3_JYG:
+                    jsonfile = "config/L3K_YP/L3KJL_jyg.json";
+                    break;
+                default:
+                    break;
+            }
+            //转换写入标签、检查标签\时间
+            List<IoModal> varIoModal = JsonUtil.DeserializeObjectFile<List<IoModal>>(jsonfile);
+            if (varIoModal.Count > 0)
+            {
+                LogUtil.WriteEnvDlog("---加载 L5KHC的 API操作地址成功!");
+            }
+            else
+            {
+                LogUtil.WriteEnvDlog("---加载 L5KHC的 API操作地址成功!");
+            }
+
+            return varIoModal;
+        }
+    }
+}

Fine.OPCDaExcelImport/JsonData.cs

@@ -0,0 +1,237 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fine.Test
+{
+    public static class JsonData
+    {
+        public static string[] GETAPI() {
+            return new string[] {
+"api/L5KYPHC_YRSTART_HC"
+,"api/L5KYPHC_YRSTART_BP"
+,"api/L5KYPHC_YRCLOSE_HC"
+,"api/L5KYPHC_YRCLOSE_BP"
+,"api/L5KYPHC_ZHQD_BATCHSTART"
+,"api/L5KYPHC_ZHQD_START"
+,"api/L5KYPHC_TS_YPHCSTART"
+,"api/L5KYPHC_TS_YPHCFORCE"
+,"api/L5KYPHC_TS_YPHCSTOP"
+,"api/L5KYPHC_TS_BPHCSTART"
+,"api/L5KYPHC_TS_BPHCFORCE"
+,"api/L5KYPHC_TS_BPHCSTOP"
+,"api/L5KYPHC_ZHSTOP_BATCH_END"
+,"api/L5KYPHC_ZHSTOP_TASK_END"
+,"api/L5KYPHC_ZHSTOP_CLEAR_BATCH"
+,"api/L5KYPHC_ZHSTOP_STOP"
+,"api/L5KYPHC_ZHSTOP_CLEAR_PRODINFO"
+,"api/L5KYPHC_FK_AlarmReset"
+,"api/L5KYPHC_ZHQD_PATHSELECT_ZK"
+,"api/L5KYPHC_ZHQD_BP_PATHSELECT_BP"
+,"api/L5KYPHC_ZHQD_PATHCANCEL_ZK"
+,"api/L5KYPHC_ZHQD_PATHCANCEL_BP"
+,"api/L5KYPHC_ZHQD_REFSELECT"
+,"api/L5KYPHC_ZHQD_REFCANCEL"
+,"api/L5KYPJL_SBYR_START"
+,"api/L5KYPJL_SBYR_CLOSE"
+,"api/L5KYPJL_YL_Tank1Select"
+,"api/L5KYPJL_YL_Tank2Select"
+,"api/L5KYPJL_YL_Tank1_Req"
+,"api/L5KYPJL_YL_Tank2_Req"
+,"api/L5KYPJL_YL_Tank1ReqCancel"
+,"api/L5KYPJL_YL_Tank2ReqCancel"
+,"api/L5KYPJL_ZHStart_BatchStart"
+,"api/L5KYPJL_REF_START"
+,"api/L5KYPJL_REF_CANCEL"
+,"api/L5KYPJL_ZHStart_Start"
+,"api/L5KYPJL_TS_TSStart"
+,"api/L5KYPJL_TS_TSForceStart"
+,"api/L5KYPJL_TS_TSForceStop"
+,"api/L5KYPJL_ZHStop_BatchEnd"
+,"api/L5KYPJL_ZHStopRec_Pipe_InTank"
+,"api/L5KYPJL_ZHStopRec_Pipe_InTankCANCEL"
+,"api/L5KYPJL_ZHStopRec_Tank1_InMRoom"
+,"api/L5KYPJL_ZHStopRec_Tank1_InMRoomCANCEL"
+,"api/L5KYPJL_ZHStopRec_Tank2_InMRoom"
+,"api/L5KYPJL_ZHStopRec_Tank2_InMRoomCANCEL"
+,"api/L5KYPJL_ZHStopRec_Pipe_Clear"
+,"api/L5KYPJL_ZHStopRec_Pipe_ClearCANCEL"
+,"api/L5KYPJL_ZHStopRec_Tank1_Clear"
+,"api/L5KYPJL_ZHStopRec_Tank1_ClearCANCEL"
+,"api/L5KYPJL_ZHStopRec_Tank2_Clear"
+,"api/L5KYPJL_ZHStopRec_Tank2_ClearCANCEL"
+,"api/L5KYPJL_ZHStopInfoClear_BatchEnd"
+,"api/L5KYPJL_ZHStopInfoClear_TankClear"
+,"api/L5KYPJL_ZHStopInfoClear_TankEND"
+,"api/L5KYPJL_ZHStopInfoClear_BatchClear"
+,"api/L5KYPJL_ZHStopInfoClear_ProdClear"
+,"api/L5KYPJL_ZHStop_Stop"
+,"api/L5KYPJL_FK_AlarmReset"
+,"api/L5KYPJL_ZHStopInfoClear_InYG_PathClear"
+,"api/L5KYPZK_Start_BatchStart"
+,"api/L5KYPZK_Start_SetAutoDev1"
+,"api/L5KYPZK_Start_SetManualDev1"
+,"api/L5KYPZK_Start_LockDev1"
+,"api/L5KYPZK_Start_SetAutoDev2"
+,"api/L5KYPZK_Start_SetManualDev2"
+,"api/L5KYPZK_Start_LockDev2"
+,"api/L5KYPZK_Start_PathSel3K"
+,"api/L5KYPZK_Start_PathSel5K"
+,"api/L5KYPZK_ZHStart_StartDev1"
+,"api/L5KYPZK_ZHStart_StartDev2"
+,"api/L5KYPZK_ZHStart_StopDev1"
+,"api/L5KYPZK_ZHStart_StopDev2"
+,"api/L5KYPZK_ZHStop_BatchEnd"
+,"api/L5KYPZK_TS_TSstart3353"
+,"api/L5KYPZK_TS_TSforce3353"
+,"api/L5KYPZK_TS_TSstop3353"
+,"api/L5KYPZK_TS_TSstart3360"
+,"api/L5KYPZK_TS_TSforce3360"
+,"api/L5KYPZK_TS_TSstop3360"
+,"api/L5KYPZK_BoilerA_Sel"
+,"api/L5KYPZK_BoilerB_Sel"
+,"api/L5KYPZK_BoilerA_SelCancel"
+,"api/L5KYPZK_BoilerB_SelCancel"
+,"api/L5KYPZK_BoilerA_Auto"
+,"api/L5KYPZK_BoilerA_Manual"
+,"api/L5KYPZK_BoilerA_Lock"
+,"api/L5KYPZK_BoilerB_Auto"
+,"api/L5KYPZK_BoilerB_Manual"
+,"api/L5KYPZK_BoilerB_Lock"
+,"api/L5KYPZK_ZHStop_ZHTZ_Dev1Stop"
+,"api/L5KYPZK_ZHStop_ZHTZ_Dev1StopCancel"
+,"api/L5KYPZK_ZHStop_ZHTZ_Dev2Stop"
+,"api/L5KYPZK_ZHStop_ZHTZ_Dev2StopCancel"
+,"api/L5KYPZK_StopInfoClear_BatchClear"
+,"api/L5KYPZK_StopInfoClear_ProdClear"
+,"api/L5KYPZK_StopInfoClear_Aunce3354"
+,"api/L5KYPZK_StopInfoClear_Aunce3361"
+,"api/L5KYPZK_FK_AlarmReset"
+,"api/L3KYPHC_YRSTART_HC"
+,"api/L3KYPHC_YRCLOSE_HC"
+,"api/L3KYPHC_YRSTART_BP"
+,"api/L3KYPHC_YRCLOSE_BP"
+,"api/L3KYPHC_ZHQD_PATHSelZK"
+,"api/L3KYPHC_ZHQD_PATHSelQP"
+,"api/L3KYPHC_BPPX_PATHSELECT"
+,"api/L3KYPHC_BPPX_PATHCANCEL"
+,"api/L3KYPHC_YCJL_PATHSELECT"
+,"api/L3KYPHC_YCJL_PATHCANCEL"
+,"api/L3KYPHC_PathSel_DirectIn"
+,"api/L3KYPHC_PathSel_DirectInCancel"
+,"api/L3KYPHC_PathSel_ClearAll"
+,"api/L3KYPHC_ZHQD_BATCHSTART"
+,"api/L3KYPHC_ZHQD_LinkSel"
+,"api/L3KYPHC_ZHQD_LinkSelCancel"
+,"api/L3KYPHC_ZHQD_SelSlot1Cancel"
+,"api/L3KYPHC_ZHQD_SelSlot2Cancel"
+,"api/L3KYPHC_ZHQD_SelSlot3Cancel"
+,"api/L3KYPHC_ZHQD_YPGCANCEL"
+,"api/L3KYPHC_ZHQD_START"
+,"api/L3KYPHC_TS_BPHCSTART"
+,"api/L3KYPHC_TS_BPHCFORCE"
+,"api/L3KYPHC_TS_BPHCSTOP"
+,"api/L3KYPHC_ZHSTOP_BATCH_END"
+,"api/L3KYPHC_ZHSTOP_TASK_END"
+,"api/L3KYPHC_ZHSTOP_CLEAR_BATCH"
+,"api/L3KYPHC_ZHSTOP_CLEAR_PRODINFO"
+,"api/L3KYPHC_ZHSTOP_CLEAR_YPGPATH"
+,"api/L3KYPHC_ZHSTOP_STOP"
+,"api/L3KYPHC_ZHQD_SelSlot1Set"
+,"api/L3KYPHC_ZHQD_SelSlot2Set"
+,"api/L3KYPHC_ZHQD_SelSlot3Set"
+,"api/L3KYPHC_FK_AlarmReset"
+,"api/L3KYPJL1_SBYR_START"
+,"api/L3KYPJL1_SBYR_CLOSE"
+,"api/L3KYPJL1_YL_Tank1Select"
+,"api/L3KYPJL1_YL_Tank2Select"
+,"api/L3KYPJL1_YL_TankSelectCancel"
+,"api/L3KYPJL1_YL_Tank1Req"
+,"api/L3KYPJL1_YL_Tank2Req"
+,"api/L3KYPJL1_YL_Tank1Cancel"
+,"api/L3KYPJL1_YL_Tank2Cancel"
+,"api/L3KYPJL1_TS_TSStart"
+,"api/L3KYPJL1_TS_TSForceStart"
+,"api/L3KYPJL1_TS_TSForceStop"
+,"api/L3KYPJL1_ZHStart_DevStart"
+,"api/L3KYPJL1_ZHSTOP_DevSTOP"
+,"api/L3KYPJL1_FK_AlarmReset"
+,"api/L3KYPJL1_Reclaim_Pipe1PreFill"
+,"api/L3KYPJL1_Reclaim_Pipe1PreFillCancel"
+,"api/L3KYPJL1_Reclaim_Pipe2PreFill"
+,"api/L3KYPJL1_Reclaim_Pipe2PreFillCancel"
+,"api/L3KYPJL1_Reclaim_Pipe1Retrieve"
+,"api/L3KYPJL1_Reclaim_Pipe1RetrieveCancel"
+,"api/L3KYPJL1_Reclaim_Pipe2Retrieve"
+,"api/L3KYPJL1_Reclaim_Pipe2RetrieveCancel"
+,"api/L3KYPJL1_Reclaim_Tank1Discharge"
+,"api/L3KYPJL1_Reclaim_Tank1DischargeCancel"
+,"api/L3KYPJL1_Reclaim_Tank2Discharge"
+,"api/L3KYPJL1_Reclaim_Tank2DischargeCancel"
+,"api/L3KYPJL1_Reclaim_Tank1Wash"
+,"api/L3KYPJL1_Reclaim_Tank1WashCancel"
+,"api/L3KYPJL1_Reclaim_Tank2Wash"
+,"api/L3KYPJL1_Reclaim_Tank2WashCancel"
+,"api/L3KYPJL2_SBYR_START"
+,"api/L3KYPJL2_SBYR_CLOSE"
+,"api/L3KYPJL2_YL_Tank1Select"
+,"api/L3KYPJL2_YL_Tank2Select"
+,"api/L3KYPJL2_YL_TankNoSelect"
+,"api/L3KYPJL2_YL_Tank1Req"
+,"api/L3KYPJL2_YL_Tank2Req"
+,"api/L3KYPJL2_YL_Tank1Cancel"
+,"api/L3KYPJL2_YL_Tank2Cancel"
+,"api/L3KYPJL2_ZHStart_BatchStart"
+,"api/L3KYPJL2_ZHStart_LinkSel"
+,"api/L3KYPJL2_ZHStart_LinkSelCancel"
+,"api/L3KYPJL2_ZHStart_SelSolt1Cancle"
+,"api/L3KYPJL2_ZHStart_SelSolt2Cancle"
+,"api/L3KYPJL2_ZHStart_SelSolt1Set"
+,"api/L3KYPJL2_ZHStart_SelSolt2Set"
+,"api/L3KYPJL2_ZHStart_Start"
+,"api/L3KYPJL2_TS_TSStart"
+,"api/L3KYPJL2_TS_TSForceStart"
+,"api/L3KYPJL2_TS_TSForceStop"
+,"api/L3KYPJL2_ZHStop_BatchEnd"
+,"api/L3KYPJL2_ZHPump_Start"
+,"api/L3KYPJL2_ZHPump_Stop"
+,"api/L3KYPJL2_ZHStopRec_Pipe_InTank"
+,"api/L3KYPJL2_ZHStartRec_Pipe_InTank"
+,"api/L3KYPJL2_ZHStopRec_Pipe_Clear"
+,"api/L3KYPJL2_ZHStartRec_Pipe_Clear"
+,"api/L3KYPJL2_ZHStartNozzle_Clear"
+,"api/L3KYPJL2_ZHStopNozzle_Clear"
+,"api/L3KYPJL2_ZHStopRec_Tank1_InMRoom"
+,"api/L3KYPJL2_ZHStopRec_Tank2_InMRoom"
+,"api/L3KYPJL2_ZHStopRec_Tank1_WashStop"
+,"api/L3KYPJL2_ZHStopRec_Tank2_WashStop"
+,"api/L3KYPJL2_ZHSTOP_TASK_END"
+,"api/L3KYPJL2_ZHSTOP_CLEAR_BATCH"
+,"api/L3KYPJL2_ZHSTOP_CLEAR_PRODINFO"
+,"api/L3KYPJL2_ZHStopInfoClear_OutYPG_PathClear"
+,"api/L3KYPJL2_ZHStopInfoClear_OutYPG_InfoClear"
+,"api/L3KYPJL2_ZHStopInfoClear_InYG_PathClear"
+,"api/L3KYPJL2_ZHStopInfoClear_InYG_InfoClear"
+,"api/L3KYPJL2_ZHStop_Stop"
+,"api/L3KYPJL2_FK_AlarmReset"
+,"api/L3KYPYG_ZHStart_DevLinkEnable"
+,"api/L3KYPYG_ZHStart_DevLinkDisable"
+,"api/L3KYPYG_ZHStart_TaskStart"
+,"api/L3KYPYG_ZHStart_BatchStart"
+,"api/L3KYPYG_ZHStart_Start"
+,"api/L3KYPYG_ZHStop_BatchEnd"
+,"api/L3KYPYG_ZHStopInfoClear_TaskStop"
+,"api/L3KYPYG_ZHStopInfoClear_TaskEnd"
+,"api/L3KYPYG_ZHStopInfoClear_BatchClear"
+,"api/L3KYPYG_ZHStopInfoClear_ProdClear"
+,"api/L3KYPYG_ZHStopInfoClear_InYPGPathClear"
+,"api/L3KYPYG_ZHStopInfoClear_OutPYGPathClear"
+,"api/L3KYPYG_ZHStopInfoClear_InYPGInfoClear"
+,"api/L3KYPYG_ZHStop_DevZHStop"
+,"api/L3KYPYG_FK_AlarmReset"
+            };
+        }
+    }
+}

Fine.OPCDaExcelImport/Util/Enumic.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fine.OPCDaClient.Util
+{
+    public enum ModuleEnum
+    {
+        //回潮
+        HC,
+        //加料5000
+        JL5K,
+        //加料3000一次
+        JL3KY, 
+        //加料3000二次
+        JL3KR,
+        //真空
+        ZK,
+        //真空-生产提升
+        ZKTS,
+        //真空-AB锅
+        ZKAB,
+        //真空-停止
+        ZKSTOP,
+        //3K线---预热
+        L3_YR,
+        //3K线---组合启停 
+        L3_ZH,
+        //3K线---提升辅控 
+        L3_TSFK,
+        L3_JL1,  //3K线 一次加料
+        L3_JL2,//3K线 二次加料
+        L3_YP, //3K线 进柜
+        L3_JYG
+    }
+
+    public enum EAPIparType  //API传入值的分类enum
+    {
+        NoParam,            //无参数
+        InOneVal,           //传入单个值：如温度写入
+        inMultiValObj,  //传入多个值：Json方式
+        InSel,                 //传条件,查询配置操作
+        inSelAndMultiVal
+    }
+}

Fine.Util/obj/Debug/Fine.Util.csproj.FileListAbsolute.txt

@@ -49,3 +49,4 @@ E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\De
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.csproj.CopyComplete
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.dll
 E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.pdb
+E:\yszn\Fine.OPCDaClient1027_vs2019\Fine.OPCDaClient1027_vs2019\Fine.Util\obj\Debug\Fine.Util.csproj.AssemblyReference.cache