From cc11ccdaea85f5ecaaa2317fc1ffd8943739dfff Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:40:49 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 2
CC/iWareCommon/log4net_iWare.config | 16 ++--
CC/iWareCC_ASRS/FormCC.Designer.cs | 51 ++++++++--------
CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs | 4
CC/iWareCommon/Utils/Log4Net/LogType.cs | 2
CC/iWareCC_ASRS/FormCC.cs | 11 ++-
CC/iWareCC_ASRS/Common/SystemValue.cs | 2
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs | 16 ++--
CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs | 20 +++---
9 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemValue.cs b/CC/iWareCC_ASRS/Common/SystemValue.cs
index 017e59f..43d7111 100644
--- a/CC/iWareCC_ASRS/Common/SystemValue.cs
+++ b/CC/iWareCC_ASRS/Common/SystemValue.cs
@@ -154,7 +154,7 @@
/// <summary>
/// 鏄惁鍏佽鎵ц 绌烘墭杞繍绾跨▼
/// </summary>
- public static bool isAllowRuning_EmptySalverTransfer = false;
+ public static bool isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask = false;
/// <summary>
/// 鏄惁鍏佽鎵ц 鑷姩缁勭洏浠诲姟
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index e212fcc..91d97bc 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -134,7 +134,7 @@
/// <summary>
/// 1014鍒�1020 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_Place1014To1020TaskTask = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
/// <summary>
/// 鍑哄簱浠诲姟閫氱煡MES 鐨勮鍛婃秷鎭�
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index fb79b9a..f85f44f 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -240,8 +240,8 @@
this.ckMainTaskDecompose_ZPRK = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = new System.Windows.Forms.Label();
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_Place1014ClearStoreTask = new System.Windows.Forms.Label();
- this.ckPlace1014ClearStoreTask = new System.Windows.Forms.CheckBox();
+ this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.Label();
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask = new System.Windows.Forms.CheckBox();
this.lbl_Alert_EmptySalverTransfer = new System.Windows.Forms.Label();
this.ckEmptySalverTransfer = new System.Windows.Forms.CheckBox();
this.lbl_MainTaskDecompose = new System.Windows.Forms.Label();
@@ -2987,8 +2987,8 @@
this.groupBox1.Controls.Add(this.ckMainTaskDecompose_ZPRK);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound);
this.groupBox1.Controls.Add(this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound);
- this.groupBox1.Controls.Add(this.lbl_Alert_Place1014ClearStoreTask);
- this.groupBox1.Controls.Add(this.ckPlace1014ClearStoreTask);
+ this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask);
+ this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_IssueOutboundTask);
this.groupBox1.Controls.Add(this.lbl_Alert_EmptySalverTransfer);
this.groupBox1.Controls.Add(this.ckEmptySalverTransfer);
this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose);
@@ -3235,28 +3235,29 @@
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.UseVisualStyleBackColor = true;
this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_Place1014ClearStoreTask
+ // lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask
//
- this.lbl_Alert_Place1014ClearStoreTask.AutoSize = true;
- this.lbl_Alert_Place1014ClearStoreTask.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_Place1014ClearStoreTask.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_Place1014ClearStoreTask.Location = new System.Drawing.Point(215, 528);
- this.lbl_Alert_Place1014ClearStoreTask.Name = "lbl_Alert_Place1014ClearStoreTask";
- this.lbl_Alert_Place1014ClearStoreTask.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_Place1014ClearStoreTask.TabIndex = 39;
- this.lbl_Alert_Place1014ClearStoreTask.Text = "label11";
+ 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.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;
+ this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Text = "label11";
+ this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Click += new System.EventHandler(this.lbl_Alert_Place1014ClearStoreTask_Click);
//
- // ckPlace1014ClearStoreTask
+ // ck_DataProcess_RobotBuffer_IssueOutboundTask
//
- this.ckPlace1014ClearStoreTask.AutoSize = true;
- this.ckPlace1014ClearStoreTask.Location = new System.Drawing.Point(4, 528);
- this.ckPlace1014ClearStoreTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckPlace1014ClearStoreTask.Name = "ckPlace1014ClearStoreTask";
- this.ckPlace1014ClearStoreTask.Size = new System.Drawing.Size(165, 19);
- this.ckPlace1014ClearStoreTask.TabIndex = 38;
- this.ckPlace1014ClearStoreTask.Text = "1014转运1020线程";
- this.ckPlace1014ClearStoreTask.UseVisualStyleBackColor = true;
- this.ckPlace1014ClearStoreTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.AutoSize = true;
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Location = new System.Drawing.Point(4, 528);
+ 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);
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.TabIndex = 38;
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.Text = "机器人缓存岛 自动下发出库任务 处理线程";
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.UseVisualStyleBackColor = true;
+ this.ck_DataProcess_RobotBuffer_IssueOutboundTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_EmptySalverTransfer
//
@@ -6095,8 +6096,8 @@
private System.Windows.Forms.CheckBox ckMainTaskDecompose;
private System.Windows.Forms.Label lbl_Alert_EmptySalverTransfer;
private System.Windows.Forms.CheckBox ckEmptySalverTransfer;
- private System.Windows.Forms.Label lbl_Alert_Place1014ClearStoreTask;
- private System.Windows.Forms.CheckBox ckPlace1014ClearStoreTask;
+ private System.Windows.Forms.Label lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
+ private System.Windows.Forms.CheckBox ck_DataProcess_RobotBuffer_IssueOutboundTask;
private System.Windows.Forms.Button btn_1007;
private System.Windows.Forms.Button btn_1006;
private System.Windows.Forms.Button btn_1005;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 798579d..72a02be 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -367,7 +367,7 @@
this.lbl_alert_DataProcess_269.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_269;
- this.lbl_Alert_Place1014ClearStoreTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask;
+ this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
this.lbl_Alter_OutTaskRetryToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_OutTaskRetryToMes;
@@ -1594,7 +1594,7 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound, ckDataProcess_RobotBuffer_AutoQiTaoOutbound);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_EmptySalverTransfer, ckEmptySalverTransfer);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask, ckEmptySalverTransfer);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_BZ39, ck_DataProcess_BZ39);
@@ -1602,7 +1602,7 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_269, ck_DataProcess_269);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_Place1014To1020Task, ckPlace1014ClearStoreTask);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_Place1014To1020Task, ck_DataProcess_RobotBuffer_IssueOutboundTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_OutTaskRetryToMes, checkBox_OutTaskRetryToMes);
}
@@ -3578,5 +3578,10 @@
"杞崲鍚�:" + "\r\n" +
JsonConvert.SerializeObject(retModel);
}
+
+ private void lbl_Alert_Place1014ClearStoreTask_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
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/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.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/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
index 2a87ab0..cfc9068 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/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.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/Outbound/2\343\200\201DataProcess_RobotBuffer_IssueOutboundTask.cs"
@@ -27,14 +27,14 @@
public static async void Handler()
{
var alertMsg = "";
- LogType logType = LogType.DataProcess_BZ39;
+ LogType logType = LogType.DataProcess_RobotBuffer_IssueOutboundTask;
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = string.Empty;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_BZ39 && SystemValue.isStartedModel)
+ if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask && SystemValue.isStartedModel)
{
var rgvLocation = StationLocationEnum.BZ39.ToString();
/*
@@ -47,7 +47,7 @@
var result = obj.R_ReadCodeResult;
if (string.IsNullOrEmpty(result))
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()}-璇锋眰浜嗚В鐮侊紝浣嗘槸缁撴灉鏄┖鐨�,姝ゆ寰幆缁撴潫";
continue;
}
var upiCode = result;
@@ -58,7 +58,7 @@
var isValidate = TaskHandler.ValidateIssueTaskForRobotBuffer(wmsDB);
if (!isValidate)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()}-鏈夆�樺凡涓嬪彂鈥欑殑浠诲姟锛屼笉鑳藉鐞�,姝ゆ寰幆缁撴潫";
continue;
}
@@ -69,7 +69,7 @@
&& x.TaskStatus == (int)TaskStatusEnum.鏂板缓).OrderBy(x => x.PackageCode).ToList();
if (taskList == null)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()},鏍规嵁 R_OutboundNumber:{obj.R_OutboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁 R_OutboundNumber:{obj.R_OutboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
continue;
}
@@ -78,7 +78,7 @@
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},鏍规嵁UPI:{upiCode}娌℃湁鎵惧埌瀵硅薄 ";
continue;
}
@@ -116,7 +116,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_alert_DataProcess_BZ39 += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(logType, " 鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git a/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs b/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs
index 58a2e2a..8ce36c5 100644
--- a/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs
+++ b/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs
@@ -33,7 +33,7 @@
bool isHasFinishedCurrentHanlder = false;//鏄惁宸茬粡澶勭悊瀹屼簡绌烘墭鐩樿浆杩愪换鍔�
try
{
- if (SystemValue.isAllowRuning_EmptySalverTransfer && SystemValue.isStartedModel)
+ if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask && SystemValue.isStartedModel)
{
//姝ゅ鍒ゆ柇 1009 1010 1011鐨勭姸鎬�
bool isEmptyPlace_1011 = false, isEmptyPlace_1010 = false, isEmptyPlace_1009 = false;
@@ -255,7 +255,7 @@
catch (Exception ex)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "鍒嗚В绾跨▼鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
- Log4NetHelper.WriteErrorLog(LogType.EmptySalverTransferTask, "HandlerIssuingTask鍑虹幇寮傚父锛�" + ex.Message, ex);
+ Log4NetHelper.WriteErrorLog(LogType.DataProcess_RobotBuffer_IssueOutboundTask, "HandlerIssuingTask鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git a/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs b/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs
index f113740..04f1bd3 100644
--- a/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs
+++ b/CC/iWareCC_ASRS/WmsTask/Place1014To1020Task.cs
@@ -32,7 +32,7 @@
{
if (FormCC.RGV_1020_NoHasCategory_COUNT <= 25)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1020绔欑偣锛�25绉掑唴鍏夌數鏄剧ず鏈夎揣锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1020绔欑偣锛�25绉掑唴鍏夌數鏄剧ず鏈夎揣锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
continue;
}
@@ -50,27 +50,27 @@
if (isGD_HasCatogryForRgvStattion == false)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014绔欑偣锛屽厜鐢垫樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛屽厜鐢垫樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
continue;
}
else if (isSys_HasCatogryForRgvStattion == false)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014绔欑偣锛岀郴缁熸樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘棤璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
continue;
}
else if (isExistOtherTaskDoing == true)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁鍏朵粬浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁鍏朵粬浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
continue;
}
else if (isExistOtherTaskDoingForDeviceTaskTypeEnum_绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛 == true)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绔嬪簱绌烘墭鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
continue;
}
else if (isExistOtherTaskDoingForDeviceTaskTypeEnum_绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛 == true)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014绔欑偣锛岀郴缁熸樉绀烘湁绌烘墭杞繍鍒版媶鐩樻満鍏ュ彛浠诲姟鍗犵敤锛屾棤椤诲鐞嗚浆杩愬埌1020浠诲姟";
continue;
}
@@ -79,7 +79,7 @@
isGD_HasCatogryForRgvStattion = MyExtendHelper.IsGD_HasCatogryForRgvStattion(((int)rgvLocation_1020).ToString());
if (isGD_HasCatogryForRgvStattion == true)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1020绔欑偣锛屽厜鐢垫樉绀烘湁璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1020绔欑偣锛屽厜鐢垫樉绀烘湁璐э紝鏃犻』澶勭悊杞繍鍒�1020浠诲姟";
continue;
}
@@ -98,11 +98,11 @@
var fr = MyExtendHelper.DoHandler(context, store, EDevice.鎷嗙洏鏈�1020);
if (fr.result == false)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "閿欒锛氭媶鐩樻満鍏ュ彛1014澶勬柊寤轰粠 1014搴撲綅杞繍鍒�1020绾跨▼ 浠诲姟澶辫触:" + fr.resMsg;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "閿欒锛氭媶鐩樻満鍏ュ彛1014澶勬柊寤轰粠 1014搴撲綅杞繍鍒�1020绾跨▼ 浠诲姟澶辫触:" + fr.resMsg;
}
else
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "鎴愬姛鍒涘缓鎷嗙洏鏈哄叆鍙�1014澶勬柊寤� 1014搴撲綅杞繍鍒�1020 浠诲姟";
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "鎴愬姛鍒涘缓鎷嗙洏鏈哄叆鍙�1014澶勬柊寤� 1014搴撲綅杞繍鍒�1020 浠诲姟";
}
#endregion
@@ -113,7 +113,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_Alert_Place1014To1020TaskTask = "1014搴撲綅杞繍鍒�1020绾跨▼鍑虹幇寮傚父:" + ex.Message;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = "1014搴撲綅杞繍鍒�1020绾跨▼鍑虹幇寮傚父:" + ex.Message;
Log4NetHelper.WriteErrorLog(LogType.CCWCFService, "Place1014To1020Task 鍑虹幇寮傚父锛�" + ex.Message, ex);
}
}
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index f4dcecf..6d5473e 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -93,7 +93,7 @@
/// <summary>
/// 绌烘墭鐩樿浆杩愪换鍔�
/// </summary>
- EmptySalverTransferTask = 306,
+ DataProcess_RobotBuffer_IssueOutboundTask = 306,
/// <summary>
/// 鑷姩缁勭洏浠诲姟涓嬪彂
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index 5f1156b..5282a49 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/CC/iWareCommon/log4net_iWare.config
@@ -70,8 +70,8 @@
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!-- 绌烘墭鐩樿浆杩愪换鍔°�愪俊鎭�戞棩蹇�-->
- <appender name="EmptySalverTransferTask_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\EmptySalverTransferTask_Info\\" />
+ <appender name="DataProcess_RobotBuffer_IssueOutboundTask_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_IssueOutboundTask_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -81,13 +81,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="EmptySalverTransferTask_Info" />
+ <loggerToMatch value="DataProcess_RobotBuffer_IssueOutboundTask_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--绌烘墭鐩樿浆杩愪换鍔°�愰敊璇�戞棩蹇�-->
- <appender name="EmptySalverTransferTask_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\EmptySalverTransferTask_Error\\" />
+ <appender name="DataProcess_RobotBuffer_IssueOutboundTask_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_IssueOutboundTask_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -97,7 +97,7 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="EmptySalverTransferTask_Error" />
+ <loggerToMatch value="DataProcess_RobotBuffer_IssueOutboundTask_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
@@ -628,8 +628,8 @@
<appender-ref ref="DataProcess_269_Error"/>
<appender-ref ref="DataProcess_BZ01_Info"/>
<appender-ref ref="DataProcess_BZ01_Error"/>
- <appender-ref ref="EmptySalverTransferTask_Info"/>
- <appender-ref ref="EmptySalverTransferTask_Error"/>
+ <appender-ref ref="DataProcess_RobotBuffer_IssueOutboundTask_Info"/>
+ <appender-ref ref="DataProcess_RobotBuffer_IssueOutboundTask_Error"/>
<appender-ref ref="DataProcess_BZ39_Info"/>
<appender-ref ref="DataProcess_BZ39_Error"/>
<appender-ref ref="DataProcess_RobotBuffer_FinishTask_Info"/>
--
Gitblit v1.9.3