10和40 上线逻辑回退

schangxiang@126.com

2024-09-05 16e188758b164ed959090dd5149d109b7a9adb92

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs

@@ -47,7 +47,7 @@

        public static void PLCServiceReconnect(PLCService plcService)
        {
            if(plcService==null)
            if (plcService == null)
            {
                return;
            }
@@ -78,16 +78,17 @@
        public static char PLCDBADDRESS_SEPARATE = '|';


        public static List<ThreadStatusMonitor> MainList=new List<ThreadStatusMonitor>();
        public static List<ThreadStatusMonitor> MainList = new List<ThreadStatusMonitor>();

        private static object lockMainList = new object();
        public static async void UpdateMainList(ThreadStatusMonitor threadinfo)
        {
            await Task.Run(() => {
            await Task.Run(() =>
            {
                lock (lockMainList)
                {
                    var info = MainList.Where(o => o.Threadcode == threadinfo.Threadcode).FirstOrDefault();
                    if(info == null)
                    if (info == null)
                    {
                        MainList.Add(threadinfo);
                    }
@@ -96,7 +97,7 @@
                        DateTime time = DateTime.Now;
                        info.Remarks = threadinfo.Remarks;
                        info.Threadendtime = time;//每次都更新
                        info.Threadlastmodifytime = threadinfo.Threadlastmodifytime>DateTime.MinValue? threadinfo.Threadlastmodifytime: info.Threadlastmodifytime;//如果有传参则更新
                        info.Threadlastmodifytime = threadinfo.Threadlastmodifytime > DateTime.MinValue ? threadinfo.Threadlastmodifytime : info.Threadlastmodifytime;//如果有传参则更新
                        info.ThreadId = threadinfo.ThreadId;
                        info.ThreadFrequency = threadinfo.ThreadFrequency;
                        info.UpdatedTime = time;
@@ -143,10 +144,11 @@
        /// <summary>
        /// 是否允许执行监控OP05工序打码完成标记线程
        /// </summary>
        public static bool isAllowRuning_OP0501 
        { 
            get { return _isAllowRuning_OP0501; } 
            set {
        public static bool isAllowRuning_OP0501
        {
            get { return _isAllowRuning_OP0501; }
            set
            {
                lock (lockOP0501Runing)
                {
                    _isAllowRuning_OP0501 = value;
@@ -446,11 +448,11 @@
        /// <summary>
        /// OP10工序测试完成标记值
        /// </summary>
        public static string value_OP1002 = string.Empty;
        public static string value_OP1002 = string.Empty;//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        /// <summary>
        /// OP10工序推出标记值
        /// </summary>
        public static string value_OP1003 = string.Empty;
        public static string value_OP1003 = string.Empty;//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        /// <summary>
        /// OP10工序SPC推出标记值
        /// </summary>
@@ -1064,7 +1066,7 @@
                }
            }
        }
        

        private static object lockOP3501Alert = new object();
        private static object lockOP3502Alert = new object();
        private static object lockOP3503Alert = new object();