From f0826424c58f3e925a77437111a2e06808bfff26 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 17:48:25 +0800
Subject: [PATCH] //处理OP30的数据
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 859 +++++++++++++++++++++++++++++---------------------------
1 files changed, 440 insertions(+), 419 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index a05448e..0316d96 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)
@@ -906,22 +912,22 @@
private void button9_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3001.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3001.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 button11_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)
@@ -949,85 +955,85 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3003.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3003.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 button15_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3007.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3007.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 button13_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3004.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3004.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 button14_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3005.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP3005.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 button16_Click(object sender, EventArgs e)
@@ -1118,132 +1124,132 @@
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8001.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8001.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 button21_Click(object sender, EventArgs e)
{
- 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)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8003.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8003.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 button19_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8004.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8004.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 button18_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8005.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8005.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 button17_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedImitateModel)
- {
- MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
- return;
- }
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP8007.Instance.DataCaptureStart();
+ //try
+ //{
+ // if (!SystemValue.isStartedImitateModel)
+ // {
+ // MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
+ // return;
+ // }
+ // DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ // DataCaptureHandler_OP8007.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);
+ //}
}
/// <summary>
@@ -1353,6 +1359,11 @@
}
+ /// <summary>
+ /// 姝ｅ紡鐜锛屼娇鐢ㄨ鎸夐挳鍚姩绾跨▼锛侊紒锛侊紒
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void button24_Click(object sender, EventArgs e)
{
@@ -1440,6 +1451,7 @@
DataCaptureHandler_OP6002.Instance._dataCaptureConfig = config;
_dataCaptureHandler.Add(DataCaptureHandler_OP6002.Instance);
break;
+
#endregion
#region 03 NOOK鎺ㄥ嚭
@@ -1501,6 +1513,11 @@
_dataCaptureHandler.Add(dc06);
break;
#endregion
+
+ case "OP7009"://娓呮礂鏈鸿幏鍙栭噰闆嗘暟鎹�
+ DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;
+ _dataCaptureHandler.Add(DataCaptureHandler_OP7009.Instance);
+ break;
//#region 07 鏁伴噰鐩掑瓙鍛婅閲囬泦
////case "OP1007":
@@ -1652,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))
@@ -1851,14 +1868,18 @@
{
switch (config.DataCapturePointCode)
{
- case "OP3002CH3":
- //case "OP3002CH4":
- //case "OP3002CH5":
- //case "OP3002CH6":
- DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
- dc02._dataCaptureConfig = config;
- _dataCaptureHandler.Add(dc02);
+ case "OP7009"://娓呮礂鏈鸿幏鍙栭噰闆嗘暟鎹�
+ 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 "OP2002A":
// //case "OP2002B":
// //case "OP2002C":
@@ -1970,98 +1991,98 @@
}
- public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
- {
- try
- {
- string fileContent = File.ReadAllText(FullName);
- string[] lines2 = fileContent.Split('\n');
- bool IDCodeIndex = false;
- int Mcount = 0;
- int i = 0;
- int count = 0;
- foreach (string line in lines2)
- {
- count++;
- if (count == 4)
- {//鑾峰彇璐ㄩ噺缁撴灉
- var list = line.Split(' ');
- if (list.Count() > 0)
- {
- var str = list[list.Count() - 1].ToString().Trim();
- wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
- }
- }
- // 澶勭悊姣忎竴琛岀殑閫昏緫
- if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
- {
- i++;
- IDCodeIndex = true;
- Mcount = 0;
- }
- if (IDCodeIndex)
- {
- if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
- {//鏈�缁堝姏鐭�
- Mcount++;
- if (Mcount == 3)
- {
- var str = line.Replace("+", "").Replace("-", "");
- var list = str.Split('M');
- if (list.Count() == 4)
- {
- if (i == 1)
- {//CH3
- wplog.QualityOP30To3 = list[2].ToString().Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To9 = list[2].ToString().Trim();
- }
- }
- IDCodeIndex = false;
- }
- }
+ //public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+ //{
+ // try
+ // {
+ // string fileContent = File.ReadAllText(FullName);
+ // string[] lines2 = fileContent.Split('\n');
+ // bool IDCodeIndex = false;
+ // int Mcount = 0;
+ // int i = 0;
+ // int count = 0;
+ // foreach (string line in lines2)
+ // {
+ // count++;
+ // if (count == 4)
+ // {//鑾峰彇璐ㄩ噺缁撴灉
+ // var list = line.Split(' ');
+ // if (list.Count() > 0)
+ // {
+ // var str = list[list.Count() - 1].ToString().Trim();
+ // wplog.QualityStateStr = str.Equals("OK") ? "OK" : "NG";
+ // }
+ // }
+ // // 澶勭悊姣忎竴琛岀殑閫昏緫
+ // if (line.Contains("ID-Code"))//涓や釜鎷х揣锛屾瘡涓墠闈㈤兘鏈塈D-Code
+ // {
+ // i++;
+ // IDCodeIndex = true;
+ // Mcount = 0;
+ // }
+ // if (IDCodeIndex)
+ // {
+ // if (line.Contains(" M "))//绗笁涓狹琛屾槸鎷х揣鏁版嵁
+ // {//鏈�缁堝姏鐭�
+ // Mcount++;
+ // if (Mcount == 3)
+ // {
+ // var str = line.Replace("+", "").Replace("-", "");
+ // var list = str.Split('M');
+ // if (list.Count() == 4)
+ // {
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To3 = list[2].ToString().Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To9 = list[2].ToString().Trim();
+ // }
+ // }
+ // IDCodeIndex = false;
+ // }
+ // }
- }
- if (line.Contains(" MWSP "))
- {//缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
- var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
- if (list.Count() == 2)
- {
- if (i == 1)
- {//CH3
- wplog.QualityOP30To4 = list[1].ToString().Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To10 = list[1].ToString().Trim();
- }
- var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
- if (list2.Count() == 2)
- {
- var str = list2[1].ToString();
- if (i == 1)
- {//CH3
- wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
- }
- else
- {//CH4
- wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
- }
- }
- }
+ // }
+ // if (line.Contains(" MWSP "))
+ // {//缁堟嫥绱у姏鐭� 缁堟嫥绱ц搴�
+ // var list = line.Split(new String[] { " MWS " }, StringSplitOptions.None);
+ // if (list.Count() == 2)
+ // {
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To4 = list[1].ToString().Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To10 = list[1].ToString().Trim();
+ // }
+ // var list2 = list[0].Split(new String[] { " W " }, StringSplitOptions.None);
+ // if (list2.Count() == 2)
+ // {
+ // var str = list2[1].ToString();
+ // if (i == 1)
+ // {//CH3
+ // wplog.QualityOP30To5 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+ // }
+ // else
+ // {//CH4
+ // wplog.QualityOP30To11 = str.Substring(0, str.IndexOf("MWSP")).Trim();
+ // }
+ // }
+ // }
- }
- }
- }
- catch (Exception ex)
- {
- //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
- }
- return wplog;
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // //Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}CH5宸ヤ綅璐ㄩ噺鏁版嵁寮傚父宸ヤ欢鍙凤細{(wplog.WorkPieceID == null ? "" : wplog.WorkPieceID)} 鏂囦欢鍚嶏細{FullName}锛�", ex);
+ // }
+ // return wplog;
- }
+ //}
private void button27_Click(object sender, EventArgs e)
{
try
--
Gitblit v1.9.3