10和40 上线逻辑回退

schangxiang@126.com

2024-09-05 16e188758b164ed959090dd5149d109b7a9adb92

10和40  上线逻辑回退

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs

@@ -83,7 +83,8 @@
        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();
@@ -146,7 +147,8 @@
        public static bool isAllowRuning_OP0501 
        { 
            get { return _isAllowRuning_OP0501; } 
            set {
            set
            {
                lock (lockOP0501Runing)
                {
                    _isAllowRuning_OP0501 = value;
@@ -446,11 +448,11 @@
        /// <summary>
        /// OP10工序测试完成标记值
        /// </summary>
        public static string value_OP1002 = "FALSE";//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        public static string value_OP1002 = string.Empty;//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        /// <summary>
        /// OP10工序推出标记值
        /// </summary>
        public static string value_OP1003 = "FALSE";//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        public static string value_OP1003 = string.Empty;//注意：默认是FALSE 【Editby shaocx,2024-09-05】
        /// <summary>
        /// OP10工序SPC推出标记值
        /// </summary>

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -983,7 +983,7 @@
                        cur_db_info = db.WorkPieceInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
                        if (cur_db_info == null || cur_db_info.WorkPieceID.Length < 1)
                        {//没有工件信息，不做更新
                            Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件推出工序{loginfo.WorkingProcedure} 没有获取到工件信息不做更新");
                            Log4NetHelper.WriteErrorLog(type, $"工件{loginfo.WorkPieceID} 工件推出NOOK工序{loginfo.WorkingProcedure} 没有获取到工件信息不做更新");
                            return;
                        }
                        else

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs

@@ -143,11 +143,11 @@
                                //监控上线
                                MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
                            }
                            if (wplog != null)
                            {
                                var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
                                if (isRight)
                                {
                            //if (wplog != null)
                            //{
                            //    var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
                            //    if (isRight)
                            //    {
                                    #region 业务处理

                                    if (SystemValue.value_OP1002.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
@@ -181,8 +181,8 @@
                                    SystemValue.value_OP1002 = value.ToString();

                                    #endregion
                                }
                            }
                            //    }
                            //}

                        }
                        SystemValue.lbl_Alert_OP1002 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs

@@ -138,11 +138,11 @@
                                //监控上线
                                MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
                            }
                            if (wplog != null)
                            {
                                var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
                                if (isRight)
                                {
                            //if (wplog != null)
                            //{
                            //    var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
                            //    if (isRight)
                            //    {
                                    #region 业务处理

                                    if (SystemValue.value_OP1003.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
@@ -176,8 +176,8 @@
                                    SystemValue.value_OP1003 = value.ToString();

                                    #endregion
                                }
                            }
                            //    }
                            //}

                        }
                        SystemValue.lbl_Alert_OP1003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";