Parcourir la source

更改数据表结构

820498063@qq.com il y a 4 mois
Parent
commit
f3501926bc
26 fichiers modifiés avec 878 ajouts et 169 suppressions
  1. 20 0
      FocasCncCollect/Entity/CNC_FTP_CONFIG.cs
  2. 3 0
      FocasCncCollect/FocasCncCollect.csproj
  3. 19 23
      FocasCncCollect/FrmEquipmentMonitor.cs
  4. 109 24
      FocasCncCollect/Models/EQUIPMENT_INFO.cs
  5. 61 7
      FocasCncCollect/Models/EQUIPMENT_LOG_STATISTICS.cs
  6. 16 10
      FocasCncCollect/Models/Enum/EquipmentSysType.cs
  7. 19 12
      FocasCncCollect/Models/Enum/EquipmentType.cs
  8. 23 0
      FocasCncCollect/Models/Enum/OnlineStatus.cs
  9. 55 0
      FocasCncCollect/Models/Enum/UploadProgType.cs
  10. 46 6
      FocasCncCollect/Models/LOG_CNC_WARN.cs
  11. 124 7
      FocasCncCollect/Models/LOG_EQUIPMENT_MSG.cs
  12. 140 9
      FocasCncCollect/Models/LOG_EQUIPMENT_MSG_TEMP.cs
  13. 0 5
      FocasCncCollect/Models/Mapping/EQUIPMENT_LOG_STATISTICSMap.cs
  14. 21 39
      FocasCncCollect/Models/Mapping/equipment_infoMap.cs
  15. 0 6
      FocasCncCollect/Models/Mapping/log_cnc_warnMap.cs
  16. 0 5
      FocasCncCollect/Models/Mapping/log_equipment_msgMap.cs
  17. 0 6
      FocasCncCollect/Models/Mapping/log_equipment_msg_tempMap.cs
  18. 3 3
      FocasCncCollect/Statistics/FrmEquipmentEfficiency.cs
  19. 6 6
      FocasCncCollect/UControl/UcCncMoniter.cs
  20. BIN
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/bin/Debug/OPCUA.dll
  21. BIN
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/bin/Debug/OPCUA.pdb
  22. 1 1
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csproj.CoreCompileInputs.cache
  23. 212 0
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csproj.FileListAbsolute.txt
  24. BIN
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csprojAssemblyReference.cache
  25. BIN
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.dll
  26. BIN
      OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.pdb

+ 20 - 0
FocasCncCollect/Entity/CNC_FTP_CONFIG.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FocasCncCollect.Entity
+{
+    /// <summary>
+    /// ftp配置项
+    /// </summary>
+    public class CNC_FTP_CONFIG
+    {
+        public string ipAddr { get; set; }
+        public int port { get; set; }
+        public string ftpUser { get; set; }
+        public string ftpPwd { get; set; }
+        public string remotePath { get; set; }
+    }
+}

+ 3 - 0
FocasCncCollect/FocasCncCollect.csproj

@@ -83,6 +83,9 @@
   <ItemGroup>
     <Compile Include="Common\GFxmlTool.cs" />
     <Compile Include="Core\BaseCore.cs" />
+    <Compile Include="Entity\CNC_FTP_CONFIG.cs" />
+    <Compile Include="Models\Enum\OnlineStatus.cs" />
+    <Compile Include="Models\Enum\UploadProgType.cs" />
     <Compile Include="TMS\Core\ToolInfo.cs" />
     <Compile Include="TMS\Core\ToolOffset.cs" />
     <Compile Include="TMS\Core\SeatInfo.cs" />

+ 19 - 23
FocasCncCollect/FrmEquipmentMonitor.cs

@@ -11,6 +11,7 @@ using FocasCncCollect.TMS.Core;
 using FocasCncCollect.TMS.Models;
 using FocasCncCollect.UControl;
 using MazakCnc;
+using Newtonsoft.Json;
 using OPCUA;
 using SiwiFms.Helper;
 using Syntec.Remote;
@@ -116,7 +117,7 @@ namespace FocasCncCollect
                 SplashScreen1.msg = "启动采集线程...";
                 cncCollectList = new List<Thread>();
 
-                var cncListTemp = cncList.FindAll(t => t.SYSTEM_TYPE != EquipmentSysType.HAAS).OrderBy(t=>t.EQUIPMENT_CODE).First();
+                var cncListTemp = cncList.FindAll(t => t.SYSTEM_TYPE != EquipmentSysType.HAAS).OrderBy(t=>t.EQUIPMENT_NO).First();
                 Thread thread = new Thread(new ParameterizedThreadStart(CollectHandle));
                 thread.Start(cncListTemp);
                 cncCollectList.Add(thread);
@@ -170,7 +171,7 @@ namespace FocasCncCollect
                         {
                             Thread.Sleep(1000);
                             bool isUpdateCnc = false;
-                            LOG_EQUIPMENT_MSG_TEMP cTemp = tempList.Find(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+                            LOG_EQUIPMENT_MSG_TEMP cTemp = tempList.Find(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
                             bool unexist = false;
                             if (cTemp == null)
                             {
@@ -460,7 +461,7 @@ namespace FocasCncCollect
                         Console.WriteLine(cnct.ThreadState.ToString() + "  " + cnct.Name);
                         //记录机床号
                         int equipNo = int.Parse(cnct.Name.Split('_')[1]);
-                        var cnc = cncList.Find(t => StringHelper.ExtractNumberFromName(t.EQUIPMENT_CODE)== equipNo);
+                        var cnc = cncList.Find(t => t.EQUIPMENT_NO == equipNo);
 
                         //关闭原进程
                         cncCollectList.Remove(cnct);
@@ -497,7 +498,7 @@ namespace FocasCncCollect
             TOOL_STORE_INFO store = iToolStoreInfo.GetList(t => t.ISVALID && t.EQUIPMENT_ID == cnc.ID).FirstOrDefault();
             //cnc.NET_IP = "192.168.201.48";
 
-            Thread.CurrentThread.Name = "CollectCnc_" + StringHelper.ExtractNumberFromName(cnc.EQUIPMENT_CODE);
+            Thread.CurrentThread.Name = "CollectCnc_" + cnc.EQUIPMENT_NO;
 
             while (true)
             {
@@ -505,7 +506,7 @@ namespace FocasCncCollect
                 try
                 {
 
-                    LOG_EQUIPMENT_MSG_TEMP cTemp = tempList.Find(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+                    LOG_EQUIPMENT_MSG_TEMP cTemp = tempList.Find(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
                     
                     bool unexist = false;
                     if (cTemp == null)
@@ -877,7 +878,7 @@ namespace FocasCncCollect
                                             warnLogItem.WARN_TIME = warn.CREATE_TIME;
                                             warnLogItem.CODE = warn.CODE;
                                             warnLogItem.MESSAGE = warn.MESSAGE;
-                                            warnLogItem.EQUIPMENT_CODE = cnc.EQUIPMENT_CODE;
+                                            warnLogItem.EQUIPMENT_NO = cnc.EQUIPMENT_NO;
                                             warnLogItem.EQUIPMENT_NAME = cnc.EQUIPMENT_NAME;
                                            
                                             warnLogItem.CREATE_TIME = now;
@@ -890,7 +891,7 @@ namespace FocasCncCollect
                                     if (waitAddWarnLog.Count > 0)
                                     {
                                         iLogCncWarn.AddRange(waitAddWarnLog);
-                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME.Value).Max();
+                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME).Max();
                                     }
                                     #endregion
                                 }
@@ -1124,7 +1125,7 @@ namespace FocasCncCollect
                                                 item.WARN_TIME = warnTime;
                                                 item.CODE = row200[0];
                                                 item.MESSAGE = row200[1];
-                                                item.EQUIPMENT_CODE = cnc.EQUIPMENT_CODE;
+                                                item.EQUIPMENT_NO = cnc.EQUIPMENT_NO;
                                                 item.EQUIPMENT_NAME = cnc.EQUIPMENT_NAME;
                                                 
                                                 item.CREATE_TIME = now;
@@ -1142,7 +1143,7 @@ namespace FocasCncCollect
                                     if (waitAddWarnLog.Count > 0)
                                     {
                                         iLogCncWarn.AddRange(waitAddWarnLog);
-                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME.Value).Max();
+                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME).Max();
                                     }
                                 }
 
@@ -1167,7 +1168,7 @@ namespace FocasCncCollect
                                 {
                                     ushort temp = 0;
                                     //未连接,重新连接
-                                    opc.Connect(cnc.NET_IP, cnc.FTP_USER, cnc.FTP_PWD);
+                                    opc.Connect(cnc.NET_IP, cnc.FtpItem.ftpUser, cnc.FtpItem.ftpPwd);
                                     if (opc.Connected)
                                     {
                                         //成功,更新句柄
@@ -1616,7 +1617,7 @@ namespace FocasCncCollect
                                             warnLogItem.WARN_TIME = warn.CREATE_TIME;
                                             warnLogItem.CODE = warn.CODE;
                                             warnLogItem.MESSAGE = warn.MESSAGE;
-                                            warnLogItem.EQUIPMENT_CODE = cnc.EQUIPMENT_CODE;
+                                            warnLogItem.EQUIPMENT_NO = cnc.EQUIPMENT_NO;
                                             warnLogItem.EQUIPMENT_NAME = cnc.EQUIPMENT_NAME;
                                             
                                             warnLogItem.CREATE_TIME = now;
@@ -1628,18 +1629,12 @@ namespace FocasCncCollect
                                     if (waitAddWarnLog.Count > 0)
                                     {
                                         iLogCncWarn.AddRange(waitAddWarnLog);
-                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME.Value).Max();
+                                        cnc.LogNewstTime = waitAddWarnLog.Select(t => t.WARN_TIME).Max();
                                     }
                                 }
 
                                 #endregion 新代采集
 
-                                break;
-                            }
-                        case EquipmentSysType.GF:
-                            {
-                                //GFxmlTool
-
                                 break;
                             }
                         case EquipmentSysType.HAAS:
@@ -1708,7 +1703,8 @@ namespace FocasCncCollect
             //数据库最新告警时间
             var allLogList = iLogCncWarn.GetList(t => t.ISVALID);
             //机床
-            cncList = iEquipmentInfo.GetList(t => t.IS_USING == YesOrNo.Yes && t.ISVALID).OrderByDescending(t => StringHelper.ExtractNumberFromName(t.EQUIPMENT_CODE)).ToList();
+            cncList = iEquipmentInfo.GetList(t => t.ISVALID).OrderByDescending(t => t.EQUIPMENT_NO).ToList();
+            cncList.ForEach(t => { t.FtpItem = JsonConvert.DeserializeObject<CNC_FTP_CONFIG>(t.FTP_CONFIG); });
 
             //刀库
             toolStoreList = iToolStoreInfo.GetList(t => t.ISVALID && t.STORE_TYPE == StoreType.ToolMagazine).ToList();
@@ -1729,10 +1725,10 @@ namespace FocasCncCollect
             //计算机床最新日志时间
             foreach (var cnc in cncList)
             {
-                var logList = allLogList.FindAll(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+                var logList = allLogList.FindAll(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
                 if (logList.Count > 0)
                 {
-                    cnc.LogNewstTime = logList.Select(t => t.WARN_TIME.Value).Max();
+                    cnc.LogNewstTime = logList.Select(t => t.WARN_TIME).Max();
                 }
                 else
                 {
@@ -1785,10 +1781,10 @@ namespace FocasCncCollect
                     machineView.Size = new Size(418, 624);
                     //设置location
                     //行
-                    int row = (StringHelper.ExtractNumberFromName(cnc.EQUIPMENT_CODE)  - 1) / 4;
+                    int row = (cnc.EQUIPMENT_NO - 1) / 4;
                     int height = row * (624 + 3) + 1;
                     //列
-                    int col = (StringHelper.ExtractNumberFromName(cnc.EQUIPMENT_CODE) - 1) % 4;
+                    int col = (cnc.EQUIPMENT_NO - 1) % 4;
                     int width = col * (418 + 3) + 1;
                     machineView.Location = new Point(width, height);
                     this.Controls.Add(machineView);

+ 109 - 24
FocasCncCollect/Models/EQUIPMENT_INFO.cs

@@ -9,39 +9,124 @@ namespace FocasCncCollect.Models
 {
     public partial class EQUIPMENT_INFO
     {
+        /// <summary>
+        /// ID
+        /// </summary>
         public string ID { get; set; }
-        public string EQUIPMENT_CODE { get; set; }
+
+        /// <summary>
+        /// 设备序号
+        /// </summary>
+        public int EQUIPMENT_NO { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         public string EQUIPMENT_NAME { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
         public EquipmentType EQUIPMENT_TYPE { get; set; }
+
+        /// <summary>
+        /// 系统类型
+        /// </summary>
+        public EquipmentSysType SYSTEM_TYPE { get; set; }
+
+        /// <summary>
+        /// 设备状态
+        /// </summary>
         public EquipmentStatus EQUIPMENT_STATUS { get; set; }
-        public YesOrNo IS_USING { get; set; }
+
+        /// <summary>
+        /// 自动化模式
+        /// </summary>
+        public int AUTO_MODE { get; set; }
+
+        /// <summary>
+        /// 开关机状态
+        /// </summary>
         public OnOff ON_OFF_STATUS { get; set; }
-        public Nullable<System.DateTime> FACTORY_DATA { get; set; }
-        public string PRINCIPAL { get; set; }
-        public int IS_SCRAP { get; set; }
-        public Nullable<System.DateTime> CREATE_TIME { get; set; }
-        public string CRATER { get; set; }
-        public Nullable<System.DateTime> MODIFY_TIME { get; set; }
-        public string MODIFIER { get; set; }
-        public bool ISVALID { get; set; }
-        public int EQUIPMENT_NO { get; set; }
+
+        /// <summary>
+        /// IP地址
+        /// </summary>
         public string NET_IP { get; set; }
+
+        /// <summary>
+        /// 端口号
+        /// </summary>
         public int NET_PORT { get; set; }
-        public string FTP_HOST { get; set; }
-        public string FTP_USER { get; set; }
-        public Nullable<int> FTP_PORT { get; set; }
-        public string FTP_PWD { get; set; }
-        public string FTP_REMOTEPATH { get; set; }
-        public Nullable<System.DateTime> START_DATE { get; set; }
-        public string NO_STATION { get; set; }
-        public Nullable<int> ONLINE_STATUS { get; set; }
-        public Nullable<int> AUTO_ONLINE_STATUS { get; set; }
-        public Nullable<int> GROUP_IO_NO { get; set; }
-        public EquipmentSysType SYSTEM_TYPE { get; set; }
 
-        public string CURRENT_PART { get; set; }
-        public Nullable<System.DateTime> LAST_START_TIME { get; set; }
+        /// <summary>
+        /// 站点编号
+        public int NO_STATION { get; set; }
+
+        /// <summary>
+        /// 在线状态
+        /// </summary>
+        //public OnlineStatus ONLINE_STATUS { get; set; }
+
+        /// <summary>
+        /// 循环状态
+        /// </summary>
+        //public OnlineStatus AUTO_ONLINE_STATUS { get; set; }
+
+        /// <summary>
+        /// 设备IO编号(PLC)
+        /// </summary>
+        public int IO_NO { get; set; }
+
+        /// <summary>
+        /// 当前执行零件
+        /// </summary>
+        //public string CURRENT_PART { get; set; }
+
+        /// <summary>
+        /// 当前任务信息
+        /// </summary>
+        //public string CURRENT_TASK { get; set; }
+
+        /// <summary>
+        /// 开始运行时间
+        /// </summary>
+        //public DateTime START_DATE { get; set; }
+
+        /// <summary>
+        /// 上次启动程序时间
+        /// </summary>
+        public DateTime? LAST_START_TIME { get; set; }
 
+        /// <summary>
+        /// FTP配置(用于程序传输)
+        /// </summary>
+        public string FTP_CONFIG { get; set; }
+
+        /// <summary>
+        /// RFID
+        /// </summary>
+        //public int NO_RFID { get; set; }
+
+        /// <summary>
+        /// 逻辑占用
+        /// </summary>
+        //public bool PHY_FLAG { get; set; }
+
+        /// <summary>
+        /// ftp、共享目录配置项
+        /// </summary>
+        public CNC_FTP_CONFIG FtpItem { get; set; }
+
+        /// <summary>
+        /// 程序上传方式
+        /// </summary>
+        public UploadProgType UPLOADPROG_TYPE { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public bool ISVALID { get; set; }
 
 
         /// <summary>

+ 61 - 7
FocasCncCollect/Models/EQUIPMENT_LOG_STATISTICS.cs

@@ -7,21 +7,75 @@ namespace FocasCncCollect.Models
 {
     public partial class EQUIPMENT_LOG_STATISTICS
     {
+        /// <summary>
+        /// 
+        /// </summary>
         public int ID { get; set; }
-        public string EQUIPMENT_CODE { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         public string EQUIPMENT_NAME { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
         public EquipmentType EQUIPMENT_TYPE { get; set; }
-        public Nullable<System.DateTime> STATISTICS_DATE { get; set; }
+
+        /// <summary>
+        /// 设备PLC序号
+        /// </summary>
+        public int EQUIPMENT_NO { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ID_EQUIPMENT_INFO { get; set; }
+
+        /// <summary>
+        /// 开机时间
+        /// </summary>
         public int ON_TIME { get; set; }
+
+        /// <summary>
+        /// 运行时间
+        /// </summary>
         public int RUN_TIME { get; set; }
-        public System.DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 自然时间
+        /// </summary>
+        public int ALL_TIME { get; set; }
+
+        /// <summary>
+        /// 统计时间
+        /// </summary>
+        public DateTime STATISTICS_DATE { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
         public string CRATER { get; set; }
-        public Nullable<System.DateTime> MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
         public string MODIFIER { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
         public bool ISVALID { get; set; }
-        public string ID_EQUIPMENT_INFO { get; set; }
-        public Nullable<int> EQUIPMENT_NO { get; set; }
-        public int ALL_TIME { get; set; }
 
         [NotMapped]//使用[NotMapped] 特性可以让Entity Framework在保存实体类时忽略该属性,避免不必要的错误。
         public string STR_EQUIPMENT_TYPE { get; set; }

+ 16 - 10
FocasCncCollect/Models/Enum/EquipmentSysType.cs

@@ -30,12 +30,6 @@ namespace FocasCncCollect.Models.Enum
         [Description("马扎克")]
         MAZAK = 2,
 
-        /// <summary>
-        ///  海克斯康
-        /// </summary>
-        [Description("海克斯康")]
-        Comparator = 3,
-
 
         /// <summary>
         ///  西门子
@@ -48,16 +42,28 @@ namespace FocasCncCollect.Models.Enum
         /// </summary>
         [Description("新代")]
         Syntec = 5,
+
         /// <summary>
-        ///  gf电火花
+        /// 兄弟
         /// </summary>
-        [Description("GF电火花")]
-        GF = 6,
+        [Description("兄弟")]
+        Brother = 6,
         /// <summary>
-        ///  哈斯
+        /// 哈斯
         /// </summary>
         [Description("哈斯")]
         HAAS = 7,
+        /// <summary>
+        ///  三菱
+        /// </summary>
+        [Description("三菱")]
+        Mitsubishi = 8,
+        /// <summary>
+        ///  赫克
+        /// </summary>
+        [Description("赫克")]
+        Hurco = 9,
+
         /// <summary>
         ///  模拟器
         /// </summary>

+ 19 - 12
FocasCncCollect/Models/Enum/EquipmentType.cs

@@ -11,29 +11,36 @@ namespace FocasCncCollect.Models.Enum
     /// </summary>
     public enum EquipmentType
     {
-        /// <summary>
-        ///  无
-        /// </summary>
-        [Description("测试机床")]
-        MoniMachine = 0,
 
         /// <summary>
-        ///  机床
+        ///  加工中心
         /// </summary>
-        [Description("机床")]
+        [Description("加工中心")]
         Machine = 1,
 
         /// <summary>
-        ///  研磨
+        ///  清洗
         /// </summary>
-        [Description("研磨机")]
+        [Description("清洗机")]
         Grinder = 2,
 
         /// <summary>
-        ///  比对仪
+        ///  测量仪
+        /// </summary>
+        [Description("测量仪")]
+        SAN = 3,
+
+        /// <summary>
+        ///  车床
+        /// </summary>
+        [Description("车床")]
+        CHE_Machine = 4,
+
+        /// <summary>
+        ///  倒液设备
         /// </summary>
-        [Description("比对仪")]
-        Comparator = 3,
+        [Description("倒液设备")]
+        Pour = 5,
 
     }
 }

+ 23 - 0
FocasCncCollect/Models/Enum/OnlineStatus.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+
+namespace FocasCncCollect.Models.Enum
+{
+    public enum OnlineStatus
+    {
+        /// <summary>
+        ///  离线
+        /// </summary>
+        [Description("离线")]
+        OutLine = 0,
+        /// <summary>
+        ///  在线
+        /// </summary>
+        [Description("在线")]
+        Online = 1,
+     
+    }
+}

+ 55 - 0
FocasCncCollect/Models/Enum/UploadProgType.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+
+namespace FocasCncCollect.Models.Enum
+{
+    /// <summary>
+    /// 程序上传方式
+    /// </summary>
+    public enum UploadProgType
+    {
+        /// <summary>
+        ///  Api方式
+        /// </summary>
+        [Description("Api方式")]
+        Api = 0,
+        /// <summary>
+        /// 共享目录
+        /// </summary>
+        [Description("共享目录")]
+        SharePath = 1,
+
+        /// <summary>
+        /// Ftp
+        /// </summary>
+        [Description("Ftp")]
+        Ftp = 2,
+        /// <summary>
+        /// 零件号指定
+        /// </summary>
+        [Description("零件号指定")]
+        PartNo = 3,
+
+        /// <summary>
+        ///  固定
+        /// </summary>
+        [Description("固定")]
+        Fixed = 4,
+
+        /// <summary>
+        ///  其它
+        /// </summary>
+        [Description("其它")]
+        Other = 10,
+
+        /// <summary>
+        ///  无程序
+        /// </summary>
+        [Description("无程序")]
+        None = 20,
+
+    }
+}

+ 46 - 6
FocasCncCollect/Models/LOG_CNC_WARN.cs

@@ -5,20 +5,60 @@ namespace FocasCncCollect.Models
 {
     public partial class LOG_CNC_WARN
     {
-
+        /// <summary>
+        /// ID
+        /// </summary>
         public string ID { get; set; }
+
+        /// <summary>
+        /// 告警码
+        /// </summary>
         public string CODE { get; set; }
+
+        /// <summary>
+        /// 详细信息
+        /// </summary>
         public string MESSAGE { get; set; }
-        public Nullable<System.DateTime> WARN_TIME { get; set; }
-        public string EQUIPMENT_CODE { get; set; }
+
+        /// <summary>
+        /// 告警时间
+        /// </summary>
+        public DateTime WARN_TIME { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         public string EQUIPMENT_NAME { get; set; }
+
+        /// <summary>
+        /// 设备序号
+        /// </summary>
         public int EQUIPMENT_NO { get; set; }
-        public System.DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
         public string CRATER { get; set; }
-        public Nullable<System.DateTime> MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
         public string MODIFIER { get; set; }
-        public bool ISVALID { get; set; }
 
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public bool ISVALID { get; set; }
 
     }
 }

+ 124 - 7
FocasCncCollect/Models/LOG_EQUIPMENT_MSG.cs

@@ -7,38 +7,155 @@ namespace FocasCncCollect.Models
 {
     public partial class LOG_EQUIPMENT_MSG
     {
- 
 
+        /// <summary>
+        /// ID
+        /// </summary>
         public string ID { get; set; }
-        public string EQUIPMENT_CODE { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         public string EQUIPMENT_NAME { get; set; }
-        public int EQUIPMENT_TYPE { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public EquipmentType EQUIPMENT_TYPE { get; set; }
+
+        /// <summary>
+        /// 设备运行状态
+        /// </summary>
         public EquipmentStatus EQUIPMENT_STATUS { get; set; }
+
+        /// <summary>
+        /// 开关机状态
+        /// </summary>
         public OnOff ON_OFF_STATUS { get; set; }
+
+        /// <summary>
+        /// 当前托盘
+        /// </summary>
         public string RFID { get; set; }
+
+        /// <summary>
+        /// 当前零件编号
+        /// </summary>
         public string PART_NO { get; set; }
+
+        /// <summary>
+        /// 刀具号
+        /// </summary>
         public string KNIFE_NO { get; set; }
+
+        /// <summary>
+        /// 开关门状态
+        /// </summary>
         public int DOOR_STATUS { get; set; }
+
+        /// <summary>
+        /// 主轴状态
+        /// </summary>
         public int MAIN_AXLE_STATUS { get; set; }
+
+        /// <summary>
+        /// 急停状态
+        /// </summary>
         public int ESTOP_STATUS { get; set; }
+
+        /// <summary>
+        /// 进给速度
+        /// </summary>
         public double FEED_SPEED { get; set; }
+
+        /// <summary>
+        /// 进给量
+        /// </summary>
         public double FEED_QUANTITY { get; set; }
+
+        /// <summary>
+        /// 主轴转速
+        /// </summary>
         public double AXLE_SPEED { get; set; }
+
+        /// <summary>
+        /// 主轴相对坐标
+        /// </summary>
         public string AXLE_COORDINATE { get; set; }
+
+        /// <summary>
+        /// 故障码
+        /// </summary>
         public string ERR_CODE { get; set; }
+
+        /// <summary>
+        /// 字符串备注1
+        /// </summary>
         public string STR01 { get; set; }
+
+        /// <summary>
+        /// 字符串备注2
+        /// </summary>
         public string STR02 { get; set; }
-        public Nullable<decimal> VLE01 { get; set; }
-        public Nullable<decimal> VLE02 { get; set; }
-        public Nullable<System.DateTime> CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 值备注1
+        /// </summary>
+        public double VLE01 { get; set; }
+
+        /// <summary>
+        /// 值备注2
+        /// </summary>
+        public double VLE02 { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
         public string CRATER { get; set; }
-        public Nullable<System.DateTime> MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
         public string MODIFIER { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
         public bool ISVALID { get; set; }
+
+        /// <summary>
+        /// ID设备信息
+        /// </summary>
         public string ID_EQUIPMENT_INFO { get; set; }
+
+        /// <summary>
+        /// 告警状态
+        /// </summary>
         public WarnStatus WARN_STATUS { get; set; }
+
+        /// <summary>
+        /// 主轴负载
+        /// </summary>
         public string AXLE_LOAD { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
         public int EQUIPMENT_NO { get; set; }
+
+        /// <summary>
+        /// 当前运行程序
+        /// </summary>
         public string CURRENT_PROG { get; set; }
 
         [NotMapped]

+ 140 - 9
FocasCncCollect/Models/LOG_EQUIPMENT_MSG_TEMP.cs

@@ -6,40 +6,171 @@ namespace FocasCncCollect.Models
 {
     public partial class LOG_EQUIPMENT_MSG_TEMP
     {
+        /// <summary>
+        /// ID
+        /// </summary>
         public string ID { get; set; }
-        public string EQUIPMENT_CODE { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
         public string EQUIPMENT_NAME { get; set; }
-        public int EQUIPMENT_TYPE { get; set; }
+
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public EquipmentType EQUIPMENT_TYPE { get; set; }
+
+        /// <summary>
+        /// 设备运行状态
+        /// </summary>
         public EquipmentStatus EQUIPMENT_STATUS { get; set; }
+
+        /// <summary>
+        /// 开关机状态
+        /// </summary>
         public OnOff ON_OFF_STATUS { get; set; }
+
+        /// <summary>
+        /// 当前托盘
+        /// </summary>
         public string RFID { get; set; }
+
+        /// <summary>
+        /// 当前零件编号
+        /// </summary>
         public string PART_NO { get; set; }
+
+        /// <summary>
+        /// 刀具号
+        /// </summary>
         public string KNIFE_NO { get; set; }
+
+        /// <summary>
+        /// 开关门状态
+        /// </summary>
         public OnOff DOOR_STATUS { get; set; }
+
+        /// <summary>
+        /// 主轴状态
+        /// </summary>
         public int MAIN_AXLE_STATUS { get; set; }
+
+        /// <summary>
+        /// 急停状态
+        /// </summary>
         public int ESTOP_STATUS { get; set; }
+
+        /// <summary>
+        /// 进给速度
+        /// </summary>
         public double FEED_SPEED { get; set; }
+
+        /// <summary>
+        /// 进给量
+        /// </summary>
         public double FEED_QUANTITY { get; set; }
+
+        /// <summary>
+        /// 主轴转速
+        /// </summary>
         public double AXLE_SPEED { get; set; }
+
+        /// <summary>
+        /// 主轴相对坐标
+        /// </summary>
         public string AXLE_COORDINATE { get; set; }
+
+        /// <summary>
+        /// 故障码
+        /// </summary>
         public string ERR_CODE { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         public string STR01 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         public string STR02 { get; set; }
-        public Nullable<System.DateTime> CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CREATE_TIME { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
         public string CRATER { get; set; }
-        public Nullable<System.DateTime> MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime MODIFY_TIME { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
         public string MODIFIER { get; set; }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
         public bool ISVALID { get; set; }
+
+        /// <summary>
+        /// ID设备信息
+        /// </summary>
         public string ID_EQUIPMENT_INFO { get; set; }
+
+        /// <summary>
+        /// 告警状态
+        /// </summary>
         public WarnStatus WARN_STATUS { get; set; }
+
+        /// <summary>
+        /// 主轴负载
+        /// </summary>
         public string AXLE_LOAD { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         public int EQUIPMENT_NO { get; set; }
+
+        /// <summary>
+        /// 当前运行程序
+        /// </summary>
         public string CURRENT_PROG { get; set; }
-        public Nullable<double> FEED_MULTIPLE { get; set; }
-        public Nullable<double> AXLE_MULTIPLE { get; set; }
-        public Nullable<decimal> VLE01 { get; set; }
-        public Nullable<decimal> VLE02 { get; set; }
-        public Nullable<int> RUN_MODE { get; set; }
+
+        /// <summary>
+        /// 进给倍率
+        /// </summary>
+        public double FEED_MULTIPLE { get; set; }
+
+        /// <summary>
+        /// 主轴倍率
+        /// </summary>
+        public double AXLE_MULTIPLE { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public double VLE01 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public double VLE02 { get; set; }
+
+        /// <summary>
+        /// 运行模式
+        /// </summary>
+        public int RUN_MODE { get; set; }
+
 
     }
 }

+ 0 - 5
FocasCncCollect/Models/Mapping/EQUIPMENT_LOG_STATISTICSMap.cs

@@ -14,10 +14,6 @@ namespace FocasCncCollect.Models.Mapping
             this.Property(t => t.ID)
                 .HasDatabaseGeneratedOption(DatabaseGeneratedOption.None);
 
-            this.Property(t => t.EQUIPMENT_CODE)
-                .IsRequired()
-                .HasMaxLength(40);
-
             this.Property(t => t.EQUIPMENT_NAME)
                 .HasMaxLength(100); 
 
@@ -34,7 +30,6 @@ namespace FocasCncCollect.Models.Mapping
             // Table & Column Mappings
             this.ToTable("equipment_log_statistics", "fmsforyc");
             this.Property(t => t.ID).HasColumnName("ID");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
             this.Property(t => t.EQUIPMENT_NAME).HasColumnName("EQUIPMENT_NAME");
             this.Property(t => t.EQUIPMENT_TYPE).HasColumnName("EQUIPMENT_TYPE");
             this.Property(t => t.STATISTICS_DATE).HasColumnName("STATISTICS_DATE");

+ 21 - 39
FocasCncCollect/Models/Mapping/equipment_infoMap.cs

@@ -15,59 +15,41 @@ namespace FocasCncCollect.Models.Mapping
                 .IsRequired()
                 .HasMaxLength(40);
 
-            this.Property(t => t.EQUIPMENT_CODE)
-                .IsRequired()
-                .HasMaxLength(40);
-
             this.Property(t => t.EQUIPMENT_NAME)
                 .HasMaxLength(100);
 
-            this.Property(t => t.CRATER)
-                .IsRequired()
-                .HasMaxLength(40);
-
-            this.Property(t => t.MODIFIER)
-                .HasMaxLength(40);
-
             this.Property(t => t.NET_IP)
                 .HasMaxLength(255);
 
-            this.Property(t => t.FTP_HOST)
-                .HasMaxLength(40);
-
-            this.Property(t => t.FTP_USER)
-                .HasMaxLength(40);
-
-
-            this.Property(t => t.FTP_PWD)
-                .HasMaxLength(40);
-
-            this.Property(t => t.FTP_REMOTEPATH)
-                .HasMaxLength(40);
-
             // Table & Column Mappings
-            this.ToTable("equipment_info", "fmsforyc");
+            this.ToTable("equipment_info");
             this.Property(t => t.ID).HasColumnName("ID");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
+            this.Property(t => t.EQUIPMENT_NO).HasColumnName("EQUIPMENT_NO");
             this.Property(t => t.EQUIPMENT_NAME).HasColumnName("EQUIPMENT_NAME");
+            this.Property(t => t.EQUIPMENT_TYPE).HasColumnName("EQUIPMENT_TYPE");
+            this.Property(t => t.SYSTEM_TYPE).HasColumnName("SYSTEM_TYPE");
             this.Property(t => t.EQUIPMENT_STATUS).HasColumnName("EQUIPMENT_STATUS");
-            this.Property(t => t.IS_USING).HasColumnName("IS_USING");
+
+            this.Property(t => t.AUTO_MODE).HasColumnName("AUTO_MODE");
             this.Property(t => t.ON_OFF_STATUS).HasColumnName("ON_OFF_STATUS");
-            this.Property(t => t.CREATE_TIME).HasColumnName("CREATE_TIME");
-            this.Property(t => t.CRATER).HasColumnName("CRATER");
-            this.Property(t => t.MODIFY_TIME).HasColumnName("MODIFY_TIME");
-            this.Property(t => t.MODIFIER).HasColumnName("MODIFIER");
-            this.Property(t => t.ISVALID).HasColumnName("ISVALID");
             this.Property(t => t.NET_IP).HasColumnName("NET_IP");
             this.Property(t => t.NET_PORT).HasColumnName("NET_PORT");
-            this.Property(t => t.FTP_HOST).HasColumnName("FTP_HOST");
-            this.Property(t => t.FTP_USER).HasColumnName("FTP_USER");
-            this.Property(t => t.FTP_PORT).HasColumnName("FTP_PORT");
-            this.Property(t => t.FTP_PWD).HasColumnName("FTP_PWD");
-            this.Property(t => t.FTP_REMOTEPATH).HasColumnName("FTP_REMOTEPATH");
             this.Property(t => t.NO_STATION).HasColumnName("NO_STATION");
-            this.Property(t => t.SYSTEM_TYPE).HasColumnName("SYSTEM_TYPE");
+
+            //this.Property(t => t.ONLINE_STATUS).HasColumnName("ONLINE_STATUS");
+            //this.Property(t => t.AUTO_ONLINE_STATUS).HasColumnName("AUTO_ONLINE_STATUS");
+            this.Property(t => t.IO_NO).HasColumnName("IO_NO");
+            //this.Property(t => t.CURRENT_PART).HasColumnName("CURRENT_PART");
+            //this.Property(t => t.CURRENT_TASK).HasColumnName("CURRENT_TASK");
+
+            //this.Property(t => t.START_DATE).HasColumnName("START_DATE");
+            this.Property(t => t.LAST_START_TIME).HasColumnName("LAST_START_TIME");
+            this.Property(t => t.FTP_CONFIG).HasColumnName("FTP_CONFIG");
+            //this.Property(t => t.NO_RFID).HasColumnName("NO_RFID");
+            //this.Property(t => t.PHY_FLAG).HasColumnName("PHY_FLAG");
+
+            this.Property(t => t.UPLOADPROG_TYPE).HasColumnName("UPLOADPROG_TYPE");
+            this.Property(t => t.ISVALID).HasColumnName("ISVALID");
         }
     }
 }

+ 0 - 6
FocasCncCollect/Models/Mapping/log_cnc_warnMap.cs

@@ -21,10 +21,6 @@ namespace FocasCncCollect.Models.Mapping
             this.Property(t => t.MESSAGE)
                 .HasMaxLength(255);
 
-            this.Property(t => t.EQUIPMENT_CODE)
-                .IsRequired()
-                .HasMaxLength(40);
-
             this.Property(t => t.EQUIPMENT_NAME)
                 .HasMaxLength(100);
 
@@ -41,9 +37,7 @@ namespace FocasCncCollect.Models.Mapping
             this.Property(t => t.CODE).HasColumnName("CODE");
             this.Property(t => t.MESSAGE).HasColumnName("MESSAGE");
             this.Property(t => t.WARN_TIME).HasColumnName("WARN_TIME");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
             this.Property(t => t.EQUIPMENT_NAME).HasColumnName("EQUIPMENT_NAME");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
             this.Property(t => t.EQUIPMENT_NO).HasColumnName("EQUIPMENT_NO");
             this.Property(t => t.CREATE_TIME).HasColumnName("CREATE_TIME");
             this.Property(t => t.CRATER).HasColumnName("CRATER");

+ 0 - 5
FocasCncCollect/Models/Mapping/log_equipment_msgMap.cs

@@ -15,10 +15,6 @@ namespace FocasCncCollect.Models.Mapping
                 .IsRequired()
                 .HasMaxLength(40);
 
-            this.Property(t => t.EQUIPMENT_CODE)
-                .IsRequired()
-                .HasMaxLength(40);
-
             this.Property(t => t.EQUIPMENT_NAME)
                 .HasMaxLength(100);
 
@@ -63,7 +59,6 @@ namespace FocasCncCollect.Models.Mapping
             // Table & Column Mappings
             this.ToTable("log_equipment_msg", "fmsforyc");
             this.Property(t => t.ID).HasColumnName("ID");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
             this.Property(t => t.EQUIPMENT_NAME).HasColumnName("EQUIPMENT_NAME");
             this.Property(t => t.EQUIPMENT_TYPE).HasColumnName("EQUIPMENT_TYPE");
             this.Property(t => t.EQUIPMENT_STATUS).HasColumnName("EQUIPMENT_STATUS");

+ 0 - 6
FocasCncCollect/Models/Mapping/log_equipment_msg_tempMap.cs

@@ -15,11 +15,6 @@ namespace FocasCncCollect.Models.Mapping
                 .IsRequired()
                 .HasMaxLength(40);
 
-
-            this.Property(t => t.EQUIPMENT_CODE)
-                .IsRequired()
-                .HasMaxLength(40);
-
             this.Property(t => t.EQUIPMENT_NAME)
                 .HasMaxLength(100);
 
@@ -55,7 +50,6 @@ namespace FocasCncCollect.Models.Mapping
             // Table & Column Mappings
             this.ToTable("log_equipment_msg_temp", "fmsforyc");
             this.Property(t => t.ID).HasColumnName("ID");
-            this.Property(t => t.EQUIPMENT_CODE).HasColumnName("EQUIPMENT_CODE");
             this.Property(t => t.EQUIPMENT_NAME).HasColumnName("EQUIPMENT_NAME");
             this.Property(t => t.EQUIPMENT_STATUS).HasColumnName("EQUIPMENT_STATUS");
             this.Property(t => t.ON_OFF_STATUS).HasColumnName("ON_OFF_STATUS");

+ 3 - 3
FocasCncCollect/Statistics/FrmEquipmentEfficiency.cs

@@ -91,12 +91,12 @@ namespace FocasCncCollect.Statistics
                     var newList = (from p in taskList
                                    group p by new
                                    {
-                                       p.EQUIPMENT_CODE,
+                                       p.EQUIPMENT_NO,
                                        p.STR_CREATE_TIME
                                    } into g
                                    select new ViewItem()
                                    {
-                                       EQUIPMENT_CODE = g.Max(t => t.EQUIPMENT_CODE),
+                                       EQUIPMENT_NO = g.Max(t => t.EQUIPMENT_NO),
                                        t1 = g.Sum(t => t.RUN_TIME) ,
                                        t2 = g.Sum(t => t.ON_TIME),
                                        t3 = g.Sum(t => t.ALL_TIME),
@@ -299,7 +299,7 @@ namespace FocasCncCollect.Statistics
 
         class ViewItem
         {
-            public string EQUIPMENT_CODE { get; set; }
+            public int EQUIPMENT_NO { get; set; }
             public string STR_EQUIPMENT_TYPE { get; set; }
             public double CPLAMQTY { get; set; }
             public DateTime CREATE_TIME { get; set; }

+ 6 - 6
FocasCncCollect/UControl/UcCncMoniter.cs

@@ -47,7 +47,7 @@ namespace FocasCncCollect.UControl
         {
             InitializeComponent();
             this.cnc = cnc;
-            logTemp = FrmEquipmentMonitor.tempList.Find(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+            logTemp = FrmEquipmentMonitor.tempList.Find(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
             SimpleDataRefreshThread = new Thread(new ThreadStart(RefreshSimpleHandle));
             ChartRefreshThread = new Thread(new ThreadStart(ChartRefreshHandle));
             WarnLogRefreshThread = new Thread(new ThreadStart(WarnLogRefresh));
@@ -58,7 +58,7 @@ namespace FocasCncCollect.UControl
             SimpleDataRefreshThread.Start();
             ChartRefreshThread.Start();
             WarnLogRefreshThread.Start();
-            if (StringHelper.ExtractNumberFromName(cnc.EQUIPMENT_CODE) == 1)
+            if (cnc.EQUIPMENT_NO == 1)
             {
                 Console.WriteLine("");
             }
@@ -72,7 +72,7 @@ namespace FocasCncCollect.UControl
         /// <param name="cnc"></param>
         internal void RefreshData(EQUIPMENT_INFO cnc)
         {
-            logTemp = FrmEquipmentMonitor.tempList.Find(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+            logTemp = FrmEquipmentMonitor.tempList.Find(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
             this.cnc = cnc;
             RefreshSimpleData();
             RefreshChart();
@@ -111,7 +111,7 @@ namespace FocasCncCollect.UControl
         {
             DateTime startDate = DateTime.Now.AddDays(-7);
 
-            List<LOG_CNC_WARN> warnList = iLogCncWarn.GetList(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE && t.EQUIPMENT_NAME == cnc.EQUIPMENT_NAME && t.WARN_TIME > startDate).OrderByDescending(t => t.WARN_TIME).ToList();
+            List<LOG_CNC_WARN> warnList = iLogCncWarn.GetList(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO && t.EQUIPMENT_NAME == cnc.EQUIPMENT_NAME && t.WARN_TIME > startDate).OrderByDescending(t => t.WARN_TIME).ToList();
 
             int focusRow = gv_warnLog.FocusedRowHandle;
 
@@ -147,7 +147,7 @@ namespace FocasCncCollect.UControl
             List<LOG_EQUIPMENT_MSG> logList = new List<LOG_EQUIPMENT_MSG>();
             try
             {
-               logList = iLogEquipmentMsg.GetList(t => t.EQUIPMENT_CODE == cnc.EQUIPMENT_CODE);
+               logList = iLogEquipmentMsg.GetList(t => t.EQUIPMENT_NO == cnc.EQUIPMENT_NO);
                 logList.ForEach(t =>
                 {
                     if (t.WARN_STATUS == WarnStatus.Warn && t.ON_OFF_STATUS == OnOff.On)
@@ -314,7 +314,7 @@ namespace FocasCncCollect.UControl
 
         private void RefreshSimpleDataTemp()
         {
-            groupControl1.Text = string.Format("{0}-{1}", cnc.EQUIPMENT_CODE, cnc.EQUIPMENT_NAME);
+            groupControl1.Text = string.Format("{0}-{1}", cnc.EQUIPMENT_NO, cnc.EQUIPMENT_NAME);
 
             if (logTemp == null) logTemp = new LOG_EQUIPMENT_MSG_TEMP() { AXLE_LOAD = "0" };
             txt_runStatus.Text = EnumUtil.GetDescription(logTemp.EQUIPMENT_STATUS);

BIN
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/bin/Debug/OPCUA.dll


BIN
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/bin/Debug/OPCUA.pdb


+ 1 - 1
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7dae1c7334e920815a9d670a1594af9aee3867ae
+3ac02d18a741a76027b2d50bfa86224b4b46a777

+ 212 - 0
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csproj.FileListAbsolute.txt

@@ -1489,3 +1489,215 @@ E:\01正式工作\01软件代码\刀具管理系统_正式版本V1\FocasCncColle
 E:\01正式工作\01软件代码\刀具管理系统_正式版本V1\FocasCncCollect_TMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.csproj.CopyComplete
 E:\01正式工作\01软件代码\刀具管理系统_正式版本V1\FocasCncCollect_TMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.dll
 E:\01正式工作\01软件代码\刀具管理系统_正式版本V1\FocasCncCollect_TMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.pdb
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\OPCUA.dll.config
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\OPCUA.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\OPCUA.pdb
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.InteropServices.RuntimeInformation.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Win32.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\netstandard.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.AppContext.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.Concurrent.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.NonGeneric.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.Specialized.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ComponentModel.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ComponentModel.EventBasedAsync.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ComponentModel.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ComponentModel.TypeConverter.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Console.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Data.Common.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.Contracts.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.Debug.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.FileVersionInfo.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.Process.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.StackTrace.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.TextWriterTraceListener.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.Tools.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.TraceSource.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.Tracing.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Drawing.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Dynamic.Runtime.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Globalization.Calendars.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Globalization.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Globalization.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.Compression.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.Compression.ZipFile.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.FileSystem.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.FileSystem.DriveInfo.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.FileSystem.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.FileSystem.Watcher.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.IsolatedStorage.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.MemoryMappedFiles.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.Pipes.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.UnmanagedMemoryStream.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Linq.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Linq.Expressions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Linq.Parallel.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Linq.Queryable.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Http.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.NameResolution.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.NetworkInformation.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Ping.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Requests.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Security.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.Sockets.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.WebHeaderCollection.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.WebSockets.Client.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Net.WebSockets.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ObjectModel.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Reflection.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Reflection.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Reflection.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Resources.Reader.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Resources.ResourceManager.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Resources.Writer.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.CompilerServices.VisualC.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Handles.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.InteropServices.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Numerics.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Serialization.Formatters.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Serialization.Json.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Serialization.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.Serialization.Xml.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Claims.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.Algorithms.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.Csp.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.Encoding.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.X509Certificates.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Principal.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.SecureString.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Text.Encoding.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Text.Encoding.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Text.RegularExpressions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Overlapped.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Tasks.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Tasks.Parallel.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Thread.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.ThreadPool.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Timer.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.ReaderWriter.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.XDocument.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.XmlDocument.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.XmlSerializer.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.XPath.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Xml.XPath.XDocument.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\BouncyCastle.Crypto.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Connections.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Features.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Core.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Https.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.WebUtilities.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.Binder.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.EnvironmentVariables.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.FileExtensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileProviders.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileProviders.Physical.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileSystemGlobbing.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Hosting.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Logging.Abstractions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Logging.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.ObjectPool.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Options.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Primitives.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Net.Http.Headers.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Newtonsoft.Json.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Bindings.Https.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Client.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Configuration.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Core.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Gds.Client.Common.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Gds.Server.Common.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Security.Certificates.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Server.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\OpcUaHelper.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Buffers.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.Immutable.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ComponentModel.Annotations.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.DiagnosticSource.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Formats.Asn1.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.Pipelines.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Memory.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Numerics.Vectors.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Reflection.Metadata.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Security.Cryptography.Cng.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Text.Encodings.Web.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Tasks.Extensions.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ValueTuple.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\BouncyCastle.Crypto.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Connections.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Hosting.Server.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Extensions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Http.Features.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Core.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Https.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.AspNetCore.WebUtilities.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.Binder.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.EnvironmentVariables.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Configuration.FileExtensions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileProviders.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileProviders.Physical.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.FileSystemGlobbing.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Hosting.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Logging.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Logging.Abstractions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.ObjectPool.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Options.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Extensions.Primitives.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Microsoft.Net.Http.Headers.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Newtonsoft.Json.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Bindings.Https.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Client.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Configuration.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Core.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Gds.Client.Common.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Gds.Server.Common.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Security.Certificates.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\Opc.Ua.Server.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\OpcUaHelper.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Buffers.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Collections.Immutable.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Diagnostics.DiagnosticSource.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Formats.Asn1.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.IO.Pipelines.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Memory.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Numerics.Vectors.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Reflection.Metadata.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Text.Encodings.Web.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.Threading.Tasks.Extensions.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\bin\Debug\System.ValueTuple.xml
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.csproj.CoreCompileInputs.cache
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.csproj.CopyComplete
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.dll
+D:\软件开发\CnccForTMS\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\obj\Debug\OPCUA.pdb

BIN
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.csprojAssemblyReference.cache


BIN
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.dll


BIN
OPCUAClient/OPCUAClient/OPCUAClient/OPCUA/obj/Debug/OPCUA.pdb