From b9e08c054b2d9a8f6d23535774dacd5406dc43ba Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 09 12月 2024 08:55:58 +0800
Subject: [PATCH] 222
---
CC/iWareCC_ASRS/FormCC.cs | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index d99eb49..7e0d1ab 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -163,7 +163,7 @@
this.rBNormal.Checked = SystemValue.rBNormal_Checked = true;
this.rbHand.Checked = SystemValue.rbHand_Checked = false;
this.rBDebug.Checked = SystemValue.rBDebug_Checked = false;
-
+
SetModelCheckBoxToSystemValue();
@@ -339,9 +339,9 @@
this.lbl_Alert_DataProcess_BZ39_IssueInboundTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_BZ39_IssueInboundTask;
this.lbl_Alert_DataProcess_RobotBuffer_ForceOutbound.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_ForceOutbound;
this.lbl_Alert_DataProcess_BZ12.Text = showNowTime + SystemWarningMsg._lbl_alert_DataProcess_BZ12;
-
+
//璁剧疆鍫嗗灈鏈轰换鍔′笅鍙戝拰浠诲姟瀹屾垚纭绾跨▼娑堟伅
-
+
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;
@@ -351,6 +351,8 @@
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_DataProcess_ValidateQiTao.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao;
this.lbl_Alert_DataProcess_RobotBuffer_FinishTask.Text = showNowTime + SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask;
@@ -523,9 +525,9 @@
}
}
-
-
+
+
#endregion
@@ -597,6 +599,23 @@
continue;
}
stationView = stationServiceClient.GetStationInfo((int)EDevice.Station);
+
+
+ this.lbl_Mode_FJ.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_FJ);
+ this.lbl_XinTiao_FJ.Text = "蹇冭烦:" + stationView.R_HandShake_FJ;
+ this.lbl_Warning_FJ.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FJ);
+
+ this.lbl_Mode_MB.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_MB);
+ this.lbl_XinTiao_MB.Text = "蹇冭烦:" + stationView.R_HandShake_MB;
+ this.lbl_Warning_MB.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_MB);
+
+ this.lbl_Mode_HB.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_HB);
+ this.lbl_XinTiao_HB.Text = "蹇冭烦:" + stationView.R_HandShake_HB;
+ this.lbl_Warning_HB.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_HB);
+
+ this.lbl_Mode_FX.Text = "璁惧妯″紡:" + PlcHelper.GetModeName(stationView.R_Mode_FX);
+ this.lbl_XinTiao_FX.Text = "蹇冭烦:" + stationView.R_HandShake_FX;
+ this.lbl_Warning_FX.Text = "鎶ヨ绫诲瀷:" + PlcHelper.GetWarningTypeName(stationView.R_Warning_FX);
////鏄剧ずRGV浠诲姟瀹屾垚鍜屽畬鎴愮‘璁や俊鍙�
//this.lbl_R_RGV_Finish.Text = "RGV浠诲姟瀹屾垚:" + rgvView.R_RGV_Finish;
@@ -745,11 +764,11 @@
});
}
-
+
#endregion
-
+
#region 鍏叡
@@ -781,7 +800,7 @@
}
-
+
/// <summary>
/// 鍫嗗灈鏈轰换鍔＄‘璁�
@@ -933,7 +952,7 @@
{
//鍫嗗灈鏈�1浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_1, ckB_DataProcess_BZ39_IssueInboundTask);
-
+
//鍫嗗灈鏈�2浠诲姟涓嬪彂
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_2, ckBDataProcess_RobotBuffer_ForceOutbound);
@@ -943,11 +962,11 @@
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3, ckBDataProcess_BZ12);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_SrmTaskThreadService_3_Finish, ckBDataProcess_BZ21_FinishTask);
-
+
//RGV浠诲姟涓嬪彂
-
+
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish, ckB_PushPaperCutToMes);
DoCommonCheckedChanged(ref SystemValue.isAllowRuning_RgvThreadService_Finish_BuChang, ck_PushPackageCodeToMes);
@@ -986,8 +1005,8 @@
private void FormCC_SizeChanged(object sender, EventArgs e)
{
-
-
+
+
}
/// <summary>
@@ -1273,7 +1292,7 @@
}
-
+
private void btn_TongJi_Click(object sender, EventArgs e)
{
@@ -1428,7 +1447,7 @@
}
}
-
+
private void button22_Click(object sender, EventArgs e)
{
var cargNo = this.tb_wlm.Text.Trim();
--
Gitblit v1.9.3