From 157f0b8a78b200bf68ce96a163d8d59432e78283 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周四, 28 11月 2024 14:38:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/FormCC.Designer.cs | 163 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 113 insertions(+), 50 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.Designer.cs b/CC/iWareCC_ASRS/FormCC.Designer.cs
index f85f44f..ff78685 100644
--- a/CC/iWareCC_ASRS/FormCC.Designer.cs
+++ b/CC/iWareCC_ASRS/FormCC.Designer.cs
@@ -210,6 +210,8 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tPModeChoice = new System.Windows.Forms.TabPage();
this.panel_Model = new System.Windows.Forms.Panel();
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask = new System.Windows.Forms.Label();
+ this.lbl_RobotMode = new System.Windows.Forms.Label();
this.rBOnlyIn = new System.Windows.Forms.RadioButton();
this.lbl_IsSimulationPLC = new System.Windows.Forms.Label();
this.lbl_WCFMsg = new System.Windows.Forms.Label();
@@ -236,14 +238,14 @@
this.checkBox_OutTaskRetryToMes = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = new System.Windows.Forms.Label();
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_DataProcess_RobotBuffer_ModeChange = new System.Windows.Forms.Label();
+ this.ck_DataProcess_RobotBuffer_ModeChange = 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_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_DataProcess_ValidateQiTao = new System.Windows.Forms.Label();
+ this.ck_DataProcess_ValidateQiTao = new System.Windows.Forms.CheckBox();
this.lbl_MainTaskDecompose = new System.Windows.Forms.Label();
this.ckMainTaskDecompose = new System.Windows.Forms.CheckBox();
this.lbl_Alert_DeleteData = new System.Windows.Forms.Label();
@@ -436,6 +438,9 @@
this.Qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.InStoreTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.button24 = new System.Windows.Forms.Button();
+ this.tb_PackageCode = new System.Windows.Forms.TextBox();
+ this.label23 = new System.Windows.Forms.Label();
this.button23 = new System.Windows.Forms.Button();
this.tb_wlm = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
@@ -2800,6 +2805,8 @@
//
// panel_Model
//
+ this.panel_Model.Controls.Add(this.lbl_currHandlerPackageCodeForIssueOutboundTask);
+ this.panel_Model.Controls.Add(this.lbl_RobotMode);
this.panel_Model.Controls.Add(this.rBOnlyIn);
this.panel_Model.Controls.Add(this.lbl_IsSimulationPLC);
this.panel_Model.Controls.Add(this.lbl_WCFMsg);
@@ -2816,6 +2823,26 @@
this.panel_Model.Size = new System.Drawing.Size(1531, 894);
this.panel_Model.TabIndex = 0;
this.panel_Model.Paint += new System.Windows.Forms.PaintEventHandler(this.panel27_Paint);
+ //
+ // lbl_currHandlerPackageCodeForIssueOutboundTask
+ //
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.AutoSize = true;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Location = new System.Drawing.Point(275, 693);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Name = "lbl_currHandlerPackageCodeForIssueOutboundTask";
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Size = new System.Drawing.Size(172, 15);
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.TabIndex = 14;
+ this.lbl_currHandlerPackageCodeForIssueOutboundTask.Text = "当前下发出库任务的包号";
+ //
+ // lbl_RobotMode
+ //
+ this.lbl_RobotMode.AutoSize = true;
+ this.lbl_RobotMode.Location = new System.Drawing.Point(275, 659);
+ this.lbl_RobotMode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbl_RobotMode.Name = "lbl_RobotMode";
+ this.lbl_RobotMode.Size = new System.Drawing.Size(127, 15);
+ this.lbl_RobotMode.TabIndex = 12;
+ this.lbl_RobotMode.Text = "缓存岛机器人模式";
//
// rBOnlyIn
//
@@ -2983,14 +3010,14 @@
this.groupBox1.Controls.Add(this.checkBox_OutTaskRetryToMes);
this.groupBox1.Controls.Add(this.lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound);
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_DataProcess_RobotBuffer_ModeChange);
+ this.groupBox1.Controls.Add(this.ck_DataProcess_RobotBuffer_ModeChange);
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_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_DataProcess_ValidateQiTao);
+ this.groupBox1.Controls.Add(this.ck_DataProcess_ValidateQiTao);
this.groupBox1.Controls.Add(this.lbl_MainTaskDecompose);
this.groupBox1.Controls.Add(this.ckMainTaskDecompose);
this.groupBox1.Controls.Add(this.lbl_Alert_DeleteData);
@@ -3189,28 +3216,28 @@
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.UseVisualStyleBackColor = true;
this.checkBox_DataProcess_RobotBuffer_FinishTaskForOutbound.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_MainTaskDecompose_ZPRK
+ // lbl_DataProcess_RobotBuffer_ModeChange
//
- this.lbl_MainTaskDecompose_ZPRK.AutoSize = true;
- this.lbl_MainTaskDecompose_ZPRK.BackColor = System.Drawing.Color.White;
- this.lbl_MainTaskDecompose_ZPRK.ForeColor = System.Drawing.Color.Red;
- this.lbl_MainTaskDecompose_ZPRK.Location = new System.Drawing.Point(213, 452);
- this.lbl_MainTaskDecompose_ZPRK.Name = "lbl_MainTaskDecompose_ZPRK";
- this.lbl_MainTaskDecompose_ZPRK.Size = new System.Drawing.Size(70, 15);
- this.lbl_MainTaskDecompose_ZPRK.TabIndex = 43;
- this.lbl_MainTaskDecompose_ZPRK.Text = "label11";
+ this.lbl_DataProcess_RobotBuffer_ModeChange.AutoSize = true;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.BackColor = System.Drawing.Color.White;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.ForeColor = System.Drawing.Color.Red;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(213, 452);
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Name = "lbl_DataProcess_RobotBuffer_ModeChange";
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(70, 15);
+ this.lbl_DataProcess_RobotBuffer_ModeChange.TabIndex = 43;
+ this.lbl_DataProcess_RobotBuffer_ModeChange.Text = "label11";
//
- // ckMainTaskDecompose_ZPRK
+ // ck_DataProcess_RobotBuffer_ModeChange
//
- this.ckMainTaskDecompose_ZPRK.AutoSize = true;
- this.ckMainTaskDecompose_ZPRK.Location = new System.Drawing.Point(3, 452);
- this.ckMainTaskDecompose_ZPRK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckMainTaskDecompose_ZPRK.Name = "ckMainTaskDecompose_ZPRK";
- this.ckMainTaskDecompose_ZPRK.Size = new System.Drawing.Size(207, 19);
- this.ckMainTaskDecompose_ZPRK.TabIndex = 42;
- this.ckMainTaskDecompose_ZPRK.Text = "任务分解线程(组盘入库)";
- this.ckMainTaskDecompose_ZPRK.UseVisualStyleBackColor = true;
- this.ckMainTaskDecompose_ZPRK.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_DataProcess_RobotBuffer_ModeChange.AutoSize = true;
+ this.ck_DataProcess_RobotBuffer_ModeChange.Location = new System.Drawing.Point(3, 452);
+ this.ck_DataProcess_RobotBuffer_ModeChange.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ck_DataProcess_RobotBuffer_ModeChange.Name = "ck_DataProcess_RobotBuffer_ModeChange";
+ this.ck_DataProcess_RobotBuffer_ModeChange.Size = new System.Drawing.Size(166, 19);
+ this.ck_DataProcess_RobotBuffer_ModeChange.TabIndex = 42;
+ this.ck_DataProcess_RobotBuffer_ModeChange.Text = "出库模式切换线程 ";
+ this.ck_DataProcess_RobotBuffer_ModeChange.UseVisualStyleBackColor = true;
+ this.ck_DataProcess_RobotBuffer_ModeChange.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_Alert_DataProcess_RobotBuffer_AutoQiTaoOutbound
//
@@ -3259,28 +3286,28 @@
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.UseVisualStyleBackColor = true;
this.ck_DataProcess_RobotBuffer_IssueOutboundTask.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
- // lbl_Alert_EmptySalverTransfer
+ // lbl_DataProcess_ValidateQiTao
//
- this.lbl_Alert_EmptySalverTransfer.AutoSize = true;
- this.lbl_Alert_EmptySalverTransfer.BackColor = System.Drawing.Color.White;
- this.lbl_Alert_EmptySalverTransfer.ForeColor = System.Drawing.Color.Red;
- this.lbl_Alert_EmptySalverTransfer.Location = new System.Drawing.Point(215, 492);
- this.lbl_Alert_EmptySalverTransfer.Name = "lbl_Alert_EmptySalverTransfer";
- this.lbl_Alert_EmptySalverTransfer.Size = new System.Drawing.Size(70, 15);
- this.lbl_Alert_EmptySalverTransfer.TabIndex = 37;
- this.lbl_Alert_EmptySalverTransfer.Text = "label11";
+ this.lbl_DataProcess_ValidateQiTao.AutoSize = true;
+ this.lbl_DataProcess_ValidateQiTao.BackColor = System.Drawing.Color.White;
+ this.lbl_DataProcess_ValidateQiTao.ForeColor = System.Drawing.Color.Red;
+ this.lbl_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(215, 492);
+ this.lbl_DataProcess_ValidateQiTao.Name = "lbl_DataProcess_ValidateQiTao";
+ this.lbl_DataProcess_ValidateQiTao.Size = new System.Drawing.Size(70, 15);
+ this.lbl_DataProcess_ValidateQiTao.TabIndex = 37;
+ this.lbl_DataProcess_ValidateQiTao.Text = "label11";
//
- // ckEmptySalverTransfer
+ // ck_DataProcess_ValidateQiTao
//
- this.ckEmptySalverTransfer.AutoSize = true;
- this.ckEmptySalverTransfer.Location = new System.Drawing.Point(4, 492);
- this.ckEmptySalverTransfer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ckEmptySalverTransfer.Name = "ckEmptySalverTransfer";
- this.ckEmptySalverTransfer.Size = new System.Drawing.Size(125, 19);
- this.ckEmptySalverTransfer.TabIndex = 36;
- this.ckEmptySalverTransfer.Text = "空托转运线程";
- this.ckEmptySalverTransfer.UseVisualStyleBackColor = true;
- this.ckEmptySalverTransfer.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
+ this.ck_DataProcess_ValidateQiTao.AutoSize = true;
+ this.ck_DataProcess_ValidateQiTao.Location = new System.Drawing.Point(4, 492);
+ this.ck_DataProcess_ValidateQiTao.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.ck_DataProcess_ValidateQiTao.Name = "ck_DataProcess_ValidateQiTao";
+ this.ck_DataProcess_ValidateQiTao.Size = new System.Drawing.Size(161, 19);
+ this.ck_DataProcess_ValidateQiTao.TabIndex = 36;
+ this.ck_DataProcess_ValidateQiTao.Text = "BZ30齐套验证线程";
+ this.ck_DataProcess_ValidateQiTao.UseVisualStyleBackColor = true;
+ this.ck_DataProcess_ValidateQiTao.CheckedChanged += new System.EventHandler(this.CommonCheckedChanged);
//
// lbl_MainTaskDecompose
//
@@ -5472,6 +5499,9 @@
//
// tabPage3
//
+ this.tabPage3.Controls.Add(this.button24);
+ this.tabPage3.Controls.Add(this.tb_PackageCode);
+ this.tabPage3.Controls.Add(this.label23);
this.tabPage3.Controls.Add(this.button23);
this.tabPage3.Controls.Add(this.tb_wlm);
this.tabPage3.Controls.Add(this.label22);
@@ -5492,6 +5522,34 @@
this.tabPage3.TabIndex = 9;
this.tabPage3.Text = "数据维护&统计";
this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // button24
+ //
+ this.button24.BackColor = System.Drawing.Color.Aqua;
+ this.button24.Location = new System.Drawing.Point(817, 489);
+ this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button24.Name = "button24";
+ this.button24.Size = new System.Drawing.Size(155, 48);
+ this.button24.TabIndex = 155;
+ this.button24.Text = "强制该包号出库";
+ this.button24.UseVisualStyleBackColor = false;
+ this.button24.Click += new System.EventHandler(this.button24_Click);
+ //
+ // tb_PackageCode
+ //
+ this.tb_PackageCode.Location = new System.Drawing.Point(856, 427);
+ this.tb_PackageCode.Name = "tb_PackageCode";
+ this.tb_PackageCode.Size = new System.Drawing.Size(339, 25);
+ this.tb_PackageCode.TabIndex = 154;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(794, 437);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(45, 15);
+ this.label23.TabIndex = 153;
+ this.label23.Text = "包号:";
//
// button23
//
@@ -6094,8 +6152,8 @@
private System.Windows.Forms.CheckBox ckDeleteData;
private System.Windows.Forms.Label lbl_MainTaskDecompose;
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_DataProcess_ValidateQiTao;
+ private System.Windows.Forms.CheckBox ck_DataProcess_ValidateQiTao;
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;
@@ -6209,8 +6267,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn InStoreTime;
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.Label lbl_DataProcess_RobotBuffer_ModeChange;
+ private System.Windows.Forms.CheckBox ck_DataProcess_RobotBuffer_ModeChange;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.Panel panel_DeviceTaskList_dgvPartTask_Finished;
private System.Windows.Forms.Button button17;
@@ -6334,6 +6392,11 @@
private System.Windows.Forms.TextBox tb_wlm;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.Button button23;
+ private System.Windows.Forms.Label lbl_RobotMode;
+ private System.Windows.Forms.Button button24;
+ private System.Windows.Forms.TextBox tb_PackageCode;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label lbl_currHandlerPackageCodeForIssueOutboundTask;
}
}
--
Gitblit v1.9.3