From 248201a7262e952f7e4a88b37d937cf1a7237644 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 12月 2024 14:44:51 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/3、DataProcess_BZ12_FinishTask.cs | 19 +
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 12
CC/iWareCommon/log4net_iWare.config | 56 +++---
CC/iWareSql/DataAccess/ClearDataHandler.cs | 16 +-
CC/iWareCC_ASRS/ThreadService/01_BZ01工位（清灰，洗板后工位）/DataProcess_BZ01.cs | 5
CC/iWareCommon/Utils/Log4Net/LogType.cs | 4
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/3、DataProcess_RobotBuffer_FinishTask.cs | 5
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/2、DataProcess_BZ12_IssueTask.cs | 6
CC/iWareCC_ASRS/FormCC.cs | 20 +-
CC/iWareSql/DataAccess/MesService.cs | 6
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs | 9
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/3、DataProcess_BZ21_FinishTask.cs | 8
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Inbound/1、DataProcess_BZ39.cs | 5
CC/iWareCC_ASRS/FormCC.Designer.cs | 240 +++++++++++++++---------------
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/1、DataProcess_BZ21.cs | 7
CC/iWareCC_ASRS/ThreadService/00_269工位/DataProcess_269.cs | 5
CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs | 8
17 files changed, 233 insertions(+), 198 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index 82c5614..5389388 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -23,10 +23,7 @@
/// </summary>
public static string _lbl_Alert_Srm2Release = string.Empty;
- /// <summary>
- /// 鍫嗗灈鏈�3涓嬪彂鐨勮鍛婃秷鎭�
- /// </summary>
- public static string _lbl_Alert_Srm3Release = string.Empty;
+
/// <summary>
@@ -42,17 +39,17 @@
/// <summary>
/// 鍫嗗灈鏈�2涓嬪彂瀹屾垚鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_Srm2ReleaseFinish = string.Empty;
+ public static string _lbl_Alert_DataProcess_BZ12_FinishTask = string.Empty;
/// <summary>
/// 鍫嗗灈鏈�3涓嬪彂瀹屾垚鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_Srm3ReleaseFinish = string.Empty;
+ public static string _lbl_Alert_DataProcess_BZ21_FinishTask = string.Empty;
/// <summary>
/// 鍫嗗灈鏈�4涓嬪彂瀹屾垚鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_Srm4ReleaseFinish = string.Empty;
+ public static string _lbl_Alert_DataProcess_BZ21 = string.Empty;
/// <summary>
@@ -122,6 +119,7 @@
/// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
/// </summary>
public static string _lbl_alert_DataProcess_BZ12 = string.Empty;
+
/// <summary>
/// 鑷姩鐮佹澘浠诲姟 鐨勮鍛婃秷鎭�
/// </summary>
diff --git a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
index 1ec36e1..15dcb96 100644
--- a/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
+++ b/CC/iWareCC_ASRS/DeviceThreadFactory/DeviceThreadService/SrmThreadService/SrmTaskThreadService.cs
@@ -91,7 +91,7 @@
}
SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask = errMsg1;
SystemWarningMsg._lbl_Alert_Srm2Release = errMsg2;
- SystemWarningMsg._lbl_Alert_Srm3Release = errMsg3;
+
SystemWarningMsg._lbl_Alert_Srm4Release = errMsg4;
Thread.Sleep(2000);//2绉掍竴娆�
}
@@ -577,9 +577,9 @@
ConfirmFinishTaskHandle(i_deviceId, out errMsg4);
}
SystemWarningMsg._lbl_Alert_Srm1ReleaseFinish = errMsg1;
- SystemWarningMsg._lbl_Alert_Srm2ReleaseFinish = errMsg2;
- SystemWarningMsg._lbl_Alert_Srm3ReleaseFinish = errMsg3;
- SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish = errMsg4;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = errMsg2;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = errMsg3;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = errMsg4;
Thread.Sleep(2000);//璁剧疆2绉掍竴娆�
}
}
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index 329ea04..9b42137 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -234,8 +234,8 @@
this.ck_PushPackageCodeToMes = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_FinishTask = new System.Windows.Forms.Label();
this.ck_DataProcess_RobotBuffer_FinishTask = new System.Windows.Forms.CheckBox();
- this.lbl_Alter_OutTaskRetryToMes = new System.Windows.Forms.Label();
- this.checkBox_OutTaskRetryToMes = new System.Windows.Forms.CheckBox();
+ this.lbl_Alter_DataProcess_BZ21 = new System.Windows.Forms.Label();
+ this.checkBox_DataProcess_BZ21 = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.Label();
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.CheckBox();
this.lbl_DataProcess_RobotBuffer_ModeChange = new System.Windows.Forms.Label();
@@ -256,12 +256,12 @@
this.lbl_Alert_Srm4Release = new System.Windows.Forms.Label();
this.ckBSrm4Release = new System.Windows.Forms.CheckBox();
this.ckBSrm4FinishedHandle = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_Srm3ReleaseFinish = new System.Windows.Forms.Label();
- this.lbl_Alert_Srm3Release = new System.Windows.Forms.Label();
- this.ckBSrm3Release = new System.Windows.Forms.CheckBox();
- this.ckBSrm3FinishedHandle = new System.Windows.Forms.CheckBox();
+ this.lbl_Alert_DataProcess_BZ21_FinishTask = new System.Windows.Forms.Label();
+ this.lbl_Alert_DataProcess_BZ12 = new System.Windows.Forms.Label();
+ this.ckBDataProcess_BZ12 = new System.Windows.Forms.CheckBox();
+ this.ckBDataProcess_BZ21_FinishTask = new System.Windows.Forms.CheckBox();
this.lbl_Alert_PushPaperCutToMes = new System.Windows.Forms.Label();
- this.lbl_Alert_Srm2ReleaseFinish = new System.Windows.Forms.Label();
+ this.lbl_Alert_DataProcess_BZ12_FinishTask = new System.Windows.Forms.Label();
this.lbl_Alter_Srm1ReleaseFinish = new System.Windows.Forms.Label();
this.lbl_Alert_RgvRelease = new System.Windows.Forms.Label();
this.lbl_Alert_Srm2Release = new System.Windows.Forms.Label();
@@ -271,7 +271,7 @@
this.ckBSrm1FinishedHandle = new System.Windows.Forms.CheckBox();
this.ckBRgvRelease = new System.Windows.Forms.CheckBox();
this.ckBSrm2Release = new System.Windows.Forms.CheckBox();
- this.ckBSrm2FinishedHandle = new System.Windows.Forms.CheckBox();
+ this.ckBDataProcess_BZ12_FinishTask = new System.Windows.Forms.CheckBox();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.panel_Srm4 = new System.Windows.Forms.Panel();
this.btnSMQZYZTG4 = new System.Windows.Forms.Button();
@@ -3006,8 +3006,8 @@
this.groupBox1.Controls.Add(this.ck_PushPackageCodeToMes);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_FinishTask);
this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_FinishTask);
- this.groupBox1.Controls.Add(this.lbl_Alter_OutTaskRetryToMes);
- this.groupBox1.Controls.Add(this.checkBox_OutTaskRetryToMes);
+ this.groupBox1.Controls.Add(this.lbl_Alter_DataProcess_BZ21);
+ this.groupBox1.Controls.Add(this.checkBox_DataProcess_BZ21);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound);
this.groupBox1.Controls.Add(this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
this.groupBox1.Controls.Add(this.lbl_DataProcess_RobotBuffer_ModeChange);
@@ -3028,12 +3028,12 @@
this.groupBox1.Controls.Add(this.lbl_Alert_Srm4Release);
this.groupBox1.Controls.Add(this.ckBSrm4Release);
this.groupBox1.Controls.Add(this.ckBSrm4FinishedHandle);
- this.groupBox1.Controls.Add(this.lbl_Alert_Srm3ReleaseFinish);
- this.groupBox1.Controls.Add(this.lbl_Alert_Srm3Release);
- this.groupBox1.Controls.Add(this.ckBSrm3Release);
- this.groupBox1.Controls.Add(this.ckBSrm3FinishedHandle);
+ this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_BZ21_FinishTask);
+ this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_BZ12);
+ this.groupBox1.Controls.Add(this.ckBDataProcess_BZ12);
+ this.groupBox1.Controls.Add(this.ckBDataProcess_BZ21_FinishTask);
this.groupBox1.Controls.Add(this.lbl_Alert_PushPaperCutToMes);
- this.groupBox1.Controls.Add(this.lbl_Alert_Srm2ReleaseFinish);
+ this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_BZ12_FinishTask);
this.groupBox1.Controls.Add(this.lbl_Alter_Srm1ReleaseFinish);
this.groupBox1.Controls.Add(this.lbl_Alert_RgvRelease);
this.groupBox1.Controls.Add(this.lbl_Alert_Srm2Release);
@@ -3043,7 +3043,7 @@
this.groupBox1.Controls.Add(this.ckBSrm1FinishedHandle);
this.groupBox1.Controls.Add(this.ckBRgvRelease);
this.groupBox1.Controls.Add(this.ckBSrm2Release);
- this.groupBox1.Controls.Add(this.ckBSrm2FinishedHandle);
+ this.groupBox1.Controls.Add(this.ckBDataProcess_BZ12_FinishTask);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.ForeColor = System.Drawing.Color.Maroon;
this.groupBox1.Location = new System.Drawing.Point(4, 20);
@@ -3170,35 +3170,35 @@
this.ck_DataProcess_RobotBuffer_FinishTask.UseVisualStyleBackColor = true;
this.ck_DataProcess_RobotBuffer_FinishTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alter_OutTaskRetryToMes
+ // lbl_Alter_DataProcess_BZ21
//
- this.lbl_Alter_OutTaskRetryToMes.AutoSize = true;
- this.lbl_Alter_OutTaskRetryToMes.BackColor = System.Drawing.Color.White;
- this.lbl_Alter_OutTaskRetryToMes.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alter_OutTaskRetryToMes.Location = new System.Drawing.Point(213, 678);
- this.lbl_Alter_OutTaskRetryToMes.Name = "lbl_Alter_OutTaskRetryToMes";
- this.lbl_Alter_OutTaskRetryToMes.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alter_OutTaskRetryToMes.TabIndex = 47;
- this.lbl_Alter_OutTaskRetryToMes.Text = "label11";
+ this.lbl_Alter_DataProcess_BZ21.AutoSize = true;
+ this.lbl_Alter_DataProcess_BZ21.BackColor = System.Drawing.Color.White;
+ this.lbl_Alter_DataProcess_BZ21.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alter_DataProcess_BZ21.Location = new System.Drawing.Point(217, 607);
+ this.lbl_Alter_DataProcess_BZ21.Name = "lbl_Alter_DataProcess_BZ21";
+ this.lbl_Alter_DataProcess_BZ21.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alter_DataProcess_BZ21.TabIndex = 47;
+ this.lbl_Alter_DataProcess_BZ21.Text = "label11";
//
- // checkBox_OutTaskRetryToMes
+ // checkBox_DataProcess_BZ21
//
- this.checkBox_OutTaskRetryToMes.AutoSize = true;
- this.checkBox_OutTaskRetryToMes.Location = new System.Drawing.Point(0, 678);
- this.checkBox_OutTaskRetryToMes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.checkBox_OutTaskRetryToMes.Name = "checkBox_OutTaskRetryToMes";
- this.checkBox_OutTaskRetryToMes.Size = new System.Drawing.Size(184, 19);
- this.checkBox_OutTaskRetryToMes.TabIndex = 46;
- this.checkBox_OutTaskRetryToMes.Text = "出库任务通知MES线程";
- this.checkBox_OutTaskRetryToMes.UseVisualStyleBackColor = true;
- this.checkBox_OutTaskRetryToMes.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.checkBox_DataProcess_BZ21.AutoSize = true;
+ this.checkBox_DataProcess_BZ21.Location = new System.Drawing.Point(4, 607);
+ this.checkBox_DataProcess_BZ21.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.checkBox_DataProcess_BZ21.Name = "checkBox_DataProcess_BZ21";
+ this.checkBox_DataProcess_BZ21.Size = new System.Drawing.Size(161, 19);
+ this.checkBox_DataProcess_BZ21.TabIndex = 46;
+ this.checkBox_DataProcess_BZ21.Text = "BZ21工位处理线程";
+ this.checkBox_DataProcess_BZ21.UseVisualStyleBackColor = true;
+ this.checkBox_DataProcess_BZ21.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound
//
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.AutoSize = true;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.BackColor = System.Drawing.Color.White;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Location = new System.Drawing.Point(324, 648);
+ this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Location = new System.Drawing.Point(324, 450);
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Name = "lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound";
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Size = new System.Drawing.Size(70, 15);
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.TabIndex = 45;
@@ -3207,7 +3207,7 @@
// checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound
//
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.AutoSize = true;
- this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.Location = new System.Drawing.Point(3, 644);
+ this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.Location = new System.Drawing.Point(3, 446);
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.Name = "checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound";
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.Size = new System.Drawing.Size(285, 19);
@@ -3221,7 +3221,7 @@
this.lbl_DataProcess_RobotBuffer_ModeChange.AutoSize = true;
this.lbl_DataProcess_RobotBuffer_ModeChange.BackColor = System.Drawing.Color.White;
this.lbl_DataProcess_RobotBuffer_ModeChange.ForeColor = System.Drawing.Color.Red;
- this.lbl_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(213, 452);
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(213, 254);
this.lbl_DataProcess_RobotBuffer_ModeChange.Name = "lbl_DataProcess_RobotBuffer_ModeChange";
this.lbl_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(70, 15);
this.lbl_DataProcess_RobotBuffer_ModeChange.TabIndex = 43;
@@ -3230,7 +3230,7 @@
// ck_DataProcess_RobotBuffer_ModeChange
//
this.ck_DataProcess_RobotBuffer_ModeChange.AutoSize = true;
- this.ck_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(3, 452);
+ this.ck_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(3, 254);
this.ck_DataProcess_RobotBuffer_ModeChange.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ck_DataProcess_RobotBuffer_ModeChange.Name = "ck_DataProcess_RobotBuffer_ModeChange";
this.ck_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(166, 19);
@@ -3244,7 +3244,7 @@
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.AutoSize = true;
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.BackColor = System.Drawing.Color.White;
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Location = new System.Drawing.Point(289, 609);
+ this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Location = new System.Drawing.Point(289, 411);
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Name = "lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound";
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Size = new System.Drawing.Size(70, 15);
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.TabIndex = 41;
@@ -3253,7 +3253,7 @@
// ckDataProcess_RobotBuffer_AutoQiTaoOutbound
//
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.AutoSize = true;
- this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Location = new System.Drawing.Point(3, 609);
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Location = new System.Drawing.Point(3, 411);
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Name = "ckDataProcess_RobotBuffer_AutoQiTaoOutbound";
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Size = new System.Drawing.Size(271, 19);
@@ -3267,7 +3267,7 @@
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.AutoSize = true;
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.BackColor = System.Drawing.Color.White;
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Location = new System.Drawing.Point(345, 529);
+ this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Location = new System.Drawing.Point(345, 331);
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Name = "lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask";
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Size = new System.Drawing.Size(70, 15);
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.TabIndex = 39;
@@ -3277,7 +3277,7 @@
// ck_DataProcess_RobotBuffer_IssueOutboundTask
//
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.AutoSize = true;
- this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Location = new System.Drawing.Point(4, 528);
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Location = new System.Drawing.Point(4, 330);
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Name = "ck_DataProcess_RobotBuffer_IssueOutboundTask";
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Size = new System.Drawing.Size(335, 19);
@@ -3291,7 +3291,7 @@
this.lbl_DataProcess_ValidateQiTao.AutoSize = true;
this.lbl_DataProcess_ValidateQiTao.BackColor = System.Drawing.Color.White;
this.lbl_DataProcess_ValidateQiTao.ForeColor = System.Drawing.Color.Red;
- this.lbl_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(215, 492);
+ this.lbl_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(215, 294);
this.lbl_DataProcess_ValidateQiTao.Name = "lbl_DataProcess_ValidateQiTao";
this.lbl_DataProcess_ValidateQiTao.Size = new System.Drawing.Size(70, 15);
this.lbl_DataProcess_ValidateQiTao.TabIndex = 37;
@@ -3300,7 +3300,7 @@
// ck_DataProcess_ValidateQiTao
//
this.ck_DataProcess_ValidateQiTao.AutoSize = true;
- this.ck_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(4, 492);
+ this.ck_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(4, 294);
this.ck_DataProcess_ValidateQiTao.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ck_DataProcess_ValidateQiTao.Name = "ck_DataProcess_ValidateQiTao";
this.ck_DataProcess_ValidateQiTao.Size = new System.Drawing.Size(161, 19);
@@ -3314,7 +3314,7 @@
this.lbl_DataProcess_BZ21_IssueTask.AutoSize = true;
this.lbl_DataProcess_BZ21_IssueTask.BackColor = System.Drawing.Color.White;
this.lbl_DataProcess_BZ21_IssueTask.ForeColor = System.Drawing.Color.Red;
- this.lbl_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(214, 270);
+ this.lbl_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(214, 637);
this.lbl_DataProcess_BZ21_IssueTask.Name = "lbl_DataProcess_BZ21_IssueTask";
this.lbl_DataProcess_BZ21_IssueTask.Size = new System.Drawing.Size(70, 15);
this.lbl_DataProcess_BZ21_IssueTask.TabIndex = 35;
@@ -3323,12 +3323,12 @@
// ck_DataProcess_BZ21_IssueTask
//
this.ck_DataProcess_BZ21_IssueTask.AutoSize = true;
- this.ck_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(3, 270);
+ this.ck_DataProcess_BZ21_IssueTask.Location = new System.Drawing.Point(3, 637);
this.ck_DataProcess_BZ21_IssueTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ck_DataProcess_BZ21_IssueTask.Name = "ck_DataProcess_BZ21_IssueTask";
- this.ck_DataProcess_BZ21_IssueTask.Size = new System.Drawing.Size(125, 19);
+ this.ck_DataProcess_BZ21_IssueTask.Size = new System.Drawing.Size(161, 19);
this.ck_DataProcess_BZ21_IssueTask.TabIndex = 34;
- this.ck_DataProcess_BZ21_IssueTask.Text = "合包任务下发";
+ this.ck_DataProcess_BZ21_IssueTask.Text = "BZ21合包任务下发";
this.ck_DataProcess_BZ21_IssueTask.UseVisualStyleBackColor = true;
this.ck_DataProcess_BZ21_IssueTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
@@ -3337,7 +3337,7 @@
this.lbl_Alert_DeleteData.AutoSize = true;
this.lbl_Alert_DeleteData.BackColor = System.Drawing.Color.White;
this.lbl_Alert_DeleteData.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_DeleteData.Location = new System.Drawing.Point(215, 566);
+ this.lbl_Alert_DeleteData.Location = new System.Drawing.Point(215, 368);
this.lbl_Alert_DeleteData.Name = "lbl_Alert_DeleteData";
this.lbl_Alert_DeleteData.Size = new System.Drawing.Size(70, 15);
this.lbl_Alert_DeleteData.TabIndex = 33;
@@ -3346,7 +3346,7 @@
// ckDeleteData
//
this.ckDeleteData.AutoSize = true;
- this.ckDeleteData.Location = new System.Drawing.Point(3, 566);
+ this.ckDeleteData.Location = new System.Drawing.Point(3, 368);
this.ckDeleteData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ckDeleteData.Name = "ckDeleteData";
this.ckDeleteData.Size = new System.Drawing.Size(125, 19);
@@ -3360,7 +3360,7 @@
this.lbl_Alert_DataProcess_BZ12_IssueTask.AutoSize = true;
this.lbl_Alert_DataProcess_BZ12_IssueTask.BackColor = System.Drawing.Color.White;
this.lbl_Alert_DataProcess_BZ12_IssueTask.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_DataProcess_BZ12_IssueTask.Location = new System.Drawing.Point(215, 373);
+ this.lbl_Alert_DataProcess_BZ12_IssueTask.Location = new System.Drawing.Point(219, 531);
this.lbl_Alert_DataProcess_BZ12_IssueTask.Name = "lbl_Alert_DataProcess_BZ12_IssueTask";
this.lbl_Alert_DataProcess_BZ12_IssueTask.Size = new System.Drawing.Size(70, 15);
this.lbl_Alert_DataProcess_BZ12_IssueTask.TabIndex = 31;
@@ -3369,12 +3369,12 @@
// ck_DataProcess_BZ12_IssueTask
//
this.ck_DataProcess_BZ12_IssueTask.AutoSize = true;
- this.ck_DataProcess_BZ12_IssueTask.Location = new System.Drawing.Point(4, 373);
+ this.ck_DataProcess_BZ12_IssueTask.Location = new System.Drawing.Point(8, 531);
this.ck_DataProcess_BZ12_IssueTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ck_DataProcess_BZ12_IssueTask.Name = "ck_DataProcess_BZ12_IssueTask";
- this.ck_DataProcess_BZ12_IssueTask.Size = new System.Drawing.Size(125, 19);
+ this.ck_DataProcess_BZ12_IssueTask.Size = new System.Drawing.Size(161, 19);
this.ck_DataProcess_BZ12_IssueTask.TabIndex = 30;
- this.ck_DataProcess_BZ12_IssueTask.Text = "下发码板任务";
+ this.ck_DataProcess_BZ12_IssueTask.Text = "BZ12下发码板任务";
this.ck_DataProcess_BZ12_IssueTask.UseVisualStyleBackColor = true;
this.ck_DataProcess_BZ12_IssueTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
@@ -3424,51 +3424,51 @@
this.ckBSrm4FinishedHandle.UseVisualStyleBackColor = true;
this.ckBSrm4FinishedHandle.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_Srm3ReleaseFinish
+ // lbl_Alert_DataProcess_BZ21_FinishTask
//
- this.lbl_Alert_Srm3ReleaseFinish.AutoSize = true;
- this.lbl_Alert_Srm3ReleaseFinish.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_Srm3ReleaseFinish.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_Srm3ReleaseFinish.Location = new System.Drawing.Point(936, 172);
- this.lbl_Alert_Srm3ReleaseFinish.Name = "lbl_Alert_Srm3ReleaseFinish";
- this.lbl_Alert_Srm3ReleaseFinish.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_Srm3ReleaseFinish.TabIndex = 25;
- this.lbl_Alert_Srm3ReleaseFinish.Text = "label11";
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.AutoSize = true;
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.Location = new System.Drawing.Point(213, 674);
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.Name = "lbl_Alert_DataProcess_BZ21_FinishTask";
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.TabIndex = 25;
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.Text = "label11";
//
- // lbl_Alert_Srm3Release
+ // lbl_Alert_DataProcess_BZ12
//
- this.lbl_Alert_Srm3Release.AutoSize = true;
- this.lbl_Alert_Srm3Release.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_Srm3Release.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_Srm3Release.Location = new System.Drawing.Point(936, 139);
- this.lbl_Alert_Srm3Release.Name = "lbl_Alert_Srm3Release";
- this.lbl_Alert_Srm3Release.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_Srm3Release.TabIndex = 24;
- this.lbl_Alert_Srm3Release.Text = "label11";
+ this.lbl_Alert_DataProcess_BZ12.AutoSize = true;
+ this.lbl_Alert_DataProcess_BZ12.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_DataProcess_BZ12.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_DataProcess_BZ12.Location = new System.Drawing.Point(214, 504);
+ this.lbl_Alert_DataProcess_BZ12.Name = "lbl_Alert_DataProcess_BZ12";
+ this.lbl_Alert_DataProcess_BZ12.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_DataProcess_BZ12.TabIndex = 24;
+ this.lbl_Alert_DataProcess_BZ12.Text = "label11";
//
- // ckBSrm3Release
+ // ckBDataProcess_BZ12
//
- this.ckBSrm3Release.AutoSize = true;
- this.ckBSrm3Release.Location = new System.Drawing.Point(728, 139);
- this.ckBSrm3Release.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckBSrm3Release.Name = "ckBSrm3Release";
- this.ckBSrm3Release.Size = new System.Drawing.Size(150, 19);
- this.ckBSrm3Release.TabIndex = 22;
- this.ckBSrm3Release.Text = "堆垛机3任务下发";
- this.ckBSrm3Release.UseVisualStyleBackColor = true;
- this.ckBSrm3Release.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ckBDataProcess_BZ12.AutoSize = true;
+ this.ckBDataProcess_BZ12.Location = new System.Drawing.Point(6, 504);
+ this.ckBDataProcess_BZ12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ckBDataProcess_BZ12.Name = "ckBDataProcess_BZ12";
+ this.ckBDataProcess_BZ12.Size = new System.Drawing.Size(193, 19);
+ this.ckBDataProcess_BZ12.TabIndex = 22;
+ this.ckBDataProcess_BZ12.Text = "BZ12码包工位处理线程";
+ this.ckBDataProcess_BZ12.UseVisualStyleBackColor = true;
+ this.ckBDataProcess_BZ12.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // ckBSrm3FinishedHandle
+ // ckBDataProcess_BZ21_FinishTask
//
- this.ckBSrm3FinishedHandle.AutoSize = true;
- this.ckBSrm3FinishedHandle.Location = new System.Drawing.Point(728, 168);
- this.ckBSrm3FinishedHandle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckBSrm3FinishedHandle.Name = "ckBSrm3FinishedHandle";
- this.ckBSrm3FinishedHandle.Size = new System.Drawing.Size(182, 19);
- this.ckBSrm3FinishedHandle.TabIndex = 23;
- this.ckBSrm3FinishedHandle.Text = "堆垛机3任务完成处理";
- this.ckBSrm3FinishedHandle.UseVisualStyleBackColor = true;
- this.ckBSrm3FinishedHandle.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ckBDataProcess_BZ21_FinishTask.AutoSize = true;
+ this.ckBDataProcess_BZ21_FinishTask.Location = new System.Drawing.Point(5, 670);
+ this.ckBDataProcess_BZ21_FinishTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ckBDataProcess_BZ21_FinishTask.Name = "ckBDataProcess_BZ21_FinishTask";
+ this.ckBDataProcess_BZ21_FinishTask.Size = new System.Drawing.Size(193, 19);
+ this.ckBDataProcess_BZ21_FinishTask.TabIndex = 23;
+ this.ckBDataProcess_BZ21_FinishTask.Text = "BZ21合包任务完成处理";
+ this.ckBDataProcess_BZ21_FinishTask.UseVisualStyleBackColor = true;
+ this.ckBDataProcess_BZ21_FinishTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_PushPaperCutToMes
//
@@ -3481,16 +3481,16 @@
this.lbl_Alert_PushPaperCutToMes.TabIndex = 21;
this.lbl_Alert_PushPaperCutToMes.Text = "label11";
//
- // lbl_Alert_Srm2ReleaseFinish
+ // lbl_Alert_DataProcess_BZ12_FinishTask
//
- this.lbl_Alert_Srm2ReleaseFinish.AutoSize = true;
- this.lbl_Alert_Srm2ReleaseFinish.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_Srm2ReleaseFinish.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_Srm2ReleaseFinish.Location = new System.Drawing.Point(936, 113);
- this.lbl_Alert_Srm2ReleaseFinish.Name = "lbl_Alert_Srm2ReleaseFinish";
- this.lbl_Alert_Srm2ReleaseFinish.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_Srm2ReleaseFinish.TabIndex = 17;
- this.lbl_Alert_Srm2ReleaseFinish.Text = "label11";
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.AutoSize = true;
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.BackColor = System.Drawing.Color.White;
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.ForeColor = System.Drawing.Color.Red;
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.Location = new System.Drawing.Point(213, 558);
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.Name = "lbl_Alert_DataProcess_BZ12_FinishTask";
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.Size = new System.Drawing.Size(70, 15);
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.TabIndex = 17;
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.Text = "label11";
//
// lbl_Alter_Srm1ReleaseFinish
//
@@ -3596,17 +3596,17 @@
this.ckBSrm2Release.UseVisualStyleBackColor = true;
this.ckBSrm2Release.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // ckBSrm2FinishedHandle
+ // ckBDataProcess_BZ12_FinishTask
//
- this.ckBSrm2FinishedHandle.AutoSize = true;
- this.ckBSrm2FinishedHandle.Location = new System.Drawing.Point(728, 109);
- this.ckBSrm2FinishedHandle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckBSrm2FinishedHandle.Name = "ckBSrm2FinishedHandle";
- this.ckBSrm2FinishedHandle.Size = new System.Drawing.Size(182, 19);
- this.ckBSrm2FinishedHandle.TabIndex = 3;
- this.ckBSrm2FinishedHandle.Text = "堆垛机2任务完成处理";
- this.ckBSrm2FinishedHandle.UseVisualStyleBackColor = true;
- this.ckBSrm2FinishedHandle.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ckBDataProcess_BZ12_FinishTask.AutoSize = true;
+ this.ckBDataProcess_BZ12_FinishTask.Location = new System.Drawing.Point(5, 554);
+ this.ckBDataProcess_BZ12_FinishTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ckBDataProcess_BZ12_FinishTask.Name = "ckBDataProcess_BZ12_FinishTask";
+ this.ckBDataProcess_BZ12_FinishTask.Size = new System.Drawing.Size(193, 19);
+ this.ckBDataProcess_BZ12_FinishTask.TabIndex = 3;
+ this.ckBDataProcess_BZ12_FinishTask.Text = "BZ12码板任务完成处理";
+ this.ckBDataProcess_BZ12_FinishTask.UseVisualStyleBackColor = true;
+ this.ckBDataProcess_BZ12_FinishTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// tabPage1
//
@@ -6064,14 +6064,14 @@
private System.Windows.Forms.CheckBox ckBSrm1FinishedHandle;
private System.Windows.Forms.CheckBox ckBRgvRelease;
private System.Windows.Forms.CheckBox ckBSrm2Release;
- private System.Windows.Forms.CheckBox ckBSrm2FinishedHandle;
+ private System.Windows.Forms.CheckBox ckBDataProcess_BZ12_FinishTask;
private System.Windows.Forms.Button btn_Change1;
private System.Windows.Forms.Button btn_Change2;
private System.Windows.Forms.Label lbl_SrmConveyorAlarm_2;
private System.Windows.Forms.Label lbl_Alert_DataProcess_BZ39_IssueInboundTask;
private System.Windows.Forms.Label lbl_Alert_Srm2Release;
private System.Windows.Forms.Label lbl_Alert_RgvRelease;
- private System.Windows.Forms.Label lbl_Alert_Srm2ReleaseFinish;
+ private System.Windows.Forms.Label lbl_Alert_DataProcess_BZ12_FinishTask;
private System.Windows.Forms.Label lbl_Alter_Srm1ReleaseFinish;
private System.Windows.Forms.Label lbl_Alert_PushPaperCutToMes;
private System.Windows.Forms.RadioButton rbHand;
@@ -6081,10 +6081,10 @@
private System.Windows.Forms.Label lbl_Alert_Srm4Release;
private System.Windows.Forms.CheckBox ckBSrm4Release;
private System.Windows.Forms.CheckBox ckBSrm4FinishedHandle;
- private System.Windows.Forms.Label lbl_Alert_Srm3ReleaseFinish;
- private System.Windows.Forms.Label lbl_Alert_Srm3Release;
- private System.Windows.Forms.CheckBox ckBSrm3Release;
- private System.Windows.Forms.CheckBox ckBSrm3FinishedHandle;
+ private System.Windows.Forms.Label lbl_Alert_DataProcess_BZ21_FinishTask;
+ private System.Windows.Forms.Label lbl_Alert_DataProcess_BZ12;
+ private System.Windows.Forms.CheckBox ckBDataProcess_BZ12;
+ private System.Windows.Forms.CheckBox ckBDataProcess_BZ21_FinishTask;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.Panel panel_Srm4;
private System.Windows.Forms.Label lblSrmAlarm4;
@@ -6347,8 +6347,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn49;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn51;
private System.Windows.Forms.Button btnDeleteTask;
- private System.Windows.Forms.Label lbl_Alter_OutTaskRetryToMes;
- private System.Windows.Forms.CheckBox checkBox_OutTaskRetryToMes;
+ private System.Windows.Forms.Label lbl_Alter_DataProcess_BZ21;
+ private System.Windows.Forms.CheckBox checkBox_DataProcess_BZ21;
private System.Windows.Forms.TabPage tabPage_OutTaskRetryToMes;
private System.Windows.Forms.Panel panel_dg_OutTaskRetryToMes;
private System.Windows.Forms.Button btn_Find_OutTaskRetryToMes;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 4d87e0e..2217055 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -349,15 +349,15 @@
//璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟纭绾跨▼娑堟伅
this.lbl_Alert_DataProcess_BZ39_IssueInboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask;
this.lbl_Alert_Srm2Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm2Release;
- this.lbl_Alert_Srm3Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm3Release;
+ this.lbl_Alert_DataProcess_BZ12.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ12;
this.lbl_Alert_Srm4Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4Release;
//璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟瀹屾垚纭绾跨▼娑堟伅
this.lbl_Alter_Srm1ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm1ReleaseFinish;
- this.lbl_Alert_Srm2ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm2ReleaseFinish;
- this.lbl_Alert_Srm3ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm3ReleaseFinish;
- this.lbl_Alert_Srm4ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish;
-
+ this.lbl_Alert_DataProcess_BZ12_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask;
+ this.lbl_Alert_DataProcess_BZ21_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask;
+
+
this.lbl_Alert_PushPaperCutToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPaperCutToMes;
this.lbl_Alert_PushPackageCodeToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPackageCodeToMes;
@@ -374,6 +374,8 @@
this.lbl_Alert_DeleteData.Text = showNowTime + SystemWarningMsg._lbl_Alert_DeleteData;
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound;
+
+ this.lbl_Alter_DataProcess_BZ21.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21;
this.lbl_alert_DataProcess_BZ39.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ39;
@@ -1530,11 +1532,11 @@
//鍫嗗灈鏈�2浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2, ckBSrm2Release);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2_Finish, ckBSrm2FinishedHandle);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2_Finish, ckBDataProcess_BZ12_FinishTask);
//鍫嗗灈鏈�3浠诲姟涓嬪彂
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3, ckBSrm3Release);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3_Finish, ckBSrm3FinishedHandle);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3, ckBDataProcess_BZ12);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3_Finish, ckBDataProcess_BZ21_FinishTask);
//鍫嗗灈鏈�4浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_4, ckBSrm4Release);
@@ -1571,7 +1573,7 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask, ck_DataProcess_RobotBuffer_IssueOutboundTask);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_OutTaskRetryToMes, checkBox_OutTaskRetryToMes);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_OutTaskRetryToMes, checkBox_DataProcess_BZ21);
}
private void DoCommonCheckedChanged(ref bool isAllowValue, CheckBox cb)
diff --git "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs" "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
index d98ea9e..ea01d62 100644
--- "a/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/00_269\345\267\245\344\275\215/DataProcess_269.cs"
@@ -42,6 +42,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_269 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_ReqParseData)
{
diff --git "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs" "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
index f818059..af1ebef 100644
--- "a/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/01_BZ01\345\267\245\344\275\215\357\274\210\346\270\205\347\201\260\357\274\214\346\264\227\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/DataProcess_BZ01.cs"
@@ -50,6 +50,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_ReqParseData)
{
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
index 8f9a8c2..f68f565 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/1\343\200\201DataProcess_BZ39.cs"
@@ -41,6 +41,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_ReqParseData)
{
diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/3\343\200\201DataProcess_RobotBuffer_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/3\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
index de3358c..c40c292 100644
--- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/3\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/3\343\200\201DataProcess_RobotBuffer_FinishTask.cs"
@@ -37,6 +37,11 @@
if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask &&
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_InboundFinish)
//if (true)//妯℃嫙
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
index ef00399..40d6bf9 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
@@ -33,6 +33,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_PalletizingAck)
{
@@ -42,7 +47,7 @@
var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
if (!res.result)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
continue;
}
else
@@ -192,7 +197,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_alert_DataProcess_BZ12 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
index a102bce..6954630 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/2\343\200\201DataProcess_BZ12_IssueTask.cs"
@@ -70,7 +70,7 @@
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.UPI).FirstOrDefault();
if (upiObj == null)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{task.UPI}娌℃湁鎵惧埌瀵硅薄 ";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask = $"{rgvLocation.ToString()},鏍规嵁UPI:{task.UPI}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
@@ -85,7 +85,7 @@
placeZ = (short)upiObj.MachineZCenter;
if (isrotate != 1 && isrotate != 2)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},鏍规嵁UPI:{task.UPI}鐨勬棆杞柟鍚戝�间笉鏄�1鎴�2 ";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask = $"{rgvLocation.ToString()},鏍规嵁UPI:{task.UPI}鐨勬棆杞柟鍚戝�间笉鏄�1鎴�2 ";
continue;
}
@@ -98,7 +98,7 @@
placeX, placeY, placeZ, (short)task.LastNum);
if (!res.result)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask = $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 澶辫触,WriteInStoreTaskInfoAsync 杩斿洖:{res.resMsg}";
continue;
}
else
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
index 62fe5b0..9869d9a 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
@@ -19,16 +19,21 @@
public static void Handler()
{
var alertMsg = "";
- LogType logType = LogType.DataProcess_BZ12;
+ LogType logType = LogType.DataProcess_BZ12_FinishTask;
while (true)
{
Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = string.Empty;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = string.Empty;
try
{
if (SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ12.ToString();
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_PalletizingFinish)
//if (true)//妯℃嫙
@@ -43,7 +48,7 @@
var result2 = obj.R_PalletizingTaskNo;
if (result2 == 0)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
continue;
}
@@ -54,7 +59,7 @@
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_PalletizingTaskNo.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.鐮佹澘浠诲姟
- ).OrderByDescending(x=>x.Id).FirstOrDefault();
+ ).OrderByDescending(x => x.Id).FirstOrDefault();
if (task == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
@@ -75,7 +80,7 @@
var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == task.UPI).FirstOrDefault();
if (upiobj != null)
{
- upiobj.UpiStatus = (int)UpiStatusEnum.宸茬爜鍨�;
+ upiobj.UpiStatus = (int)UpiStatusEnum.宸茬爜鍨�;
}
task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
task.TaskStatusName = TaskStatusEnum.宸插畬鎴�.ToString();
@@ -94,7 +99,7 @@
var res = client.SetPalletizingTaskFinishAck((int)EDevice.Station, true, rgvLocation);
if (!res.result)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
continue;
}
else
@@ -128,7 +133,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
index e82dbab..ca1fd9b 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/1\343\200\201DataProcess_BZ21.cs"
@@ -39,6 +39,11 @@
* 1銆佷粠鏁版嵁搴撲腑鍒ゆ柇鏄惁榻愬
* 2銆佹牴鎹綈濂楃粨鏋滐紝鎺ㄩ�佺粰PLC
*/
+ if (FormCC.stationView == null)
+ {
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull";
+ continue;
+ }
var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
if (obj.R_PalletizingAck)
{
@@ -48,7 +53,7 @@
var res = client.WriteStation_ACK((int)EDevice.Station, false, rgvLocation);
if (!res.result)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
continue;
}
else
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
index 28274f7..4b5c6c7 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/3\343\200\201DataProcess_BZ21_FinishTask.cs"
@@ -18,11 +18,11 @@
public static void Handler()
{
var alertMsg = "";
- LogType logType = LogType.DataProcess_BZ21;
+ LogType logType = LogType.DataProcess_BZ21_FinishTask;
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ21 = string.Empty;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = string.Empty;
try
{
if (SystemValue.isStartedModel)
@@ -42,7 +42,7 @@
var result2 = obj.R_SurrouondTaskNo;
if (result2 == 0)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = $"{rgvLocation.ToString()}- 鐮佹澘浠诲姟鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
continue;
}
@@ -123,7 +123,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ12 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index 85d008b..b93d831 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -41,7 +41,7 @@
/// <summary>
/// PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織
/// </summary>
- SdaService = 202,
+ DataProcess_BZ21_FinishTask = 202,
/// <summary>
/// 鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織
@@ -67,7 +67,7 @@
/// <summary>
/// MES鏈嶅姟
/// </summary>
- MesService = 301,
+ DataProcess_BZ12_FinishTask = 301,
/// <summary>
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index 8ae0e37..2d413bb 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/CC/iWareCommon/log4net_iWare.config
@@ -426,9 +426,9 @@
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
- <!-- SS7銆愪俊鎭�戞棩蹇�-->
- <appender name="SS7_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SS7_Info\\" />
+ <!-- DataProcess_BZ12_FinishTask銆愪俊鎭�戞棩蹇�-->
+ <appender name="DataProcess_BZ12_FinishTask_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ12_FinishTask_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -438,13 +438,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SS7_Info" />
+ <loggerToMatch value="DataProcess_BZ12_FinishTask_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
- <!--SS7銆愰敊璇�戞棩蹇�-->
- <appender name="SS7_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SS7_Error\\" />
+ <!--DataProcess_BZ12_FinishTask銆愰敊璇�戞棩蹇�-->
+ <appender name="DataProcess_BZ12_FinishTask_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ12_FinishTask_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -454,14 +454,14 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SS7_Error" />
+ <loggerToMatch value="DataProcess_BZ12_FinishTask_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!-- OPC-HslCommunication绾跨▼銆愪俊鎭�戞棩蹇�-->
- <appender name="HslCommunicationService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\HslCommunicationService_Info\\" />
+ <appender name="DataProcess_BZ21_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -471,13 +471,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="HslCommunicationService_Info" />
+ <loggerToMatch value="DataProcess_BZ21_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--OPC-HslCommunication銆愰敊璇�戞棩蹇�-->
- <appender name="HslCommunicationService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\HslCommunicationService_Error\\" />
+ <appender name="DataProcess_BZ21_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -487,14 +487,14 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="HslCommunicationService_Error" />
+ <loggerToMatch value="DataProcess_BZ21_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!-- PLC鏁版嵁璁块棶鏈嶅姟鐨勭嚎绋嬨�愪俊鎭�戞棩蹇�-->
- <appender name="SdaService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SdaService_Info\\" />
+ <appender name="DataProcess_BZ21_FinishTask_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_FinishTask_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -504,13 +504,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SdaService_Info" />
+ <loggerToMatch value="DataProcess_BZ21_FinishTask_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--PLC鏁版嵁璁块棶鏈嶅姟鐨勭嚎绋嬨�愰敊璇�戞棩蹇�-->
- <appender name="SdaService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\SdaService_Error\\" />
+ <appender name="DataProcess_BZ21_FinishTask_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWare_CC\\DataProcess_BZ21_FinishTask_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -520,7 +520,7 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="SdaService_Error" />
+ <loggerToMatch value="DataProcess_BZ21_FinishTask_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
@@ -654,15 +654,15 @@
<!--RGV浠诲姟绾跨▼-->
<appender-ref ref="StationThreadService_Info"/>
<appender-ref ref="StationThreadService_Error"/>
- <!--SS7绾跨▼鏃ュ織-->
- <appender-ref ref="SS7_Info"/>
- <appender-ref ref="SS7_Error"/>
- <!--HslCommunicationService鏃ュ織-->
- <appender-ref ref="HslCommunicationService_Info"/>
- <appender-ref ref="HslCommunicationService_Error"/>
+ <!--DataProcess_BZ12_FinishTask绾跨▼鏃ュ織-->
+ <appender-ref ref="DataProcess_BZ12_FinishTask_Info"/>
+ <appender-ref ref="DataProcess_BZ12_FinishTask_Error"/>
+ <!--DataProcess_BZ21鏃ュ織-->
+ <appender-ref ref="DataProcess_BZ21_Info"/>
+ <appender-ref ref="DataProcess_BZ21_Error"/>
<!--PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織-->
- <appender-ref ref="SdaService_Info"/>
- <appender-ref ref="SdaService_Error"/>
+ <appender-ref ref="DataProcess_BZ21_FinishTask_Info"/>
+ <appender-ref ref="DataProcess_BZ21_FinishTask_Error"/>
<!--鍫嗗灈鏈虹殑PLC鏁版嵁璁块棶鏈嶅姟鏃ュ織-->
<appender-ref ref="PushPaperCutToMes_Info"/>
<appender-ref ref="PushPaperCutToMes_Error"/>
diff --git a/CC/iWareSql/DataAccess/ClearDataHandler.cs b/CC/iWareSql/DataAccess/ClearDataHandler.cs
index 0de5dde..bfb5ff8 100644
--- a/CC/iWareSql/DataAccess/ClearDataHandler.cs
+++ b/CC/iWareSql/DataAccess/ClearDataHandler.cs
@@ -40,7 +40,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 寮傚父琛� 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 寮傚父琛� 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -66,7 +66,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -92,7 +92,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -118,7 +118,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -145,7 +145,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� MES_BTJReceiveReq 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� MES_BTJReceiveReq 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
/// <summary>
@@ -170,7 +170,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� MES_OnLineReq 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� MES_OnLineReq 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -202,7 +202,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璇锋眰鏃ュ織 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
@@ -229,7 +229,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.SdaService, "绉婚櫎XX澶╁墠鐨� 璁惧鎶ヨ 鏁版嵁 鍑虹幇寮傚父", ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ21_FinishTask, "绉婚櫎XX澶╁墠鐨� 璁惧鎶ヨ 鏁版嵁 鍑虹幇寮傚父", ex);
}
}
diff --git a/CC/iWareSql/DataAccess/MesService.cs b/CC/iWareSql/DataAccess/MesService.cs
index a28709b..4afd9d3 100644
--- a/CC/iWareSql/DataAccess/MesService.cs
+++ b/CC/iWareSql/DataAccess/MesService.cs
@@ -37,7 +37,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.MesService, "UpdateIsNeedOnLineForMainTask鍑虹幇寮傚父:" + ex.Message, ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ12_FinishTask, "UpdateIsNeedOnLineForMainTask鍑虹幇寮傚父:" + ex.Message, ex);
throw;
}
}
@@ -74,7 +74,7 @@
if (!string.IsNullOrEmpty(res))
{
- Log4NetHelper.WriteInfoLog(LogType.MesService, "MES涓婄嚎鎺ュ彛updateOnlineStatus锛屼紶閫掑弬鏁�:mainId=" + mainTask.Id + "锛屾帴鏀剁殑杩斿洖鍊紃es锛�" + res);
+ Log4NetHelper.WriteInfoLog(LogType.DataProcess_BZ12_FinishTask, "MES涓婄嚎鎺ュ彛updateOnlineStatus锛屼紶閫掑弬鏁�:mainId=" + mainTask.Id + "锛屾帴鏀剁殑杩斿洖鍊紃es锛�" + res);
retModel = JsonConvert.DeserializeObject<MesRetModel<string>>(res);
}
if (retModel != null)
@@ -101,7 +101,7 @@
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(LogType.MesService, "updateOnlineStatus鍑虹幇寮傚父:" + ex.Message, ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_BZ12_FinishTask, "updateOnlineStatus鍑虹幇寮傚父:" + ex.Message, ex);
retModel = new MesRetModel<string>()
{
code = 400,
--
Gitblit v1.9.3