diff --git a/AUCMA.STORE/AUCMA.STORE.csproj b/AUCMA.STORE/AUCMA.STORE.csproj index 0ef3a62..4186666 100644 --- a/AUCMA.STORE/AUCMA.STORE.csproj +++ b/AUCMA.STORE/AUCMA.STORE.csproj @@ -278,6 +278,7 @@ + diff --git a/AUCMA.STORE/InStoreForm.Designer.cs b/AUCMA.STORE/InStoreForm.Designer.cs index e5673a9..e6958cf 100644 --- a/AUCMA.STORE/InStoreForm.Designer.cs +++ b/AUCMA.STORE/InStoreForm.Designer.cs @@ -30,6 +30,7 @@ namespace AUCMA.STORE private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InStoreForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -40,10 +41,10 @@ namespace AUCMA.STORE System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InStoreForm)); this.timer1 = new System.Windows.Forms.Timer(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panelEnhanced1 = new AUCMA.STORE.PanelEnhanced(); + this.btn_clearTask = new System.Windows.Forms.Button(); this.label19 = new System.Windows.Forms.Label(); this.hslMoveText3 = new HslControls.HslMoveText(); this.panel3 = new System.Windows.Forms.Panel(); @@ -65,6 +66,13 @@ namespace AUCMA.STORE this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel2 = new System.Windows.Forms.Panel(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); this.Task_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -91,13 +99,6 @@ namespace AUCMA.STORE this.btn_Instore_1 = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEnhanced1.SuspendLayout(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); @@ -130,6 +131,7 @@ namespace AUCMA.STORE this.panelEnhanced1.AutoSize = true; this.panelEnhanced1.BackgroundImage = global::AUCMA.STORE.Properties.Resources.背景; this.panelEnhanced1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panelEnhanced1.Controls.Add(this.btn_clearTask); this.panelEnhanced1.Controls.Add(this.label19); this.panelEnhanced1.Controls.Add(this.hslMoveText3); this.panelEnhanced1.Controls.Add(this.panel3); @@ -159,20 +161,39 @@ namespace AUCMA.STORE this.panelEnhanced1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEnhanced1.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.panelEnhanced1.Location = new System.Drawing.Point(0, 0); - this.panelEnhanced1.Margin = new System.Windows.Forms.Padding(2); + this.panelEnhanced1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelEnhanced1.Name = "panelEnhanced1"; - this.panelEnhanced1.Size = new System.Drawing.Size(1122, 663); + this.panelEnhanced1.Size = new System.Drawing.Size(1496, 829); this.panelEnhanced1.TabIndex = 0; // + // btn_clearTask + // + this.btn_clearTask.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btn_clearTask.BackColor = System.Drawing.Color.Transparent; + this.btn_clearTask.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btn_clearTask.BackgroundImage"))); + this.btn_clearTask.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.btn_clearTask.FlatAppearance.BorderSize = 0; + this.btn_clearTask.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btn_clearTask.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btn_clearTask.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_clearTask.Location = new System.Drawing.Point(1010, 17); + this.btn_clearTask.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btn_clearTask.Name = "btn_clearTask"; + this.btn_clearTask.Size = new System.Drawing.Size(208, 68); + this.btn_clearTask.TabIndex = 446; + this.btn_clearTask.UseVisualStyleBackColor = false; + this.btn_clearTask.Click += new System.EventHandler(this.btn_clearTask_Click); + // // label19 // this.label19.AutoSize = true; this.label19.BackColor = System.Drawing.Color.Transparent; this.label19.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold); this.label19.ForeColor = System.Drawing.Color.Red; - this.label19.Location = new System.Drawing.Point(330, 0); + this.label19.Location = new System.Drawing.Point(440, 0); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(159, 35); + this.label19.Size = new System.Drawing.Size(199, 44); this.label19.TabIndex = 445; this.label19.Text = "异常提示"; // @@ -182,10 +203,11 @@ namespace AUCMA.STORE | System.Windows.Forms.AnchorStyles.Right))); this.hslMoveText3.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.hslMoveText3.ForeColor = System.Drawing.Color.Red; - this.hslMoveText3.Location = new System.Drawing.Point(587, 12); + this.hslMoveText3.Location = new System.Drawing.Point(783, 15); + this.hslMoveText3.Margin = new System.Windows.Forms.Padding(4); this.hslMoveText3.MoveSpeed = 0F; this.hslMoveText3.Name = "hslMoveText3"; - this.hslMoveText3.Size = new System.Drawing.Size(326, 47); + this.hslMoveText3.Size = new System.Drawing.Size(435, 59); this.hslMoveText3.TabIndex = 433; this.hslMoveText3.Text = "异常提示"; // @@ -209,10 +231,10 @@ namespace AUCMA.STORE this.panel3.Controls.Add(this.label4); this.panel3.Controls.Add(this.pictureBox3); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 580); - this.panel3.Margin = new System.Windows.Forms.Padding(2); + this.panel3.Location = new System.Drawing.Point(0, 725); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1122, 83); + this.panel3.Size = new System.Drawing.Size(1496, 104); this.panel3.TabIndex = 431; // // label18 @@ -222,10 +244,9 @@ namespace AUCMA.STORE this.label18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label18.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label18.Location = new System.Drawing.Point(1023, 48); - this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label18.Location = new System.Drawing.Point(1364, 60); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(88, 26); + this.label18.Size = new System.Drawing.Size(117, 32); this.label18.TabIndex = 436; this.label18.Text = "2#入库口"; // @@ -234,10 +255,10 @@ namespace AUCMA.STORE this.pictureBox10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox10.BackColor = System.Drawing.Color.Transparent; this.pictureBox10.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox10.Location = new System.Drawing.Point(997, 48); - this.pictureBox10.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox10.Location = new System.Drawing.Point(1329, 60); + this.pictureBox10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox10.Name = "pictureBox10"; - this.pictureBox10.Size = new System.Drawing.Size(23, 26); + this.pictureBox10.Size = new System.Drawing.Size(31, 32); this.pictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox10.TabIndex = 435; this.pictureBox10.TabStop = false; @@ -249,10 +270,9 @@ namespace AUCMA.STORE this.label17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label17.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label17.Location = new System.Drawing.Point(1023, 11); - this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label17.Location = new System.Drawing.Point(1364, 14); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(88, 26); + this.label17.Size = new System.Drawing.Size(117, 32); this.label17.TabIndex = 434; this.label17.Text = "2#出库口"; // @@ -261,10 +281,10 @@ namespace AUCMA.STORE this.pictureBox8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox8.BackColor = System.Drawing.Color.Transparent; this.pictureBox8.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox8.Location = new System.Drawing.Point(997, 11); - this.pictureBox8.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox8.Location = new System.Drawing.Point(1329, 14); + this.pictureBox8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox8.Name = "pictureBox8"; - this.pictureBox8.Size = new System.Drawing.Size(23, 26); + this.pictureBox8.Size = new System.Drawing.Size(31, 32); this.pictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox8.TabIndex = 433; this.pictureBox8.TabStop = false; @@ -276,10 +296,9 @@ namespace AUCMA.STORE this.label16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label16.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label16.Location = new System.Drawing.Point(900, 48); - this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label16.Location = new System.Drawing.Point(1200, 60); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(88, 26); + this.label16.Size = new System.Drawing.Size(117, 32); this.label16.TabIndex = 432; this.label16.Text = "1#入库口"; // @@ -288,10 +307,10 @@ namespace AUCMA.STORE this.pictureBox9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox9.BackColor = System.Drawing.Color.Transparent; this.pictureBox9.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox9.Location = new System.Drawing.Point(874, 48); - this.pictureBox9.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox9.Location = new System.Drawing.Point(1165, 60); + this.pictureBox9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox9.Name = "pictureBox9"; - this.pictureBox9.Size = new System.Drawing.Size(23, 26); + this.pictureBox9.Size = new System.Drawing.Size(31, 32); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox9.TabIndex = 431; this.pictureBox9.TabStop = false; @@ -303,10 +322,9 @@ namespace AUCMA.STORE this.label15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label15.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label15.Location = new System.Drawing.Point(900, 11); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(1200, 14); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(88, 26); + this.label15.Size = new System.Drawing.Size(117, 32); this.label15.TabIndex = 430; this.label15.Text = "1#出库口"; // @@ -315,10 +333,10 @@ namespace AUCMA.STORE this.pictureBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox7.BackColor = System.Drawing.Color.Transparent; this.pictureBox7.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox7.Location = new System.Drawing.Point(874, 11); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox7.Location = new System.Drawing.Point(1165, 14); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(23, 26); + this.pictureBox7.Size = new System.Drawing.Size(31, 32); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox7.TabIndex = 429; this.pictureBox7.TabStop = false; @@ -330,10 +348,9 @@ namespace AUCMA.STORE this.label10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label10.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label10.Location = new System.Drawing.Point(667, 28); - this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Location = new System.Drawing.Point(889, 35); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(216, 34); + this.label10.Size = new System.Drawing.Size(288, 42); this.label10.TabIndex = 428; this.label10.Text = "机械手状态"; // @@ -342,10 +359,10 @@ namespace AUCMA.STORE this.pictureBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox6.BackColor = System.Drawing.Color.Transparent; this.pictureBox6.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox6.Location = new System.Drawing.Point(625, 28); - this.pictureBox6.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox6.Location = new System.Drawing.Point(833, 35); + this.pictureBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(33, 37); + this.pictureBox6.Size = new System.Drawing.Size(44, 46); this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox6.TabIndex = 427; this.pictureBox6.TabStop = false; @@ -357,10 +374,9 @@ namespace AUCMA.STORE this.label9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label9.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label9.Location = new System.Drawing.Point(515, 28); - this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Location = new System.Drawing.Point(687, 35); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(137, 34); + this.label9.Size = new System.Drawing.Size(183, 42); this.label9.TabIndex = 426; this.label9.Text = "RGV状态"; // @@ -369,10 +385,10 @@ namespace AUCMA.STORE this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox1.Location = new System.Drawing.Point(473, 28); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox1.Location = new System.Drawing.Point(631, 35); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(33, 37); + this.pictureBox1.Size = new System.Drawing.Size(44, 46); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 425; this.pictureBox1.TabStop = false; @@ -384,10 +400,9 @@ namespace AUCMA.STORE this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label3.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label3.Location = new System.Drawing.Point(285, 28); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Location = new System.Drawing.Point(380, 35); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(208, 34); + this.label3.Size = new System.Drawing.Size(277, 42); this.label3.TabIndex = 407; this.label3.Text = "2#堆垛机状态"; // @@ -396,10 +411,10 @@ namespace AUCMA.STORE this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox2.BackColor = System.Drawing.Color.Transparent; this.pictureBox2.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox2.Location = new System.Drawing.Point(247, 28); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox2.Location = new System.Drawing.Point(329, 35); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(33, 37); + this.pictureBox2.Size = new System.Drawing.Size(44, 46); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox2.TabIndex = 406; this.pictureBox2.TabStop = false; @@ -410,10 +425,9 @@ namespace AUCMA.STORE this.label4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label4.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label4.Location = new System.Drawing.Point(50, 27); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Location = new System.Drawing.Point(67, 34); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(208, 34); + this.label4.Size = new System.Drawing.Size(277, 42); this.label4.TabIndex = 405; this.label4.Text = "1#堆垛机状态"; // @@ -422,10 +436,10 @@ namespace AUCMA.STORE this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.pictureBox3.BackColor = System.Drawing.Color.Transparent; this.pictureBox3.Image = global::AUCMA.STORE.Properties.Resources.Red; - this.pictureBox3.Location = new System.Drawing.Point(13, 25); - this.pictureBox3.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox3.Location = new System.Drawing.Point(17, 31); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(33, 37); + this.pictureBox3.Size = new System.Drawing.Size(44, 46); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox3.TabIndex = 404; this.pictureBox3.TabStop = false; @@ -434,10 +448,10 @@ namespace AUCMA.STORE // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(27)))), ((int)(((byte)(61))))); this.panel1.Controls.Add(this.dataGridView1); - this.panel1.Location = new System.Drawing.Point(26, 371); - this.panel1.Margin = new System.Windows.Forms.Padding(2); + this.panel1.Location = new System.Drawing.Point(35, 464); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(532, 234); + this.panel1.Size = new System.Drawing.Size(709, 292); this.panel1.TabIndex = 426; // // dataGridView1 @@ -460,6 +474,7 @@ namespace AUCMA.STORE dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView1.ColumnHeadersHeight = 29; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column0, this.Column1, @@ -479,6 +494,7 @@ namespace AUCMA.STORE this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.EnableHeadersVisualStyles = false; this.dataGridView1.Location = new System.Drawing.Point(0, 0); + this.dataGridView1.Margin = new System.Windows.Forms.Padding(4); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; @@ -506,20 +522,83 @@ namespace AUCMA.STORE this.dataGridView1.RowTemplate.Height = 40; this.dataGridView1.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView1.Size = new System.Drawing.Size(532, 234); + this.dataGridView1.Size = new System.Drawing.Size(709, 292); this.dataGridView1.TabIndex = 430; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridView1_CellFormatting); this.dataGridView1.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseClick); this.dataGridView1.Paint += new System.Windows.Forms.PaintEventHandler(this.dataGridView1_Paint); // + // Column0 + // + this.Column0.HeaderText = "任务编号"; + this.Column0.MinimumWidth = 6; + this.Column0.Name = "Column0"; + this.Column0.ReadOnly = true; + this.Column0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column0.Width = 115; + // + // Column1 + // + this.Column1.HeaderText = "类型"; + this.Column1.MinimumWidth = 6; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column1.Width = 80; + // + // Column2 + // + this.Column2.HeaderText = "型号"; + this.Column2.MinimumWidth = 6; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column2.Width = 125; + // + // Column3 + // + this.Column3.HeaderText = "区域"; + this.Column3.MinimumWidth = 6; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column3.Width = 30; + // + // Column4 + // + this.Column4.HeaderText = "库位"; + this.Column4.MinimumWidth = 6; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column4.Width = 50; + // + // Column5 + // + this.Column5.HeaderText = "状态"; + this.Column5.MinimumWidth = 6; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Column5.Width = 50; + // + // Column6 + // + this.Column6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Column6.HeaderText = "时间"; + this.Column6.MinimumWidth = 6; + this.Column6.Name = "Column6"; + this.Column6.ReadOnly = true; + this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // // panel2 // this.panel2.Controls.Add(this.dataGridView2); - this.panel2.Location = new System.Drawing.Point(587, 371); - this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Location = new System.Drawing.Point(783, 464); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(517, 234); + this.panel2.Size = new System.Drawing.Size(689, 292); this.panel2.TabIndex = 427; // // dataGridView2 @@ -560,6 +639,7 @@ namespace AUCMA.STORE this.dataGridView2.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView2.EnableHeadersVisualStyles = false; this.dataGridView2.Location = new System.Drawing.Point(0, 0); + this.dataGridView2.Margin = new System.Windows.Forms.Padding(4); this.dataGridView2.MultiSelect = false; this.dataGridView2.Name = "dataGridView2"; this.dataGridView2.ReadOnly = true; @@ -587,7 +667,7 @@ namespace AUCMA.STORE this.dataGridView2.RowTemplate.Height = 40; this.dataGridView2.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView2.Size = new System.Drawing.Size(517, 234); + this.dataGridView2.Size = new System.Drawing.Size(689, 292); this.dataGridView2.TabIndex = 429; // // Task_ID @@ -624,10 +704,9 @@ namespace AUCMA.STORE this.label13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label13.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label13.Location = new System.Drawing.Point(972, 120); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(1296, 150); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(99, 32); + this.label13.Size = new System.Drawing.Size(132, 40); this.label13.TabIndex = 430; this.label13.Text = "0%"; // @@ -638,10 +717,9 @@ namespace AUCMA.STORE this.label14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label14.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label14.Location = new System.Drawing.Point(974, 169); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(1299, 211); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(97, 29); + this.label14.Size = new System.Drawing.Size(129, 36); this.label14.TabIndex = 429; this.label14.Text = "库存占比"; // @@ -652,10 +730,9 @@ namespace AUCMA.STORE this.label12.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label12.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label12.Location = new System.Drawing.Point(421, 115); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(561, 144); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(92, 37); + this.label12.Size = new System.Drawing.Size(123, 46); this.label12.TabIndex = 428; this.label12.Text = "0%"; // @@ -666,10 +743,9 @@ namespace AUCMA.STORE this.label11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label11.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label11.Location = new System.Drawing.Point(423, 168); - this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Location = new System.Drawing.Point(564, 210); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(89, 22); + this.label11.Size = new System.Drawing.Size(119, 28); this.label11.TabIndex = 427; this.label11.Text = "库存占比"; // @@ -680,10 +756,9 @@ namespace AUCMA.STORE this.label8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label8.Font = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.ForeColor = System.Drawing.Color.LightSkyBlue; - this.label8.Location = new System.Drawing.Point(423, 210); - this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Location = new System.Drawing.Point(564, 262); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(0, 22); + this.label8.Size = new System.Drawing.Size(0, 28); this.label8.TabIndex = 421; // // label7 @@ -695,10 +770,9 @@ namespace AUCMA.STORE this.label7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label7.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label7.ForeColor = System.Drawing.Color.LightSkyBlue; - this.label7.Location = new System.Drawing.Point(988, 189); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Location = new System.Drawing.Point(1317, 236); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(0, 35); + this.label7.Size = new System.Drawing.Size(0, 43); this.label7.TabIndex = 420; // // label6 @@ -708,10 +782,9 @@ namespace AUCMA.STORE this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label6.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.LightSkyBlue; - this.label6.Location = new System.Drawing.Point(434, 176); - this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label6.Location = new System.Drawing.Point(579, 220); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(0, 35); + this.label6.Size = new System.Drawing.Size(0, 43); this.label6.TabIndex = 419; // // pictureBox5 @@ -719,10 +792,10 @@ namespace AUCMA.STORE this.pictureBox5.BackColor = System.Drawing.Color.Transparent; this.pictureBox5.BackgroundImage = global::AUCMA.STORE.Properties.Resources.库存占比; this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox5.Location = new System.Drawing.Point(923, 115); - this.pictureBox5.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox5.Location = new System.Drawing.Point(1231, 144); + this.pictureBox5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(180, 186); + this.pictureBox5.Size = new System.Drawing.Size(240, 232); this.pictureBox5.TabIndex = 418; this.pictureBox5.TabStop = false; this.pictureBox5.Click += new System.EventHandler(this.pictureBox5_Click); @@ -732,10 +805,10 @@ namespace AUCMA.STORE this.pictureBox4.BackColor = System.Drawing.Color.Transparent; this.pictureBox4.BackgroundImage = global::AUCMA.STORE.Properties.Resources.库存占比; this.pictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox4.Location = new System.Drawing.Point(368, 115); - this.pictureBox4.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox4.Location = new System.Drawing.Point(491, 144); + this.pictureBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.Size = new System.Drawing.Size(180, 174); + this.pictureBox4.Size = new System.Drawing.Size(240, 218); this.pictureBox4.TabIndex = 417; this.pictureBox4.TabStop = false; this.pictureBox4.Click += new System.EventHandler(this.pictureBox4_Click); @@ -748,10 +821,9 @@ namespace AUCMA.STORE this.label5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label5.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label5.Location = new System.Drawing.Point(330, 24); - this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label5.Location = new System.Drawing.Point(440, 30); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(0, 35); + this.label5.Size = new System.Drawing.Size(0, 43); this.label5.TabIndex = 416; // // btn_Exit @@ -764,10 +836,10 @@ namespace AUCMA.STORE this.btn_Exit.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.btn_Exit.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Exit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Exit.Location = new System.Drawing.Point(932, 10); - this.btn_Exit.Margin = new System.Windows.Forms.Padding(2); + this.btn_Exit.Location = new System.Drawing.Point(1243, 12); + this.btn_Exit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Exit.Name = "btn_Exit"; - this.btn_Exit.Size = new System.Drawing.Size(156, 62); + this.btn_Exit.Size = new System.Drawing.Size(208, 78); this.btn_Exit.TabIndex = 413; this.btn_Exit.UseVisualStyleBackColor = false; this.btn_Exit.Click += new System.EventHandler(this.button10_Click); @@ -784,10 +856,10 @@ namespace AUCMA.STORE this.btn_Unlock_2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Unlock_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_Unlock_2.ForeColor = System.Drawing.SystemColors.ActiveCaption; - this.btn_Unlock_2.Location = new System.Drawing.Point(746, 224); - this.btn_Unlock_2.Margin = new System.Windows.Forms.Padding(2); + this.btn_Unlock_2.Location = new System.Drawing.Point(995, 280); + this.btn_Unlock_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Unlock_2.Name = "btn_Unlock_2"; - this.btn_Unlock_2.Size = new System.Drawing.Size(137, 66); + this.btn_Unlock_2.Size = new System.Drawing.Size(183, 82); this.btn_Unlock_2.TabIndex = 411; this.btn_Unlock_2.UseVisualStyleBackColor = false; this.btn_Unlock_2.Click += new System.EventHandler(this.btn_Unlock_2_Click); @@ -802,10 +874,10 @@ namespace AUCMA.STORE this.btn_Stop_2.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.btn_Stop_2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Stop_2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Stop_2.Location = new System.Drawing.Point(587, 226); - this.btn_Stop_2.Margin = new System.Windows.Forms.Padding(2); + this.btn_Stop_2.Location = new System.Drawing.Point(783, 282); + this.btn_Stop_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Stop_2.Name = "btn_Stop_2"; - this.btn_Stop_2.Size = new System.Drawing.Size(140, 62); + this.btn_Stop_2.Size = new System.Drawing.Size(187, 78); this.btn_Stop_2.TabIndex = 410; this.btn_Stop_2.UseVisualStyleBackColor = false; this.btn_Stop_2.Click += new System.EventHandler(this.btn_Stop_2_Click); @@ -820,10 +892,10 @@ namespace AUCMA.STORE this.button7.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button7.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button7.Location = new System.Drawing.Point(746, 148); - this.button7.Margin = new System.Windows.Forms.Padding(2); + this.button7.Location = new System.Drawing.Point(995, 185); + this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(137, 62); + this.button7.Size = new System.Drawing.Size(183, 78); this.button7.TabIndex = 409; this.button7.UseVisualStyleBackColor = false; this.button7.Click += new System.EventHandler(this.button7_Click); @@ -838,10 +910,10 @@ namespace AUCMA.STORE this.button8.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button8.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button8.Location = new System.Drawing.Point(587, 148); - this.button8.Margin = new System.Windows.Forms.Padding(2); + this.button8.Location = new System.Drawing.Point(783, 185); + this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(140, 62); + this.button8.Size = new System.Drawing.Size(187, 78); this.button8.TabIndex = 408; this.button8.UseVisualStyleBackColor = false; this.button8.Click += new System.EventHandler(this.button8_Click); @@ -855,10 +927,10 @@ namespace AUCMA.STORE this.btn_Unlock_1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.btn_Unlock_1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Unlock_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Unlock_1.Location = new System.Drawing.Point(196, 226); - this.btn_Unlock_1.Margin = new System.Windows.Forms.Padding(2); + this.btn_Unlock_1.Location = new System.Drawing.Point(261, 282); + this.btn_Unlock_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Unlock_1.Name = "btn_Unlock_1"; - this.btn_Unlock_1.Size = new System.Drawing.Size(137, 62); + this.btn_Unlock_1.Size = new System.Drawing.Size(183, 78); this.btn_Unlock_1.TabIndex = 407; this.btn_Unlock_1.UseVisualStyleBackColor = false; this.btn_Unlock_1.Click += new System.EventHandler(this.btn_Unlock_1_Click); @@ -872,10 +944,10 @@ namespace AUCMA.STORE this.btn_Stop_1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.btn_Stop_1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Stop_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Stop_1.Location = new System.Drawing.Point(35, 226); - this.btn_Stop_1.Margin = new System.Windows.Forms.Padding(2); + this.btn_Stop_1.Location = new System.Drawing.Point(47, 282); + this.btn_Stop_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Stop_1.Name = "btn_Stop_1"; - this.btn_Stop_1.Size = new System.Drawing.Size(137, 62); + this.btn_Stop_1.Size = new System.Drawing.Size(183, 78); this.btn_Stop_1.TabIndex = 406; this.btn_Stop_1.UseVisualStyleBackColor = false; this.btn_Stop_1.Click += new System.EventHandler(this.btn_Stop_1_Click); @@ -889,10 +961,10 @@ namespace AUCMA.STORE this.button2.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.button2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button2.Location = new System.Drawing.Point(196, 148); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(261, 185); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(137, 62); + this.button2.Size = new System.Drawing.Size(183, 78); this.button2.TabIndex = 405; this.button2.UseVisualStyleBackColor = false; this.button2.Click += new System.EventHandler(this.button2_Click); @@ -906,10 +978,10 @@ namespace AUCMA.STORE this.btn_Instore_1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; this.btn_Instore_1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; this.btn_Instore_1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_Instore_1.Location = new System.Drawing.Point(35, 148); - this.btn_Instore_1.Margin = new System.Windows.Forms.Padding(2); + this.btn_Instore_1.Location = new System.Drawing.Point(47, 185); + this.btn_Instore_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btn_Instore_1.Name = "btn_Instore_1"; - this.btn_Instore_1.Size = new System.Drawing.Size(137, 62); + this.btn_Instore_1.Size = new System.Drawing.Size(183, 78); this.btn_Instore_1.TabIndex = 404; this.btn_Instore_1.UseVisualStyleBackColor = false; this.btn_Instore_1.Click += new System.EventHandler(this.btn_Instore_1_Click); @@ -922,10 +994,9 @@ namespace AUCMA.STORE this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label2.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label2.Location = new System.Drawing.Point(674, 610); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Location = new System.Drawing.Point(899, 762); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(0, 35); + this.label2.Size = new System.Drawing.Size(0, 43); this.label2.TabIndex = 399; // // label1 @@ -936,84 +1007,21 @@ namespace AUCMA.STORE this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label1.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(106)))), ((int)(((byte)(203)))), ((int)(((byte)(254))))); - this.label1.Location = new System.Drawing.Point(898, 610); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(1197, 762); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(0, 35); + this.label1.Size = new System.Drawing.Size(0, 43); this.label1.TabIndex = 397; // - // Column0 - // - this.Column0.HeaderText = "任务编号"; - this.Column0.MinimumWidth = 6; - this.Column0.Name = "Column0"; - this.Column0.ReadOnly = true; - this.Column0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Column0.Width = 115; - // - // Column1 - // - this.Column1.HeaderText = "类型"; - this.Column1.MinimumWidth = 6; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Column1.Width = 80; - // - // Column2 - // - this.Column2.HeaderText = "型号"; - this.Column2.MinimumWidth = 6; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // Column3 - // - this.Column3.HeaderText = "区域"; - this.Column3.MinimumWidth = 6; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Column3.Width = 30; - // - // Column4 - // - this.Column4.HeaderText = "库位"; - this.Column4.MinimumWidth = 6; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Column4.Width = 50; - // - // Column5 - // - this.Column5.HeaderText = "状态"; - this.Column5.MinimumWidth = 6; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Column5.Width = 50; - // - // Column6 - // - this.Column6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.Column6.HeaderText = "时间"; - this.Column6.MinimumWidth = 6; - this.Column6.Name = "Column6"; - this.Column6.ReadOnly = true; - this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // // InStoreForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.ClientSize = new System.Drawing.Size(1122, 663); + this.ClientSize = new System.Drawing.Size(1496, 829); this.Controls.Add(this.panelEnhanced1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "InStoreForm"; this.Text = "WCS"; this.Activated += new System.EventHandler(this.InStoreForm_Activated); @@ -1100,6 +1108,7 @@ namespace AUCMA.STORE private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.Button btn_clearTask; } } diff --git a/AUCMA.STORE/InStoreForm.cs b/AUCMA.STORE/InStoreForm.cs index db1cb4e..e91dc7a 100644 --- a/AUCMA.STORE/InStoreForm.cs +++ b/AUCMA.STORE/InStoreForm.cs @@ -994,6 +994,11 @@ namespace AUCMA.STORE form.ShowDialog(this); } + /// + /// 急停按钮改为清除任务按钮 + /// + /// + /// private async void btn_Stop_1_Click(object sender, EventArgs e) { Expression> exp1 = s1 => true; @@ -1013,6 +1018,8 @@ namespace AUCMA.STORE btn_Stop_1.BackgroundImage = Image.FromFile(img); stop1_Flag = false; } + + } private async void btn_Stop_2_Click(object sender, EventArgs e) @@ -1555,5 +1562,40 @@ namespace AUCMA.STORE iFlag = true; unLockStoreLocationInfo.ShowDialog(this); } + + private async void btn_clearTask_Click(object sender, EventArgs e) + { + Expression> exp = s1 => true; + List taskQueues = await new BaseServices().Query(x => x.storeCode == "A" && x.pilerTaskType == TaskType.OutStore && x.taskStatus == Entity.Enums.TaskStatus.Await); + if (taskQueues != null) + { + if (taskQueues.Count > 0) + { + DialogResult result = MessageBox.Show($"确认删除{taskQueues.Count}条出库任务", "确认对话", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + + if (result == DialogResult.Yes) + { + bool res = await new BaseServices().DeleteByIds(taskQueues.Select(x => x.uuid).ToArray()); + MessageBox.Show($"操作已执行，删除{(res ? "成功" : "失败")}", "通知", MessageBoxButtons.OK, MessageBoxIcon.Information); + LogHelper.Pilerlog($"手动删除{taskQueues.Count}条出库任务{(res ? "成功" : "失败")}:{JsonChange.ModeToJson(taskQueues)}"); + if (res) + { + inStoreTaskList.Clear(); + outStoreTaskList.Clear(); + dataGridView1.Rows.Clear(); + initTaskQueue(); + } + } + else + { + MessageBox.Show("操作已取消。", "通知", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + else + { + MessageBox.Show("当前没有未执行的等待任务。", "通知", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } } } diff --git a/AUCMA.STORE/InStoreForm.resx b/AUCMA.STORE/InStoreForm.resx index 647caa2..09263bb 100644 --- a/AUCMA.STORE/InStoreForm.resx +++ b/AUCMA.STORE/InStoreForm.resx @@ -123,6 +123,224 @@ 122, 17 + + + + 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 + qLC6TA0AAAAASUVORK5CYII= + + True @@ -153,7 +371,6 @@ True - AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA diff --git a/AUCMA.STORE/Properties/Resources.Designer.cs b/AUCMA.STORE/Properties/Resources.Designer.cs index c1fdacb..0f3661d 100644 --- a/AUCMA.STORE/Properties/Resources.Designer.cs +++ b/AUCMA.STORE/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace AUCMA.STORE.Properties { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -160,6 +160,16 @@ namespace AUCMA.STORE.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 清除任务 { + get { + object obj = ResourceManager.GetObject("清除任务", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/AUCMA.STORE/Properties/Resources.resx b/AUCMA.STORE/Properties/Resources.resx index 692ab87..edc4a14 100644 --- a/AUCMA.STORE/Properties/Resources.resx +++ b/AUCMA.STORE/Properties/Resources.resx @@ -145,22 +145,25 @@ ..\Resources\恢复.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\出库.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\库存占比.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\物料查询未选中.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\解锁库位.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\物料查询选中.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\出库.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\解锁库位.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\清除任务.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/AUCMA.STORE/Resources/清除任务.png b/AUCMA.STORE/Resources/清除任务.png new file mode 100644 index 0000000..a4080f3 Binary files /dev/null and b/AUCMA.STORE/Resources/清除任务.png differ