From eabff3021b1b238a56e2bb6b356a05879b167f7c Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 30 Mar 2018 13:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CarcassInStoreForm.Designer.cs | 118 ++++++++++-------- .../CarcassInStore_/CarcassInStoreForm.resx | 3 + 2 files changed, 71 insertions(+), 50 deletions(-) diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs index c0a3757..c17a09d 100644 --- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs +++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CarcassInStoreForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -46,15 +47,16 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CarcassInStoreForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.uLabel2 = new WinFormControl.ULabel(); - this.uLabel1 = new WinFormControl.ULabel(); + this.uTimerLabel1 = new WinFormControl.UTimerLabel(); + this.closeBtn = new WinFormControl.UButton(); this.comboBox2 = new System.Windows.Forms.ComboBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.uScanPanel1 = new WinFormControl.UScanPanel(); this.netStateWatch1 = new WinFormControl.NetStateWatch(); this.uWeightControl1 = new WinFormControl.UWeightControl(); + this.uLabel1 = new WinFormControl.ULabel(); + this.uLabel2 = new WinFormControl.ULabel(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.序号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -98,7 +100,6 @@ this.dataGridViewTextBoxColumn33 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.closeBtn = new WinFormControl.UButton(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -113,6 +114,7 @@ this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.IsSplitterFixed = true; this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; @@ -120,6 +122,7 @@ // splitContainer1.Panel1 // this.splitContainer1.Panel1.BackColor = System.Drawing.Color.Transparent; + this.splitContainer1.Panel1.Controls.Add(this.uTimerLabel1); this.splitContainer1.Panel1.Controls.Add(this.closeBtn); this.splitContainer1.Panel1.Controls.Add(this.comboBox2); this.splitContainer1.Panel1.Controls.Add(this.comboBox1); @@ -132,40 +135,47 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1144, 611); + this.splitContainer1.Size = new System.Drawing.Size(1164, 611); this.splitContainer1.SplitterDistance = 86; this.splitContainer1.TabIndex = 0; // - // uLabel2 + // uTimerLabel1 // - this.uLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.uLabel2.AutoSize = true; - this.uLabel2.BackColor = System.Drawing.Color.Transparent; - this.uLabel2.Font = new System.Drawing.Font("宋体", 15F); - this.uLabel2.Location = new System.Drawing.Point(744, 50); - this.uLabel2.Name = "uLabel2"; - this.uLabel2.Size = new System.Drawing.Size(109, 20); - this.uLabel2.TabIndex = 6; - this.uLabel2.Text = "生产批次："; + this.uTimerLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.uTimerLabel1.AutoSize = true; + this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent; + this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F); + this.uTimerLabel1.Format = "M月d日 H:m:ss"; + this.uTimerLabel1.Location = new System.Drawing.Point(1024, 53); + this.uTimerLabel1.Name = "uTimerLabel1"; + this.uTimerLabel1.Size = new System.Drawing.Size(128, 16); + this.uTimerLabel1.TabIndex = 8; + this.uTimerLabel1.Text = "3月30日 8:54:07"; // - // uLabel1 + // closeBtn // - this.uLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.uLabel1.AutoSize = true; - this.uLabel1.BackColor = System.Drawing.Color.Transparent; - this.uLabel1.Font = new System.Drawing.Font("宋体", 15F); - this.uLabel1.Location = new System.Drawing.Point(744, 14); - this.uLabel1.Name = "uLabel1"; - this.uLabel1.Size = new System.Drawing.Size(109, 20); - this.uLabel1.TabIndex = 5; - this.uLabel1.Text = "工作单元："; + this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.closeBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("closeBtn.BackgroundImage"))); + this.closeBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214))))); + this.closeBtn.FlatAppearance.BorderSize = 0; + this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.closeBtn.Font = new System.Drawing.Font("宋体", 15F); + this.closeBtn.ForeColor = System.Drawing.Color.Black; + this.closeBtn.Location = new System.Drawing.Point(1046, 7); + this.closeBtn.Name = "closeBtn"; + this.closeBtn.PlaySound = false; + this.closeBtn.Size = new System.Drawing.Size(111, 34); + this.closeBtn.SoundType = WinFormControl.SoundType.Click; + this.closeBtn.TabIndex = 7; + this.closeBtn.Text = "关 闭"; + this.closeBtn.UseVisualStyleBackColor = true; // // comboBox2 // this.comboBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.comboBox2.Font = new System.Drawing.Font("宋体", 15F); this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(845, 47); + this.comboBox2.Location = new System.Drawing.Point(843, 47); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(170, 28); this.comboBox2.TabIndex = 4; @@ -175,7 +185,7 @@ this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.comboBox1.Font = new System.Drawing.Font("宋体", 15F); this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(845, 11); + this.comboBox1.Location = new System.Drawing.Point(843, 11); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(170, 28); this.comboBox1.TabIndex = 3; @@ -184,7 +194,7 @@ // this.uScanPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.uScanPanel1.BackColor = System.Drawing.Color.Transparent; - this.uScanPanel1.Location = new System.Drawing.Point(441, 9); + this.uScanPanel1.Location = new System.Drawing.Point(439, 9); this.uScanPanel1.Name = "uScanPanel1"; this.uScanPanel1.Size = new System.Drawing.Size(303, 32); this.uScanPanel1.TabIndex = 2; @@ -206,11 +216,36 @@ this.uWeightControl1.TabIndex = 0; this.uWeightControl1.WeightFalg = null; // + // uLabel1 + // + this.uLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.uLabel1.AutoSize = true; + this.uLabel1.BackColor = System.Drawing.Color.Transparent; + this.uLabel1.Font = new System.Drawing.Font("宋体", 15F); + this.uLabel1.Location = new System.Drawing.Point(742, 14); + this.uLabel1.Name = "uLabel1"; + this.uLabel1.Size = new System.Drawing.Size(109, 20); + this.uLabel1.TabIndex = 5; + this.uLabel1.Text = "工作单元："; + // + // uLabel2 + // + this.uLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.uLabel2.AutoSize = true; + this.uLabel2.BackColor = System.Drawing.Color.Transparent; + this.uLabel2.Font = new System.Drawing.Font("宋体", 15F); + this.uLabel2.Location = new System.Drawing.Point(742, 50); + this.uLabel2.Name = "uLabel2"; + this.uLabel2.Size = new System.Drawing.Size(109, 20); + this.uLabel2.TabIndex = 6; + this.uLabel2.Text = "生产批次："; + // // splitContainer2 // this.splitContainer2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer2.IsSplitterFixed = true; this.splitContainer2.Location = new System.Drawing.Point(0, 0); this.splitContainer2.Name = "splitContainer2"; // @@ -221,8 +256,8 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.BackColor = System.Drawing.Color.Transparent; - this.splitContainer2.Size = new System.Drawing.Size(1144, 521); - this.splitContainer2.SplitterDistance = 816; + this.splitContainer2.Size = new System.Drawing.Size(1164, 521); + this.splitContainer2.SplitterDistance = 836; this.splitContainer2.TabIndex = 0; // // 序号 @@ -573,33 +608,15 @@ this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35"; this.dataGridViewTextBoxColumn35.ReadOnly = true; // - // closeBtn - // - this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.closeBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("closeBtn.BackgroundImage"))); - this.closeBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214))))); - this.closeBtn.FlatAppearance.BorderSize = 0; - this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.closeBtn.Font = new System.Drawing.Font("宋体", 15F); - this.closeBtn.ForeColor = System.Drawing.Color.Black; - this.closeBtn.Location = new System.Drawing.Point(1026, 7); - this.closeBtn.Name = "closeBtn"; - this.closeBtn.PlaySound = false; - this.closeBtn.Size = new System.Drawing.Size(111, 34); - this.closeBtn.SoundType = WinFormControl.SoundType.Click; - this.closeBtn.TabIndex = 7; - this.closeBtn.Text = "关 闭"; - this.closeBtn.UseVisualStyleBackColor = true; - // // CarcassInStoreForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1144, 611); + this.ClientSize = new System.Drawing.Size(1164, 611); this.Controls.Add(this.splitContainer1); this.KeyPreview = true; - this.MinimumSize = new System.Drawing.Size(1160, 650); + this.MinimumSize = new System.Drawing.Size(1180, 650); this.Name = "CarcassInStoreForm"; this.Text = "白条入库"; this.splitContainer1.Panel1.ResumeLayout(false); @@ -667,6 +684,7 @@ private WinFormControl.NetStateWatch netStateWatch1; private WinFormControl.UWeightControl uWeightControl1; private WinFormControl.UButton closeBtn; + private WinFormControl.UTimerLabel uTimerLabel1; } diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.resx b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.resx index 2d7d3ad..b07ada3 100644 --- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.resx +++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.resx @@ -120,6 +120,9 @@ True + + True + True