From d333a3cfd7882071fc3b9e357a8882e1e3f325d5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 12月 2024 13:20:24 +0800
Subject: [PATCH] 增补
---
CC/iWareCC_ASRS/FormCC.cs | 210 +++++++++++++++++++++++++++++-----------------------
1 files changed, 118 insertions(+), 92 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 5f5600d..0a283eb 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -1,10 +1,13 @@
-锘縰sing iWareCC.Common.Helper;
+锘縰sing Admin.NET.Application;
+using iWareCC.Common.Helper;
using iWareCC.DeviceThreadFactory;
using iWareCC.Forms;
using iWareCC.RgvService;
using iWareCC.SrmService;
using iWareCC.StationService;
using iWareCC.ThreadService;
+using iWareCC.ThreadService._03_BZ12_鏈哄櫒浜虹爜鍖呭伐浣峗;
+using iWareCC.ThreadService._04_BZ21_鎼繍鏁村灈鏈哄櫒浜篲;
using iWareCC.WCF;
using iWareCommon.Common.Globle;
using iWareCommon.Utils;
@@ -27,6 +30,7 @@
using XiGang.Core.Model;
using XiGang.Core.Model.ViewModels;
+
namespace iWareCC
{
public partial class FormCC : Form
@@ -36,6 +40,11 @@
/// 鍏ㄥ眬鈥旀槸鍚﹀彲浠ヨ繍琛屾墽琛屽嚭搴撴ā寮�
/// </summary>
public static bool IsAllowRunOutMode = false;
+
+ /// <summary>
+ /// 褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�
+ /// </summary>
+ public static string currHandlerPackageCodeForIssueOutboundTask = "";
/// <summary>
/// 1鍙峰爢鍨涙満鍏ュ簱鍙ｆ壂鐮佸己鍒堕獙璇侀�氳繃
@@ -194,13 +203,14 @@
//鍫嗗灈鏈篣I璧嬪��
SetSrmUI();
+ tskSetSrmLable = new Thread(SrmRead_Label);
+ tskSetSrmLable.Start();
+
#endregion
#region 璁剧疆鏄剧ずUI
- tskSetSrmLable = new Thread(SrmRead_Label);
- tskSetSrmLable.Start();
- tskSetRgvLable = new Thread(SetRgvLable);
- tskSetRgvLable.Start();
+
+
#endregion
#region 鏈嶅姟绾跨▼鍚姩
@@ -223,23 +233,33 @@
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();
-
+
new Thread(DataProcess_BZ39.Handler).Start();
+ new Thread(DataProcess_BZ39_IssueInboundTask.Handler).Start();
+ new Thread(DataProcess_BZ12.Hander).Start();
+ new Thread(DataProcess_BZ12_IssueTask.Handler).Start();
+ new Thread(DataProcess_BZ12_FinishTask.Handler).Start();
+
+ new Thread(DataProcess_BZ21.Hander).Start();
+ new Thread(DataProcess_BZ21_IssueTask.Handler).Start();
+
+ new Thread(DataProcess_BZ21_FinishTask.Handler).Start();
new Thread(DeleteData).Start();
- new Thread(LineInSacnResult.HandlerLineInSacnResult).Start();
+ new Thread(PushPackageCodeToMes.Handler).Start();
+ new Thread(PushPaperCutToMes.Handler).Start();
-
+ new Thread(DataProcess_ValidateQiTao.Handler).Start();
//*/
#endregion
@@ -315,10 +335,6 @@
//btn_Start_Click(null, null);
}
-
-
- #region 鍫嗗灈鏈虹嚎绋嬪拰UI澶勭悊
-
/// <summary>
/// 璁剧疆1/2鍙峰爢鍨涙満鐨勫墠绔樉绀�
/// </summary>
@@ -332,33 +348,35 @@
var showNowTime = "(" + DateTimeHelper.ConvertToStringForOnlyShowTime(DateTime.Now) + ")";
//璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟纭绾跨▼娑堟伅
- this.lbl_Alter_Srm1Release.Text = showNowTime + SystemWarningMsg._lbl_Alert_Srm1Release;
+ 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_RgvRelease.Text = showNowTime + SystemWarningMsg._lbl_Alert_RgvRelease;
- 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;
+
+ this.lbl_Alert_PushPaperCutToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPaperCutToMes;
+ this.lbl_Alert_PushPackageCodeToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_PushPackageCodeToMes;
+
+ this.lbl_Alert_DataProcess_BZ12_IssueTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask;
- this.lbl_MainTaskDecompose.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose;
+ this.lbl_DataProcess_BZ21_IssueTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_IssueTask;
- this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_MainTaskDecompose_ZPRK;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ModeChange;
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_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;
@@ -369,19 +387,19 @@
this.lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask;
- this.lbl_Alter_OutTaskRetryToMes.Text = showNowTime + SystemWarningMsg._lbl_Alert_OutTaskRetryToMes;
-
-
//this.lblSrmPosX1.Text="111";
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.SrmTheadService, "鏂规硶SrmRead_Label鍑虹幇寮傚父锛�" + ex.Message, ex);
continue;
}
}
}
+
+ #region 鍫嗗灈鏈虹嚎绋嬪拰UI澶勭悊
+
+
/// <summary>
/// 鑾峰彇鍫嗗灈鏈虹殑瀹炴椂淇℃伅
@@ -406,18 +424,18 @@
{
for (int i = 0; i < waringList.Count; i++)
{
- DeviceWarningHandler.SaveWarning(device, iWareCommon.Utils.LogType.SrmTheadService,
+ DeviceWarningHandler.SaveWarning(device, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask,
waringList[i].Code, waringList[i].Address, waringList[i].Context);//鏂板鎶ヨ
warningAddressList.Add(waringList[i].Address);
}
}
}
- DeviceWarningHandler.AutoCloseWarning(device, iWareCommon.Utils.LogType.SrmTheadService, warningAddressList);//鑷姩鍏抽棴鎶ヨ
+ DeviceWarningHandler.AutoCloseWarning(device, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, warningAddressList);//鑷姩鍏抽棴鎶ヨ
}
}
catch (Exception ex)
{
- Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.SrmTheadService, "鑾峰彇" + device.ToString() + "鐨勫疄鏃朵俊鎭紓甯�:" + ex.Message, ex);
+ Log4NetHelper.WriteErrorLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "鑾峰彇" + device.ToString() + "鐨勫疄鏃朵俊鎭紓甯�:" + ex.Message, ex);
continue;
}
};
@@ -458,7 +476,7 @@
};
realTimeList.Add(obj);
- DeviceSrmRealTimeHandler.Update(realTimeList, iWareCommon.Utils.LogType.SrmTheadService);
+ DeviceSrmRealTimeHandler.Update(realTimeList, iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask);
}
@@ -966,53 +984,6 @@
#endregion
- #region AGV
-
-
- /// <summary>
- /// 鑾峰彇AGV杞﹁締鍒楄〃
- /// </summary>
- public void GetAgvVehicles()
- {
- while (true)
- {
- try
- {
- if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_AutoQiTaoOutbound && 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.DataProcess_RobotBuffer_AutoQiTaoOutbound,
- waringList[i].code, waringList[i].code, waringList[i].desc);//鏂板鎶ヨ
- warningAddressList.Add(waringList[i].code);
- }
- }
- }
- 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_DataProcess_RobotBuffer_AutoQiTaoOutbound.Text = "鑾峰彇AGV杞﹁締淇℃伅寮傚父锛�" + ex.Message;
- }
- finally
- {
- Thread.Sleep(5000);//5绉掍竴娆�
- }
- }
- }
- #endregion
#region 鍏朵粬绾跨▼
@@ -1217,7 +1188,7 @@
using (var opcClinet = new SrmService.SrmServiceClient())
{
var result = opcClinet.SendEStop((int)_EDevice);
- Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.SrmTheadService, "瀛楃涓诧細" + JsonConvert.SerializeObject(result));
+ Log4NetHelper.WriteInfoLog(iWareCommon.Utils.LogType.DataProcess_BZ39_IssueInboundTask, "瀛楃涓诧細" + JsonConvert.SerializeObject(result));
if (result.result)
{
WZ.Useful.Commons.MessageUtil.ShowTips("鍙戦��" + _EDevice.ToString() + "鎬ュ仠鎸囦护鎴愬姛");
@@ -1520,8 +1491,8 @@
this.lbl_ModelText.Text = title + currentCheckModelText;
SetAllCheckBoxChecked(true);
//灏嗙壒娈婄殑鍙栨秷
- this.ckHandlerIssuingTask.Checked = false;
- this.ckMainTaskDecompose.Checked = false;
+ this.ck_DataProcess_BZ12_IssueTask.Checked = false;
+ this.ck_DataProcess_BZ21_IssueTask.Checked = false;
this.gBoxThread.Enabled = true;
}
@@ -1557,16 +1528,16 @@
private void CommonCheckedChanged(object sender, EventArgs e)
{
//鍫嗗灈鏈�1浠诲姟涓嬪彂
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1, ckBSrm1Release);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1, ckB_DataProcess_BZ39_IssueInboundTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1_Finish, ckBSrm1FinishedHandle);
//鍫嗗灈鏈�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);
@@ -1575,16 +1546,18 @@
//RGV浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService, ckBRgvRelease);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckBRgvFinishedHandle);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ckBRgvFinishedHandle_BuChang);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckB_PushPaperCutToMes);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ck_PushPackageCodeToMes);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_HandlerIssuingTask, ckHandlerIssuingTask);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_HandlerIssuingTask, ck_DataProcess_BZ12_IssueTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask, ck_DataProcess_RobotBuffer_FinishTask);
- DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ckMainTaskDecompose);
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_MainTaskDecompose, ck_DataProcess_BZ21_IssueTask);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_ModeChange, ck_DataProcess_RobotBuffer_ModeChange);
+
+ DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_ValidateQiTao, ck_DataProcess_ValidateQiTao);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTaskForOutbound, checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound);
@@ -1601,7 +1574,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)
@@ -1876,6 +1849,9 @@
this.btn_Start.BackColor = default_btn_Start_Color;//杩樺師棰滆壊
}
}
+
+ this.lbl_RobotMode.Text = "缂撳瓨宀涙満鍣ㄤ汉妯″紡:" + (IsAllowRunOutMode ? "鍑哄簱妯″紡" : "鍏ュ簱妯″紡");
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "褰撳墠涓嬪彂鍑哄簱浠诲姟鐨勫寘鍙�:" + currHandlerPackageCodeForIssueOutboundTask;
}
}
@@ -3580,5 +3556,55 @@
{
}
+
+ 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("宸插鐞�");
+ }
+ }
+
+ private void button25_Click(object sender, EventArgs e)
+ {
+ var packageCode = this.tb_PackageCode.Text.Trim();
+
+ var alertMsg = "";
+ using (WmsDBModel db = new WmsDBModel())
+ {
+ var upiList = db.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
+ foreach (var item in upiList)
+ {
+ item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�;
+ item.UpiStatus = (int)UpiStatusEnum.鍒濆;
+ }
+
+ var pList = db.mes_package_gather.Where(x => x.PackageCode == packageCode).ToList();
+ foreach (var item in pList)
+ {
+ item.AreaCode = (int)AreaCodeEnum.鏃犲尯鍩�;
+ item.UpiStatus = (int)UpiStatusEnum.鍒濆;
+ }
+
+ db.SaveChanges();
+ }
+ if (!string.IsNullOrEmpty(alertMsg))
+ {
+ MessageBox.Show("閿欒:" + alertMsg);
+ }
+ else
+ {
+ MessageBox.Show("宸插鐞�");
+ }
+ }
}
}
--
Gitblit v1.9.3