From 7fb01e7407706d0362e2fd382d497fd52be0a176 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:35:34 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/Common/SystemWarningMsg.cs | 2
CC/iWareCommon/log4net_iWare.config | 16 ++--
CC/iWareCC_ASRS/FormCC.Designer.cs | 50 ++++++------
CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs | 30 +++---
CC/iWareCommon/Utils/Log4Net/LogType.cs | 2
CC/iWareCC_ASRS/FormCC.cs | 14 +-
CC/iWareCC_ASRS/Common/SystemValue.cs | 2
CC/iWareCC_ASRS/ThreadService/02_BZ39工位（补板后工位）/Outbound/1、DataProcess_RobotBuffer_AutoQiTaoOutbound.cs | 112 ++++++++++++---------------
8 files changed, 109 insertions(+), 119 deletions(-)
diff --git a/CC/iWareCC_ASRS/Common/SystemValue.cs b/CC/iWareCC_ASRS/Common/SystemValue.cs
index 1b495dd..017e59f 100644
--- a/CC/iWareCC_ASRS/Common/SystemValue.cs
+++ b/CC/iWareCC_ASRS/Common/SystemValue.cs
@@ -149,7 +149,7 @@
/// <summary>
/// 鏄惁鍏佽鎵ц AGV绾跨▼
/// </summary>
- public static bool isAllowRuning_Agv = false;
+ public static bool isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound = false;
/// <summary>
/// 鏄惁鍏佽鎵ц 绌烘墭杞繍绾跨▼
diff --git a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
index fa60209..e212fcc 100644
--- a/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
+++ b/CC/iWareCC_ASRS/Common/SystemWarningMsg.cs
@@ -111,7 +111,7 @@
/// <summary>
/// 绌烘墭鐩樿浆杩� 鐨勮鍛婃秷鎭�
/// </summary>
- public static string _lbl_Alert_EmptySalverTransfer = string.Empty;
+ public static string _lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
/// <summary>
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index b67fa92..fb79b9a 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -238,8 +238,8 @@
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.CheckBox();
this.lbl_MainTaskDecompose_ZPRK = new System.Windows.Forms.Label();
this.ckMainTaskDecompose_ZPRK = new System.Windows.Forms.CheckBox();
- this.lbl_Alert_Agv = new System.Windows.Forms.Label();
- this.ckAgv = 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_EmptySalverTransfer = new System.Windows.Forms.Label();
@@ -2985,8 +2985,8 @@
this.groupBox1.Controls.Add(this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose_ZPRK);
this.groupBox1.Controls.Add(this.ckMainTaskDecompose_ZPRK);
- this.groupBox1.Controls.Add(this.lbl_Alert_Agv);
- this.groupBox1.Controls.Add(this.ckAgv);
+ 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_EmptySalverTransfer);
@@ -3212,28 +3212,28 @@
this.ckMainTaskDecompose_ZPRK.UseVisualStyleBackColor = true;
this.ckMainTaskDecompose_ZPRK.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_Agv
+ // lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound
//
- this.lbl_Alert_Agv.AutoSize = true;
- this.lbl_Alert_Agv.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_Agv.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_Agv.Location = new System.Drawing.Point(216, 609);
- this.lbl_Alert_Agv.Name = "lbl_Alert_Agv";
- this.lbl_Alert_Agv.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_Agv.TabIndex = 41;
- this.lbl_Alert_Agv.Text = "label11";
+ 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.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;
+ this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "label11";
//
- // ckAgv
+ // ckDataProcess_RobotBuffer_AutoQiTaoOutbound
//
- this.ckAgv.AutoSize = true;
- this.ckAgv.Location = new System.Drawing.Point(3, 609);
- this.ckAgv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckAgv.Name = "ckAgv";
- this.ckAgv.Size = new System.Drawing.Size(88, 19);
- this.ckAgv.TabIndex = 40;
- this.ckAgv.Text = "AGV线程";
- this.ckAgv.UseVisualStyleBackColor = true;
- this.ckAgv.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.AutoSize = true;
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Location = new System.Drawing.Point(3, 609);
+ 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);
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.TabIndex = 40;
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "机器人缓存岛 自动齐套出库 线程";
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.UseVisualStyleBackColor = true;
+ this.ckDataProcess_RobotBuffer_AutoQiTaoOutbound.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_Place1014ClearStoreTask
//
@@ -6206,8 +6206,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
private System.Windows.Forms.DataGridViewTextBoxColumn Qty;
private System.Windows.Forms.DataGridViewTextBoxColumn InStoreTime;
- private System.Windows.Forms.Label lbl_Alert_Agv;
- private System.Windows.Forms.CheckBox ckAgv;
+ private System.Windows.Forms.Label lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound;
+ private System.Windows.Forms.CheckBox ckDataProcess_RobotBuffer_AutoQiTaoOutbound;
private System.Windows.Forms.Label lbl_MainTaskDecompose_ZPRK;
private System.Windows.Forms.CheckBox ckMainTaskDecompose_ZPRK;
private System.Windows.Forms.TabPage tabPage4;
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index dae98d6..798579d 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -359,7 +359,7 @@
this.lbl_Alert_DeleteData.Text = showNowTime + SystemWarningMsg._lbl_Alert_DeleteData;
- this.lbl_Alert_EmptySalverTransfer.Text = showNowTime + SystemWarningMsg._lbl_Alert_EmptySalverTransfer;
+ this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound;
this.lbl_alert_DataProcess_BZ39.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ39;
@@ -979,7 +979,7 @@
{
try
{
- if (SystemValue.isAllowRuning_Agv && SystemValue.isStartedModel)
+ if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && SystemValue.isStartedModel)
{
AGVRetModel list = AgvRequestHelper.GetVehicles();
AgvHandler.SaveAgvData(list);
@@ -992,20 +992,20 @@
{
for (int i = 0; i < waringList.Count; i++)
{
- DeviceWarningHandler.SaveWarning(EDevice.AGV, iWareCommon.Utils.LogType.AGVTheadService,
+ DeviceWarningHandler.SaveWarning(EDevice.AGV, iWareCommon.Utils.LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound,
waringList[i].code, waringList[i].code, waringList[i].desc);//鏂板鎶ヨ
warningAddressList.Add(waringList[i].code);
}
}
}
- DeviceWarningHandler.AutoCloseWarning(EDevice.AGV, iWareCommon.Utils.LogType.AGVTheadService, warningAddressList);//鑷姩鍏抽棴鎶ヨ
- this.lbl_Alert_Agv.Text = "鑾峰彇AGV杞﹁締淇℃伅鎴愬姛";
+ DeviceWarningHandler.AutoCloseWarning(EDevice.AGV, iWareCommon.Utils.LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound, warningAddressList);//鑷姩鍏抽棴鎶ヨ
+ this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "鑾峰彇AGV杞﹁締淇℃伅鎴愬姛";
}
}
catch (Exception ex)
{
Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.CCWCFService, "鑾峰彇AGV杞﹁締鍒楄〃 鍑虹幇寮傚父:" + ex.Message, ex);
- this.lbl_Alert_Agv.Text = "鑾峰彇AGV杞﹁締淇℃伅寮傚父锛�" + ex.Message;
+ this.lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "鑾峰彇AGV杞﹁締淇℃伅寮傚父锛�" + ex.Message;
}
finally
{
@@ -1592,7 +1592,7 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DeleteData, ckDeleteData);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_Agv, ckAgv);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound, ckDataProcess_RobotBuffer_AutoQiTaoOutbound);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_EmptySalverTransfer, ckEmptySalverTransfer);
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/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.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/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs"
index a63b897..da14603 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/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.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/1\343\200\201DataProcess_RobotBuffer_AutoQiTaoOutbound.cs"
@@ -20,90 +20,80 @@
public static async void Handler()
{
var alertMsg = "";
- LogType logType = LogType.DataProcess_RobotBuffer_FinishTaskForOutbound;
+ LogType logType = LogType.DataProcess_RobotBuffer_AutoQiTaoOutbound;
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = string.Empty;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
try
{
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound && SystemValue.isStartedModel)
+ if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && SystemValue.isStartedModel)
{
- var rgvLocation = StationLocationEnum.BZ39.ToString();
- var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault();
- if (obj.R_OutboundFinish)
+
+ using (WmsDBModel wmsDB = new WmsDBModel())
{
- var result = obj.R_OutboundNumber;
- if (string.IsNullOrEmpty(result))
+ List<wms_stock_quan> qunList = wmsDB.wms_stock_quan.Where(x => x.StockStatus == (int)StockStatusEnum.鍦ㄥ簱).ToList();
+ var queryPageckCodeList = qunList.Select(x => x.PackageCode).Distinct().ToList();
+ List<mes_batchOrderUPI_new> upiList = wmsDB.mes_batchOrderUPI_new.Where(x => queryPageckCodeList.Contains(x.PackageCode)).ToList();
+ var groups = qunList.GroupBy(x => x.PackageCode);
+ foreach (var group in groups)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}- 鍑哄簱搴撲綅鍙锋槸绌虹殑,姝ゆ寰幆缁撴潫";
- continue;
- }
-
- using (WmsDBModel wmsDB = new WmsDBModel())
- {
- List<wms_stock_quan> qunList = wmsDB.wms_stock_quan.Where(x => x.StockStatus == (int)StockStatusEnum.鍦ㄥ簱).ToList();
- var queryPageckCodeList = qunList.Select(x => x.PackageCode).Distinct().ToList();
- List<mes_batchOrderUPI_new> upiList = wmsDB.mes_batchOrderUPI_new.Where(x => queryPageckCodeList.Contains(x.PackageCode)).ToList();
- var groups = qunList.GroupBy(x => x.PackageCode);
- foreach (var group in groups)
+ var packageCode = group.Key;
+ var allCount = upiList.Where(x => x.PackageCode == packageCode).Count();
+ if (allCount == group.ToList().Count())
{
- var packageCode = group.Key;
- var allCount = upiList.Where(x => x.PackageCode == packageCode).Count();
- if (allCount == group.ToList().Count())
+ //婊¤冻榻愬锛屽嚭搴�
+ group.ToList().ForEach(x =>
{
- //婊¤冻榻愬锛屽嚭搴�
- group.ToList().ForEach(x =>
+ x.StockStatus = (int)StockStatusEnum.榻愬寘寰呭嚭搴�;
+
+ //鐢熸垚鍑哄簱浠诲姟
+ //璁板綍浠诲姟
+ var _id = Yitter.IdGenerator.YitIdHelper.NextId();
+ var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
+ var new_task = new wms_rbline_task()
{
- x.StockStatus = (int)StockStatusEnum.榻愬寘寰呭嚭搴�;
+ Id = _id,
+ TaskNo = plcTaskNo,
- //鐢熸垚鍑哄簱浠诲姟
- //璁板綍浠诲姟
- var _id = Yitter.IdGenerator.YitIdHelper.NextId();
- var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
- var new_task = new wms_rbline_task()
- {
- Id = _id,
- TaskNo = plcTaskNo,
-
- UPI = x.Upi,
- Length = x.Length,
- Width = x.Width,
- Thk = x.Thk,
- IssueTime = DateTime.Now,
- PlanNo = x.PlanNo,
- OrderId = x.OrderId,
- PackageCode = x.PackageCode,
- PlaceCode = x.PlaceCode,
- RbTaskType = (int)RbTaskTypeEnum.鍑哄簱浠诲姟,
- RbTaskTypeEnumName = RbTaskTypeEnum.鍑哄簱浠诲姟.ToString(),
- TaskStatus = (int)TaskStatusEnum.鏂板缓,
- TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
- TaskMsg = "鍏ュ簱",
+ UPI = x.Upi,
+ Length = x.Length,
+ Width = x.Width,
+ Thk = x.Thk,
+ IssueTime = DateTime.Now,
+ PlanNo = x.PlanNo,
+ OrderId = x.OrderId,
+ PackageCode = x.PackageCode,
+ PlaceCode = x.PlaceCode,
+ RbTaskType = (int)RbTaskTypeEnum.鍑哄簱浠诲姟,
+ RbTaskTypeEnumName = RbTaskTypeEnum.鍑哄簱浠诲姟.ToString(),
+ TaskStatus = (int)TaskStatusEnum.鏂板缓,
+ TaskStatusName = TaskStatusEnum.鏂板缓.ToString(),
+ TaskMsg = "鍏ュ簱",
- CreateTime = DateTime.Now,
- CreateUserName = "CC",
- UpdateTime = DateTime.Now,
- UpdateUserName = "CC",
- };
+ CreateTime = DateTime.Now,
+ CreateUserName = "CC",
+ UpdateTime = DateTime.Now,
+ UpdateUserName = "CC",
+ };
- wmsDB.wms_rbline_task.Add(new_task);
+ wmsDB.wms_rbline_task.Add(new_task);
- var place = StationHandler.GetPlaceByPlaceCode(x.PlaceCode, wmsDB);
- place.PlaceStatus = (int)PlaceStatusEnum.閿佸畾;
- });
- }
+ var place = StationHandler.GetPlaceByPlaceCode(x.PlaceCode, wmsDB);
+ place.PlaceStatus = (int)PlaceStatusEnum.閿佸畾;
+ });
}
-
- wmsDB.SaveChanges();
}
+
+ wmsDB.SaveChanges();
}
+
}
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound += " 鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += " 鍑虹幇寮傚父:" + 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 70020fe..58a2e2a 100644
--- a/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs
+++ b/CC/iWareCC_ASRS/WmsTask/EmptySalverTransferTask.cs
@@ -29,7 +29,7 @@
while (true)
{
Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer = string.Empty;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound = string.Empty;
bool isHasFinishedCurrentHanlder = false;//鏄惁宸茬粡澶勭悊瀹屼簡绌烘墭鐩樿浆杩愪换鍔�
try
{
@@ -77,7 +77,7 @@
{
if (FormCC.RGV_1011_HasCategory_COUNT < SysGloble.MAX_RGV_1011_HasCategory_COUNT)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "閿欒锛�1011澶勪笉鍏佽鍒涘缓浠诲姟锛�1011鏈夎揣鏃堕棿:" + FormCC.RGV_1011_HasCategory_COUNT
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "閿欒锛�1011澶勪笉鍏佽鍒涘缓浠诲姟锛�1011鏈夎揣鏃堕棿:" + FormCC.RGV_1011_HasCategory_COUNT
+ ",杩樻湭澶т簬璁惧畾鐨勬渶澶ц秴鏃舵椂闂�:" + SysGloble.MAX_RGV_1011_HasCategory_COUNT + SysGloble.SPLIT_STR;
}
else
@@ -93,11 +93,11 @@
var fr = MyExtendHelper.DoHandler(context, store, rgvLocation);
if (fr.result == false)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "閿欒锛�1011澶勬柊寤轰换鍔″け璐�:" + fr.resMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "閿欒锛�1011澶勬柊寤轰换鍔″け璐�:" + fr.resMsg + SysGloble.SPLIT_STR;
}
else
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "鎴愬姛鍒涘缓1011浠诲姟" + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "鎴愬姛鍒涘缓1011浠诲姟" + SysGloble.SPLIT_STR;
continue;
}
isHasFinishedCurrentHanlder = true;
@@ -165,7 +165,7 @@
if (salverStackCount == 0)
{
//鎶ラ敊
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += ("[妫�娴媇鏍规嵁1009绔欑偣鐨勫厜鐢佃幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓�0") + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += ("[妫�娴媇鏍规嵁1009绔欑偣鐨勫厜鐢佃幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓�0") + SysGloble.SPLIT_STR;
continue;
}
//浼戠湢5绉�
@@ -174,13 +174,13 @@
if (salverStackCount2 == 0)
{
//鎶ラ敊
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += ("[妫�娴媇鏍规嵁1009绔欑偣鐨勫厜鐢佃幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓�0") + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += ("[妫�娴媇鏍规嵁1009绔欑偣鐨勫厜鐢佃幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓�0") + SysGloble.SPLIT_STR;
continue;
}
if (salverStackCount != salverStackCount2)
{
//鎶ラ敊
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += ("鏍规嵁1009绔欑偣鐨勫厜鐢碉紝鐩稿樊5绉掕幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓嶄竴鑷达紝绗竴娆℃槸" + salverStackCount + "锛岀浜屾鏄�" + salverStackCount2) + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += ("鏍规嵁1009绔欑偣鐨勫厜鐢碉紝鐩稿樊5绉掕幏鍙栬繑鍥炵珛浣撳簱鐨勬墭鐩樻暟涓嶄竴鑷达紝绗竴娆℃槸" + salverStackCount + "锛岀浜屾鏄�" + salverStackCount2) + SysGloble.SPLIT_STR;
continue;
}
@@ -190,11 +190,11 @@
var fr = MyExtendHelper.DoHandler(context, null, rgvLocation);
if (fr.result == false)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "閿欒锛�1009澶勬柊寤轰换鍔″け璐�:" + fr.resMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "閿欒锛�1009澶勬柊寤轰换鍔″け璐�:" + fr.resMsg + SysGloble.SPLIT_STR;
}
else
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "鎴愬姛鍒涘缓1009浠诲姟" + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "鎴愬姛鍒涘缓1009浠诲姟" + SysGloble.SPLIT_STR;
continue;
}
isHasFinishedCurrentHanlder = true;
@@ -209,7 +209,7 @@
var errMsg = "";
if (!MyExtendHelper.IsAllowSendTaskTo1014ByTPHS(ref errMsg))
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += errMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += errMsg + SysGloble.SPLIT_STR;
continue;
}
@@ -223,7 +223,7 @@
{
if (!MyExtendHelper.IsAllowSendTaskTo1014ByTPHS(ref errMsg))
{//鍐嶆鏍￠獙 銆怑ditBy shaocx,2022-05-18銆�
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += errMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += errMsg + SysGloble.SPLIT_STR;
continue;
}
//鍒ゆ柇1011浣嶇疆鏄惁鏈夊簱瀛橈紝骞朵笖鏄湭閿佸畾鐘舵�侊紝濡傛灉鏄紝灏变笉瑕佸垱寤轰粠绔嬩綋搴撳埌1014鐨勪换鍔′簡銆怑ditBy shaocx,2022-05-18銆�
@@ -232,18 +232,18 @@
if (store1011 != null && store1011.StationId > 0)
//if (store1011 != null && store1011.StationIsLock == false && store1011.StationIsHasTaskDoing == false)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "1011浣嶇疆鏈夌郴缁熷簱瀛樺瓨鍦紝鍥犳涓嶉渶瑕佸垱寤轰粠绔嬩綋搴撳埌1014鐨勪换鍔°�傘��" + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "1011浣嶇疆鏈夌郴缁熷簱瀛樺瓨鍦紝鍥犳涓嶉渶瑕佸垱寤轰粠绔嬩綋搴撳埌1014鐨勪换鍔°�傘��" + SysGloble.SPLIT_STR;
continue;
}
var fr = MyExtendHelper.DoHandler(context, null, rgvLocation);
if (fr.result == false)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "閿欒锛氭媶鐩樻満鍏ュ彛1014澶勬柊寤轰粠绔嬩綋搴撳彨鎵樼洏浠诲姟澶辫触:" + fr.resMsg + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "閿欒锛氭媶鐩樻満鍏ュ彛1014澶勬柊寤轰粠绔嬩綋搴撳彨鎵樼洏浠诲姟澶辫触:" + fr.resMsg + SysGloble.SPLIT_STR;
}
else
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "鎴愬姛鍒涘缓鎷嗙洏鏈哄叆鍙�1014澶勬柊寤轰粠绔嬩綋搴撳彨鎵樼洏浠诲姟" + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "鎴愬姛鍒涘缓鎷嗙洏鏈哄叆鍙�1014澶勬柊寤轰粠绔嬩綋搴撳彨鎵樼洏浠诲姟" + SysGloble.SPLIT_STR;
continue;
}
}
@@ -254,7 +254,7 @@
}
catch (Exception ex)
{
- SystemWarningMsg._lbl_Alert_EmptySalverTransfer += "鍒嗚В绾跨▼鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
+ SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound += "鍒嗚В绾跨▼鍑虹幇寮傚父:" + ex.Message + SysGloble.SPLIT_STR;
Log4NetHelper.WriteErrorLog(LogType.EmptySalverTransferTask, "HandlerIssuingTask鍑虹幇寮傚父锛�" + ex.Message, ex);
}
diff --git a/CC/iWareCommon/Utils/Log4Net/LogType.cs b/CC/iWareCommon/Utils/Log4Net/LogType.cs
index 85eaa52..f4dcecf 100644
--- a/CC/iWareCommon/Utils/Log4Net/LogType.cs
+++ b/CC/iWareCommon/Utils/Log4Net/LogType.cs
@@ -73,7 +73,7 @@
/// <summary>
/// AGV绾跨▼鏃ュ織
/// </summary>
- AGVTheadService = 302,
+ DataProcess_RobotBuffer_AutoQiTaoOutbound = 302,
/// <summary>
/// 鍥涗釜鍏ュ簱鍙ｆ壂鎻忔娴嬬嚎绋�
diff --git a/CC/iWareCommon/log4net_iWare.config b/CC/iWareCommon/log4net_iWare.config
index 4ddf3d7..5f1156b 100644
--- a/CC/iWareCommon/log4net_iWare.config
+++ b/CC/iWareCommon/log4net_iWare.config
@@ -198,8 +198,8 @@
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--AGV銆愪俊鎭�戞棩蹇�-->
- <appender name="AGVTheadService_Info" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\AGVTheadService_Info\\" />
+ <appender name="DataProcess_RobotBuffer_AutoQiTaoOutbound_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_AutoQiTaoOutbound_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -209,13 +209,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="AGVTheadService_Info" />
+ <loggerToMatch value="DataProcess_RobotBuffer_AutoQiTaoOutbound_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--AGV銆愰敊璇�戞棩蹇�-->
- <appender name="AGVTheadService_Error" type="log4net.Appender.RollingFileAppender">
- <file value="d:\\Log\\LuLiMuYe\\iWareCC\\AGVTheadService_Error\\" />
+ <appender name="DataProcess_RobotBuffer_AutoQiTaoOutbound_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="d:\\Log\\LuLiMuYe\\iWareCC\\DataProcess_RobotBuffer_AutoQiTaoOutbound_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -225,7 +225,7 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="AGVTheadService_Error" />
+ <loggerToMatch value="DataProcess_RobotBuffer_AutoQiTaoOutbound_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
@@ -636,8 +636,8 @@
<appender-ref ref="DataProcess_RobotBuffer_FinishTask_Error"/>
<appender-ref ref="DataProcess_RobotBuffer_FinishTaskForOutbound_Info"/>
<appender-ref ref="DataProcess_RobotBuffer_FinishTaskForOutbound_Error"/>
- <appender-ref ref="AGVTheadService_Info"/>
- <appender-ref ref="AGVTheadService_Error"/>
+ <appender-ref ref="DataProcess_RobotBuffer_AutoQiTaoOutbound_Info"/>
+ <appender-ref ref="DataProcess_RobotBuffer_AutoQiTaoOutbound_Error"/>
<appender-ref ref="MesService_Info"/>
<appender-ref ref="MesService_Error"/>
<appender-ref ref="OutPlanTask_Info"/>
--
Gitblit v1.9.3