From 15662d05c2e2a8620cdabf9038c94f7b64a106d2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:33:16 +0800
Subject: [PATCH] 修复
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs | 709 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 376 insertions(+), 333 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index cb1da00..f2d3302 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -730,159 +730,170 @@
}
}
+ /// <summary>
+ /// 鐐瑰嚮鎸夐挳銆愬惎鍔ㄦā鎷熴��
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void button8_Click(object sender, EventArgs e)
{
- try
- {
- DataCaptureHandler.RefreshDataCommonStatic();
- button8.Text = "妯℃嫙宸插惎鍔�";
- button8.BackColor = Color.Green;
- SystemValue.isStartedModel = 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)
{
try
{
- if (!SystemValue.isStartedModel)
+ if (!SystemValue.isStartedImitateModel)
{
MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
return;
@@ -901,22 +912,22 @@
private void button9_Click(object sender, EventArgs e)
{
- try
- {
- if (!SystemValue.isStartedModel)
- {
- 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)
@@ -924,13 +935,13 @@
try
{
- if (!SystemValue.isStartedModel)
+ if (!SystemValue.isStartedImitateModel)
{
MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
return;
}
- DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
- DataCaptureHandler_OP3002.Instance.DataCaptureStart();
+ //DataCaptureHandler.WorkPieceID = textBox10.Text.Trim();
+ //DataCaptureHandler_OP3002.Instance.DataCaptureStart();
}
catch (Exception ex)
@@ -944,85 +955,85 @@
{
- try
- {
- if (!SystemValue.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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)
@@ -1113,132 +1124,132 @@
{
- try
- {
- if (!SystemValue.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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.isStartedModel)
- {
- 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>
@@ -1250,7 +1261,7 @@
{
try
{
- if (!SystemValue.isStartedModel)
+ if (!SystemValue.isStartedImitateModel)
{
MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
return;
@@ -1293,7 +1304,7 @@
{
try
{
- if (!SystemValue.isStartedModel)
+ if (!SystemValue.isStartedImitateModel)
{
MessageBox.Show("璇风偣鍑昏皟璇曟ā寮忔寜閽�");
return;
@@ -1348,6 +1359,11 @@
}
+ /// <summary>
+ /// 姝ｅ紡鐜锛屼娇鐢ㄨ鎸夐挳鍚姩绾跨▼锛侊紒锛侊紒
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void button24_Click(object sender, EventArgs e)
{
@@ -1435,6 +1451,7 @@
DataCaptureHandler_OP6002.Instance._dataCaptureConfig = config;
_dataCaptureHandler.Add(DataCaptureHandler_OP6002.Instance);
break;
+
#endregion
#region 03 NOOK鎺ㄥ嚭
@@ -1496,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":
@@ -1529,6 +1551,15 @@
//鍛婅鐩戞帶
AlertMonitor alert = new AlertMonitor();
_dataCaptureHandler.Add(alert);
+
+ //OP80鐨勮幏鍙栬川閲忔暟鎹� 銆怑ditby shaocx,2024-06-15銆�
+ OP80QualityDataHandler op80QualityDataHandler = new OP80QualityDataHandler();
+ _dataCaptureHandler.Add(op80QualityDataHandler);
+
+ //瀹氭湡鍒犻櫎鏁版嵁 銆怑ditby shaocx,2024-06-15銆�
+ DeleteDataHandler _deleteDataHandler = new DeleteDataHandler();
+ _dataCaptureHandler.Add(_deleteDataHandler);
+
#endregion
try
@@ -1638,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))
@@ -1837,13 +1868,25 @@
{
switch (config.DataCapturePointCode)
{
- case "OP2002A":
- //case "OP2002B":
- //case "OP2002C":
- 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":
+ // DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
+ // dc02._dataCaptureConfig = config;
+ // _dataCaptureHandler.Add(dc02);
+ // break;
//case "OP6002":
// DataCaptureHandler_OP6002.Instance._dataCaptureConfig = config;
// _dataCaptureHandler.Add(DataCaptureHandler_OP6002.Instance);
--
Gitblit v1.9.3