From 197acf666976849d9d51f0c5f78c7672b2e63a07 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周日, 24 11月 2024 14:38:34 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/FormCC.cs | 124 ++++++++++++++++++----------------------
1 files changed, 56 insertions(+), 68 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 47d2b1a..7bfd72c 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -5,6 +5,7 @@
using iWareCC.SrmService;
using iWareCC.StationService;
using iWareCC.ThreadService;
+using iWareCC.ThreadService._03_BZ12_鏈哄櫒浜虹爜鍖呭伐浣峗;
using iWareCC.WCF;
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
@@ -31,6 +32,17 @@
{
public partial class FormCC : Form
{
+
+ /// <summary>
+ /// 鍏ㄥ眬鈥旀槸鍚﹀彲浠ヨ繍琛屾墽琛屽嚭搴撴ā寮�
+ /// </summary>
+ public static bool IsAllowRunOutMode = false;
+
+ /// <summary>
+ /// 褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�
+ /// </summary>
+ public static string currHandlerPackageCodeForIssueOutboundTask = "";
+
/// <summary>
/// 1鍙峰爢鍨涙満鍏ュ簱鍙ｆ壂鐮佸己鍒堕獙璇侀�氳繃
/// </summary>
@@ -207,32 +219,32 @@
// rgvService.StartService();
- //澶勭悊銆愪笅鍙戜腑銆戠殑鍑哄簱璁″垝浠诲姟
- // new Thread(OutPlanTaskDecompose.HandlerIssuingTask).Start();
- //浠诲姟鍒嗚В绾跨▼-鍑哄簱
- // new Thread(MainTaskDecompose.HandlerMainTaskDecompose).Start();
+ new Thread(DataProcess_RobotBuffer_ModeChange.Handler).Start();
- //浠诲姟鍒嗚В绾跨▼-缁勭洏鍏ュ簱
- // new Thread(MainTaskDecompose_ZPRK.HandlerMainTaskDecompose_ZPRK).Start();
+ new Thread(DataProcess_RobotBuffer_IssueOutboundTask.Handler).Start();
+
+
+ new Thread(DataProcess_RobotBuffer_AutoQiTaoOutbound.Handler).Start();
new Thread(DataProcess_RobotBuffer_FinishTaskForOutbound.Handler).Start();
- //鑷姩缁勭洏浠诲姟
+
new Thread(DataProcess_RobotBuffer_FinishTask.Handler).Start();
new Thread(DataProcess_BZ01.Handler).Start();
- //閲嶆柊鑾峰彇鍙戝姩鏈轰俊鎭�
+
new Thread(DataProcess_269.Handler).Start();
- //1014搴撲綅杞繍鍒�1020绾跨▼
- new Thread(DataProcess_BZ39.Handler).Start();
+ new Thread(DataProcess_BZ39.Handler).Start();
+ new Thread(DataProcess_BZ12.Hander).Start();
+ new Thread(DataProcess_BZ12_FinishTask.Handler).Start();
new Thread(DeleteData).Start();
- new Thread(LineInSacnResult.HandlerLineInSacnResult).Start();
+ //new Thread(LineInSacnResult.HandlerLineInSacnResult).Start();
@@ -301,7 +313,7 @@
}
else
{//姝ｅ紡妯″紡
- rgvServiceClient = new RgvServiceClient();
+ stationServiceClient = new StationServiceClient();
}
this.lbl_IsSimulationPLC.BackColor = IsSimulationPLC ? Color.Red : Color.Green;
@@ -338,7 +350,7 @@
this.lbl_Alert_Srm4ReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm4ReleaseFinish;
this.lbl_Alert_RgvRelease.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvRelease;
- this.lbl_Alert_RgvReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvReleaseFinish;
+ this.lbl_Alert_RgvReleaseFinish.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange;
this.lbl_Alert_RgvReleaseFinish_BuChang.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvReleaseFinish_BuChang;
this.lbl_Alert_HandlerIssuingTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_HandlerIssuingTask;
@@ -347,13 +359,13 @@
this.lbl_MainTaskDecompose.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose;
- this.lbl_MainTaskDecompose_ZPRK.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound;
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;
@@ -361,7 +373,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;
@@ -961,53 +973,6 @@
#endregion
- #region AGV
-
-
- /// <summary>
- /// 鑾峰彇AGV杞﹁締鍒楄〃
- /// </summary>
- public void GetAgvVehicles()
- {
- while (true)
- {
- try
- {
- if (SystemValue.isAllowRuning_Agv && SystemValue.isStartedModel)
- {
- AGVRetModel list = AgvRequestHelper.GetVehicles();
- AgvHandler.SaveAgvData(list);
-
- List<String> warningAddressList = new List<string>();
- if (list.alarms != null && list.alarms.errors != null && list.alarms.errors.Count > 0)
- {
- var waringList = list.alarms.errors;
- if (waringList != null && waringList.Count > 0)
- {
- for (int i = 0; i < waringList.Count; i++)
- {
- DeviceWarningHandler.SaveWarning(EDevice.AGV, iWareCommon.Utils.LogType.AGVTheadService,
- 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杞﹁締淇℃伅鎴愬姛";
- }
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.CCWCFService, "鑾峰彇AGV杞﹁締鍒楄〃 鍑虹幇寮傚父:" + ex.Message, ex);
- this.lbl_Alert_Agv.Text = "鑾峰彇AGV杞﹁締淇℃伅寮傚父锛�" + ex.Message;
- }
- finally
- {
- Thread.Sleep(5000);//5绉掍竴娆�
- }
- }
- }
- #endregion
#region 鍏朵粬绾跨▼
@@ -1579,16 +1544,14 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ckMainTaskDecompose);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose_ZPRK, ckMainTaskDecompose_ZPRK);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound, checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DeleteData, ckDeleteData);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_Agv, ckAgv);
-
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_EmptySalverTransfer, ckEmptySalverTransfer);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound, ckDataProcess_RobotBuffer_AutoQiTaoOutbound);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_BZ39, ck_DataProcess_BZ39);
@@ -1596,7 +1559,7 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_269, ck_DataProcess_269);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_Place1014To1020Task, ckPlace1014ClearStoreTask);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_IssueOutboundTask, ck_DataProcess_RobotBuffer_IssueOutboundTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_OutTaskRetryToMes, checkBox_OutTaskRetryToMes);
}
@@ -1873,6 +1836,9 @@
this.btn_Start.BackColor = default_btn_Start_Color;//杩樺師棰滆壊
}
}
+
+ this.lbl_RobotMode.Text = "缂撳瓨宀涙満鍣ㄤ汉妯″紡:" + (IsAllowRunOutMode ? "鍑哄簱妯″紡" : "鍏ュ簱妯″紡");
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�:" + currHandlerPackageCodeForIssueOutboundTask;
}
}
@@ -3572,5 +3538,27 @@
"杞崲鍚�:" + "\r\n" +
JsonConvert.SerializeObject(retModel);
}
+
+ private void lbl_Alert_Place1014ClearStoreTask_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void button24_Click(object sender, EventArgs e)
+ {
+ //寮哄埗璇ュ寘鍙峰嚭搴�
+ var packageCode = this.tb_PackageCode.Text.Trim();
+
+ var alertMsg = "";
+ DataProcess_RobotBuffer_ForceOutbound.Handler(packageCode, ref alertMsg);
+ if (!string.IsNullOrEmpty(alertMsg))
+ {
+ MessageBox.Show("閿欒:" + alertMsg);
+ }
+ else
+ {
+ MessageBox.Show("宸插鐞�");
+ }
+ }
}
}
--
Gitblit v1.9.3