From 350e1111aa34534fa6074072142deaf319f8d6b4 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 26 8月 2024 15:13:09 +0800 Subject: [PATCH] 我的疑问是 为啥 不合格,没有不合格原因? --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 373 +++++++++++++++++++++++++++------------------------- 1 files changed, 192 insertions(+), 181 deletions(-) diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs index 76e4829..b6e683c 100644 --- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs +++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs @@ -737,150 +737,156 @@ /// <param name="e"></param> private void button8_Click(object sender, EventArgs e) { - try - { - DataCaptureHandler.RefreshDataCommonStatic(); - button8.Text = "妯℃嫙宸插惎鍔�"; - button8.BackColor = Color.Green; - SystemValue.isStartedImitateModel = true; - #region 鏁版嵁閲囬泦椤圭‘瀹� - var dataCaptureConfigslist = DataCaptureConfigManager.GetDataCaptureConfigs(); - var columnList = DataCaptureConfigManager.GetDataCaptureColumnConfig(); - _dataCaptureHandler.Clear(); - foreach (var config in dataCaptureConfigslist) - { + //try + //{ + // DataCaptureHandler.RefreshDataCommonStatic(); + // button8.Text = "妯℃嫙宸插惎鍔�"; + // button8.BackColor = Color.Green; + // SystemValue.isStartedImitateModel = true; + // #region 鏁版嵁閲囬泦椤圭‘瀹� + // var dataCaptureConfigslist = DataCaptureConfigManager.GetDataCaptureConfigs(); + // var columnList = DataCaptureConfigManager.GetDataCaptureColumnConfig(); + // _dataCaptureHandler.Clear(); + // foreach (var config in dataCaptureConfigslist) + // { - switch (config.DataCapturePointCode) - { - #region HMI04 - case "RHMIOP104001": - case "RHMIOP2001": - case "RHMIOP303501": - case "RHMIOP5001": - case "RHMIOP6001": - HMI_WorkpieceReading.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(HMI_WorkpieceReading.Instance); - break; - case "WHMIOP104002": - case "WHMIOP2002": - case "WHMIOP303502": - case "WHMIOP5002": - case "WHMIOP6002": - HMI_WorkpieceWrite.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(HMI_WorkpieceWrite.Instance); - break; - #endregion - case "OP0501": - DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance); - break; - case "OP2001": - DataCaptureHandler_OP2001.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP2001.Instance); - break; - #region OP30 - case "OP3001": - DataCaptureHandler_OP3001.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3001.Instance); - break; - case "OP3002": - DataCaptureHandler_OP3002.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3002.Instance); - break; - case "OP3003": - DataCaptureHandler_OP3003.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3003.Instance); - break; - case "OP3004": - DataCaptureHandler_OP3004.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3004.Instance); - break; - case "OP3005": - DataCaptureHandler_OP3005.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3005.Instance); - break; - case "OP3006": - DataCaptureHandler_OP3006.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3006.Instance); - break; - case "OP3007": - DataCaptureHandler_OP3007.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3007.Instance); - break; - #endregion + // switch (config.DataCapturePointCode) + // { + // #region HMI04 + // case "RHMIOP104001": + // case "RHMIOP2001": + // case "RHMIOP303501": + // case "RHMIOP5001": + // case "RHMIOP6001": + // HMI_WorkpieceReading.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(HMI_WorkpieceReading.Instance); + // break; + // case "WHMIOP104002": + // case "WHMIOP2002": + // case "WHMIOP303502": + // case "WHMIOP5002": + // case "WHMIOP6002": + // HMI_WorkpieceWrite.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(HMI_WorkpieceWrite.Instance); + // break; + // #endregion + // case "OP0501": + // DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance); + // break; + // case "OP2001": + // DataCaptureHandler_OP2001.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP2001.Instance); + // break; + // #region OP30 + // case "OP3001": + // DataCaptureHandler_OP3001.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3001.Instance); + // break; + // case "OP3002": + // DataCaptureHandler_OP3002.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3002.Instance); + // break; + // case "OP3003": + // DataCaptureHandler_OP3003.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3003.Instance); + // break; + // case "OP3004": + // DataCaptureHandler_OP3004.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3004.Instance); + // break; + // case "OP3005": + // DataCaptureHandler_OP3005.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3005.Instance); + // break; + // case "OP3006": + // DataCaptureHandler_OP3006.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3006.Instance); + // break; + // case "OP3007": + // DataCaptureHandler_OP3007.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3007.Instance); + // break; + // #endregion - #region OP35 - case "OP3501": - DataCaptureHandler_OP3501.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3501.Instance); - break; - case "OP3502": - DataCaptureHandler_OP3502.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3502.Instance); - break; - case "OP3503": - DataCaptureHandler_OP3503.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3503.Instance); - break; - case "OP3504": - DataCaptureHandler_OP3504.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3504.Instance); - break; - case "OP3505": - DataCaptureHandler_OP3505.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3505.Instance); - break; - case "OP3506": - DataCaptureHandler_OP3506.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3506.Instance); - break; - case "OP3507": - DataCaptureHandler_OP3507.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP3507.Instance); - break; - #endregion + // #region OP35 + // case "OP3501": + // DataCaptureHandler_OP3501.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3501.Instance); + // break; + // case "OP3502": + // /* + // DataCaptureHandler_OP3502.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3502.Instance); + // //*/ + // break; + // case "OP3503": + // DataCaptureHandler_OP3503.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3503.Instance); + // break; + // case "OP3504": + // DataCaptureHandler_OP3504.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3504.Instance); + // break; + // case "OP3505": + // DataCaptureHandler_OP3505.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3505.Instance); + // break; + // case "OP3506": + // DataCaptureHandler_OP3506.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3506.Instance); + // break; + // case "OP3507": + // DataCaptureHandler_OP3507.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP3507.Instance); + // break; + // #endregion - #region OP80 - case "OP8001": - DataCaptureHandler_OP8001.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8001.Instance); - break; - case "OP8002": - DataCaptureHandler_OP8002.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8002.Instance); - break; - case "OP8003": - DataCaptureHandler_OP8003.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8003.Instance); - break; - case "OP8004": - DataCaptureHandler_OP8004.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8004.Instance); - break; - case "OP8005": - DataCaptureHandler_OP8005.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8005.Instance); - break; - case "OP8006": - DataCaptureHandler_OP8006.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8006.Instance); - break; - case "OP8007": - DataCaptureHandler_OP8007.Instance._dataCaptureConfig = config; - _dataCaptureHandler.Add(DataCaptureHandler_OP8007.Instance); - break; - #endregion + // #region OP80 + // case "OP8001": + // DataCaptureHandler_OP8001.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8001.Instance); + // break; + // case "OP8002": + // /* + // DataCaptureHandler_OP8002.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8002.Instance); + // //*/ + // break; + // case "OP8003": + // DataCaptureHandler_OP8003.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8003.Instance); + // break; + // case "OP8004": + // DataCaptureHandler_OP8004.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8004.Instance); + // break; + // case "OP8005": + // DataCaptureHandler_OP8005.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8005.Instance); + // break; + // case "OP8006": + // DataCaptureHandler_OP8006.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8006.Instance); + // break; + // case "OP8007": + // DataCaptureHandler_OP8007.Instance._dataCaptureConfig = config; + // _dataCaptureHandler.Add(DataCaptureHandler_OP8007.Instance); + // break; + // #endregion - } - } - #endregion + // } + // } + // #endregion - } - catch (Exception ex) - { - Log4NetHelper.WriteErrorLog(LogType.FormMain, "鍚姩绾跨▼鏃�----btn_StartUpAllThread_Click all鎶ラ敊锛�", ex); - } + //} + //catch (Exception ex) + //{ + // Log4NetHelper.WriteErrorLog(LogType.FormMain, "鍚姩绾跨▼鏃�----btn_StartUpAllThread_Click all鎶ラ敊锛�", ex); + //} + + //**/ } private void button10_Click(object sender, EventArgs e) @@ -934,8 +940,8 @@ MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�"); return; } - DataCaptureHandler.WorkPieceID = textBox10.Text.Trim(); - DataCaptureHandler_OP3002.Instance.DataCaptureStart(); + //DataCaptureHandler.WorkPieceID = textBox10.Text.Trim(); + //DataCaptureHandler_OP3002.Instance.DataCaptureStart(); } catch (Exception ex) @@ -1140,22 +1146,22 @@ { - try - { - if (!SystemValue.isStartedImitateModel) - { - MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�"); - return; - } - DataCaptureHandler.WorkPieceID = textBox10.Text.Trim(); - DataCaptureHandler_OP8002.Instance.DataCaptureStart(); + //try + //{ + // if (!SystemValue.isStartedImitateModel) + // { + // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�"); + // return; + // } + // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim(); + // DataCaptureHandler_OP8002.Instance.DataCaptureStart(); - } - catch (Exception ex) - { - MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}"); - Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex); - } + //} + //catch (Exception ex) + //{ + // MessageBox.Show($"妯℃嫙寮傚父锛歿ex.Message}"); + // Log4NetHelper.WriteErrorLog(LogType.FormMain, "----button10_Click all鎶ラ敊锛�", ex); + //} } private void button20_Click(object sender, EventArgs e) @@ -1353,6 +1359,11 @@ } + /// <summary> + /// 姝e紡鐜锛屼娇鐢ㄨ鎸夐挳鍚姩绾跨▼锛侊紒锛侊紒 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void button24_Click(object sender, EventArgs e) { @@ -1658,24 +1669,24 @@ try { - var WorkingProcedure = "OP35"; - var EquipmentID = "EOP35"; - var DataCapturePointCode = "OP3502A"; - //var DataCapturePointCode = "OP3002CH3"; - WorkPieceLogMiddle wplog = new WorkPieceLogMiddle(); - wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId(); - wplog.WorkingProcedure = WorkingProcedure; - wplog.EquipmentID = EquipmentID; ; - wplog.Remarks = WorkingProcedure; - wplog.MonitoringPoint = DataCapturePointCode; - wplog.WorkPieceID = "DZ045L2309080100181A1A"; - wplog.CreatedTime = DateTimeHelper.GetDateTime(); - wplog.CreatedUserName = DataCapturePointCode; - wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString(); - wplog.UpdatedTime = DateTimeHelper.GetDateTime(); - wplog.IsDeleted = false; - wplog.QualityOP10To1 = "-500"; - WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure)); + //var WorkingProcedure = "OP35"; + //var EquipmentID = "EOP35"; + //var DataCapturePointCode = "OP3502A"; + ////var DataCapturePointCode = "OP3002CH3"; + //WorkPieceLogMiddle wplog = new WorkPieceLogMiddle(); + //wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId(); + //wplog.WorkingProcedure = WorkingProcedure; + //wplog.EquipmentID = EquipmentID; ; + //wplog.Remarks = WorkingProcedure; + //wplog.MonitoringPoint = DataCapturePointCode; + //wplog.WorkPieceID = "DZ045L2309080100181A1A"; + //wplog.CreatedTime = DateTimeHelper.GetDateTime(); + //wplog.CreatedUserName = DataCapturePointCode; + //wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString(); + //wplog.UpdatedTime = DateTimeHelper.GetDateTime(); + //wplog.IsDeleted = false; + //wplog.QualityOP10To1 = "-500"; + //WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure)); //string path = ConfigHelper.GetConfigString("OP30QualityDataForStation");//鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞 //if (string.IsNullOrEmpty(path)) @@ -1861,14 +1872,14 @@ DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config; _dataCaptureHandler.Add(DataCaptureHandler_OP7009.Instance); break; - //case "OP3002CH3": - // //case "OP3002CH4": - // //case "OP3002CH5": - // //case "OP3002CH6": - // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02(); - // dc02._dataCaptureConfig = config; - // _dataCaptureHandler.Add(dc02); - // break; + //case "OP3002CH3": + // //case "OP3002CH4": + // //case "OP3002CH5": + // //case "OP3002CH6": + // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02(); + // dc02._dataCaptureConfig = config; + // _dataCaptureHandler.Add(dc02); + // break; //case "OP2002A": // //case "OP2002B": // //case "OP2002C": -- Gitblit v1.9.3