From b2e0413e87d0da5558bf6e568ab75326799e4689 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Fri, 29 Jun 2018 10:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/BO/Bill/WeightBill/WeightBill.cs | 5 + .../OrderConfirmForm.Designer.cs | 477 +++++++++--------- .../OrderConfirm_/OrderConfirmForm.cs | 27 +- .../OrderConfirm_/OrderConfirmForm.resx | 8 +- .../PickOutConfirm.Designer.cs | 212 ++++---- .../PickOutConfirm_/PickOutConfirm.cs | 5 +- ButcherWeight/WeightForm.Designer.cs | 24 +- ButcherWeight/WeightForm.cs | 10 + 8 files changed, 432 insertions(+), 336 deletions(-) diff --git a/BO/BO/Bill/WeightBill/WeightBill.cs b/BO/BO/Bill/WeightBill/WeightBill.cs index 7e1f2a1..e4d7b7d 100644 --- a/BO/BO/Bill/WeightBill/WeightBill.cs +++ b/BO/BO/Bill/WeightBill/WeightBill.cs @@ -9,6 +9,11 @@ namespace BO.BO [Serializable] public class WeightBill { + public WeightBill() + { + LiveVarieties_ID = 1; + LiveVarieties_Name = "毛猪"; + } public int RowVersion { get; set; } public int PrintNumber { get; set; } diff --git a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.Designer.cs b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.Designer.cs index 5b89674..f724eb3 100644 --- a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.Designer.cs +++ b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.Designer.cs @@ -37,26 +37,10 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - this.queryBtn = new WinFormControl.NButton(); this.datePicker = new System.Windows.Forms.TextBox(); - this.colseBtn = new WinFormControl.NButton(); - this.uTimerLabel1 = new WinFormControl.UTimerLabel(); - this.uLabel1 = new WinFormControl.ULabel(); this.numPad = new System.Windows.Forms.FlowLayoutPanel(); - this.R_C5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.R_C4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.R_C3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.R_C2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.R_C1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.recordGrid = new WinFormControl.UDataGridView(); - this.countLbl = new WinFormControl.ULabel(); - this.uLabel3 = new WinFormControl.ULabel(); - this.uLabel2 = new WinFormControl.ULabel(); - this.numberLbl = new WinFormControl.ULabel(); - this.zeroBtn = new WinFormControl.NButton(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); - this.orderGrid = new WinFormControl.UDataGridView(); this.panel1 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.finishNumberLabel = new System.Windows.Forms.Label(); @@ -64,6 +48,23 @@ this.setTop = new System.Windows.Forms.CheckBox(); this.orderLabel = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.vScrollBar = new System.Windows.Forms.VScrollBar(); + this.queryBtn = new WinFormControl.NButton(); + this.colseBtn = new WinFormControl.NButton(); + this.uTimerLabel1 = new WinFormControl.UTimerLabel(); + this.uLabel1 = new WinFormControl.ULabel(); + this.zeroBtn = new WinFormControl.NButton(); + this.countLbl = new WinFormControl.ULabel(); + this.uLabel3 = new WinFormControl.ULabel(); + this.uLabel2 = new WinFormControl.ULabel(); + this.numberLbl = new WinFormControl.ULabel(); + this.recordGrid = new WinFormControl.UDataGridView(); + this.R_C1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.R_C2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.R_C3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.R_C4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.R_C5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.orderGrid = new WinFormControl.UDataGridView(); this.L_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.L_OrderState = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.L_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -75,14 +76,146 @@ this.L_ConfirmNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.L_Start = new System.Windows.Forms.DataGridViewButtonColumn(); this.L_End = new System.Windows.Forms.DataGridViewButtonColumn(); - ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).BeginInit(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); this.panel1.SuspendLayout(); this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); this.SuspendLayout(); // + // datePicker + // + this.datePicker.Font = new System.Drawing.Font("宋体", 15F); + this.datePicker.Location = new System.Drawing.Point(121, 24); + this.datePicker.Name = "datePicker"; + this.datePicker.ReadOnly = true; + this.datePicker.Size = new System.Drawing.Size(156, 30); + this.datePicker.TabIndex = 14; + this.datePicker.MouseDown += new System.Windows.Forms.MouseEventHandler(this.datePicker_MouseDown); + // + // numPad + // + this.numPad.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.numPad.Location = new System.Drawing.Point(-1, 220); + this.numPad.Name = "numPad"; + this.numPad.Size = new System.Drawing.Size(421, 278); + this.numPad.TabIndex = 0; + // + // panel3 + // + this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.panel3.Controls.Add(this.countLbl); + this.panel3.Controls.Add(this.uLabel3); + this.panel3.Controls.Add(this.uLabel2); + this.panel3.Controls.Add(this.numberLbl); + this.panel3.Location = new System.Drawing.Point(157, 158); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(239, 38); + this.panel3.TabIndex = 6; + // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.zeroBtn); + this.panel2.Controls.Add(this.panel3); + this.panel2.Controls.Add(this.recordGrid); + this.panel2.Controls.Add(this.numPad); + this.panel2.Location = new System.Drawing.Point(650, 72); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(421, 503); + this.panel2.TabIndex = 12; + // + // panel1 + // + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.vScrollBar); + this.panel1.Controls.Add(this.orderGrid); + this.panel1.Location = new System.Drawing.Point(12, 72); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(620, 503); + this.panel1.TabIndex = 11; + // + // panel4 + // + this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panel4.Controls.Add(this.finishNumberLabel); + this.panel4.Controls.Add(this.label4); + this.panel4.Controls.Add(this.setTop); + this.panel4.Controls.Add(this.orderLabel); + this.panel4.Controls.Add(this.label2); + this.panel4.Location = new System.Drawing.Point(402, 12); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(395, 56); + this.panel4.TabIndex = 19; + // + // finishNumberLabel + // + this.finishNumberLabel.AutoSize = true; + this.finishNumberLabel.Font = new System.Drawing.Font("宋体", 23F); + this.finishNumberLabel.ForeColor = System.Drawing.Color.Red; + this.finishNumberLabel.Location = new System.Drawing.Point(224, 12); + this.finishNumberLabel.Name = "finishNumberLabel"; + this.finishNumberLabel.Size = new System.Drawing.Size(30, 31); + this.finishNumberLabel.TabIndex = 66; + this.finishNumberLabel.Text = "0"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 15F); + this.label4.Location = new System.Drawing.Point(126, 18); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(109, 20); + this.label4.TabIndex = 65; + this.label4.Text = "已杀头数："; + // + // setTop + // + this.setTop.AutoSize = true; + this.setTop.Font = new System.Drawing.Font("宋体", 15F); + this.setTop.Location = new System.Drawing.Point(307, 16); + this.setTop.Name = "setTop"; + this.setTop.Size = new System.Drawing.Size(68, 24); + this.setTop.TabIndex = 64; + this.setTop.Text = "置顶"; + this.setTop.UseVisualStyleBackColor = true; + // + // orderLabel + // + this.orderLabel.AutoSize = true; + this.orderLabel.Font = new System.Drawing.Font("宋体", 23F); + this.orderLabel.ForeColor = System.Drawing.Color.Red; + this.orderLabel.Location = new System.Drawing.Point(63, 10); + this.orderLabel.Name = "orderLabel"; + this.orderLabel.Size = new System.Drawing.Size(30, 31); + this.orderLabel.TabIndex = 63; + this.orderLabel.Text = "0"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("宋体", 15F); + this.label2.Location = new System.Drawing.Point(5, 18); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(69, 20); + this.label2.TabIndex = 62; + this.label2.Text = "顺序："; + // + // vScrollBar + // + this.vScrollBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.vScrollBar.Location = new System.Drawing.Point(578, -2); + this.vScrollBar.Name = "vScrollBar"; + this.vScrollBar.Size = new System.Drawing.Size(40, 501); + this.vScrollBar.TabIndex = 53; + // // queryBtn // this.queryBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); @@ -100,16 +233,6 @@ this.queryBtn.UseVisualStyleBackColor = false; this.queryBtn.Click += new System.EventHandler(this.queryBtn_Click); // - // datePicker - // - this.datePicker.Font = new System.Drawing.Font("宋体", 15F); - this.datePicker.Location = new System.Drawing.Point(121, 24); - this.datePicker.Name = "datePicker"; - this.datePicker.ReadOnly = true; - this.datePicker.Size = new System.Drawing.Size(156, 30); - this.datePicker.TabIndex = 14; - this.datePicker.MouseDown += new System.Windows.Forms.MouseEventHandler(this.datePicker_MouseDown); - // // colseBtn // this.colseBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -139,7 +262,7 @@ this.uTimerLabel1.Name = "uTimerLabel1"; this.uTimerLabel1.Size = new System.Drawing.Size(152, 18); this.uTimerLabel1.TabIndex = 10; - this.uTimerLabel1.Text = "6月13日 21:39:23"; + this.uTimerLabel1.Text = "6月26日 16:16:49"; // // uLabel1 // @@ -152,89 +275,23 @@ this.uLabel1.TabIndex = 15; this.uLabel1.Text = "宰杀日期："; // - // numPad - // - this.numPad.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.numPad.Location = new System.Drawing.Point(-1, 220); - this.numPad.Name = "numPad"; - this.numPad.Size = new System.Drawing.Size(421, 278); - this.numPad.TabIndex = 0; - // - // R_C5 - // - this.R_C5.DataPropertyName = "Number5"; - this.R_C5.HeaderText = "列5"; - this.R_C5.Name = "R_C5"; - this.R_C5.ReadOnly = true; - this.R_C5.Width = 80; - // - // R_C4 - // - this.R_C4.DataPropertyName = "Number4"; - this.R_C4.HeaderText = "列4"; - this.R_C4.Name = "R_C4"; - this.R_C4.ReadOnly = true; - this.R_C4.Width = 80; - // - // R_C3 - // - this.R_C3.DataPropertyName = "Number3"; - this.R_C3.HeaderText = "列3"; - this.R_C3.Name = "R_C3"; - this.R_C3.ReadOnly = true; - this.R_C3.Width = 80; - // - // R_C2 - // - this.R_C2.DataPropertyName = "Number2"; - this.R_C2.HeaderText = "列2"; - this.R_C2.Name = "R_C2"; - this.R_C2.ReadOnly = true; - this.R_C2.Width = 80; - // - // R_C1 - // - this.R_C1.DataPropertyName = "Number1"; - this.R_C1.HeaderText = "列1"; - this.R_C1.Name = "R_C1"; - this.R_C1.ReadOnly = true; - this.R_C1.Width = 80; - // - // recordGrid + // zeroBtn // - this.recordGrid.AllowUserToAddRows = false; - this.recordGrid.AllowUserToDeleteRows = false; - this.recordGrid.AllowUserToResizeColumns = false; - this.recordGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.recordGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.recordGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); - this.recordGrid.BackgroundColor = System.Drawing.Color.White; - this.recordGrid.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.recordGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.recordGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.recordGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.R_C1, - this.R_C2, - this.R_C3, - this.R_C4, - this.R_C5}); - this.recordGrid.Location = new System.Drawing.Point(-1, -1); - this.recordGrid.MultiSelect = false; - this.recordGrid.Name = "recordGrid"; - this.recordGrid.ReadOnly = true; - this.recordGrid.RowHeadersVisible = false; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - this.recordGrid.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.recordGrid.RowTemplate.Height = 50; - this.recordGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.recordGrid.Size = new System.Drawing.Size(421, 153); - this.recordGrid.TabIndex = 1; + this.zeroBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.zeroBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.zeroBtn.ClickColor = System.Drawing.Color.YellowGreen; + this.zeroBtn.Font = new System.Drawing.Font("宋体", 15F); + this.zeroBtn.ForeColor = System.Drawing.Color.White; + this.zeroBtn.Location = new System.Drawing.Point(17, 157); + this.zeroBtn.Name = "zeroBtn"; + this.zeroBtn.PlaySound = true; + this.zeroBtn.Size = new System.Drawing.Size(100, 60); + this.zeroBtn.SoundType = WinFormControl.SoundType.Click; + this.zeroBtn.TabIndex = 7; + this.zeroBtn.Text = "0"; + this.zeroBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); + this.zeroBtn.UseVisualStyleBackColor = false; + this.zeroBtn.Click += new System.EventHandler(this.NumberBtnClick); // // countLbl // @@ -284,49 +341,81 @@ this.numberLbl.TabIndex = 4; this.numberLbl.Text = "0"; // - // zeroBtn + // recordGrid // - this.zeroBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.zeroBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); - this.zeroBtn.ClickColor = System.Drawing.Color.YellowGreen; - this.zeroBtn.Font = new System.Drawing.Font("宋体", 15F); - this.zeroBtn.ForeColor = System.Drawing.Color.White; - this.zeroBtn.Location = new System.Drawing.Point(17, 157); - this.zeroBtn.Name = "zeroBtn"; - this.zeroBtn.PlaySound = true; - this.zeroBtn.Size = new System.Drawing.Size(100, 60); - this.zeroBtn.SoundType = WinFormControl.SoundType.Click; - this.zeroBtn.TabIndex = 7; - this.zeroBtn.Text = "0"; - this.zeroBtn.ToColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(136)))), ((int)(((byte)(255))))); - this.zeroBtn.UseVisualStyleBackColor = false; - this.zeroBtn.Click += new System.EventHandler(this.NumberBtnClick); + this.recordGrid.AllowUserToAddRows = false; + this.recordGrid.AllowUserToDeleteRows = false; + this.recordGrid.AllowUserToResizeColumns = false; + this.recordGrid.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.recordGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.recordGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.recordGrid.BackgroundColor = System.Drawing.Color.White; + this.recordGrid.BorderStyle = System.Windows.Forms.BorderStyle.None; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.recordGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.recordGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.recordGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.R_C1, + this.R_C2, + this.R_C3, + this.R_C4, + this.R_C5}); + this.recordGrid.Location = new System.Drawing.Point(-1, -1); + this.recordGrid.MultiSelect = false; + this.recordGrid.Name = "recordGrid"; + this.recordGrid.ReadOnly = true; + this.recordGrid.RowHeadersVisible = false; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F); + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.recordGrid.RowsDefaultCellStyle = dataGridViewCellStyle3; + this.recordGrid.RowTemplate.Height = 50; + this.recordGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.recordGrid.Size = new System.Drawing.Size(421, 153); + this.recordGrid.TabIndex = 1; // - // panel3 + // R_C1 // - this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.panel3.Controls.Add(this.countLbl); - this.panel3.Controls.Add(this.uLabel3); - this.panel3.Controls.Add(this.uLabel2); - this.panel3.Controls.Add(this.numberLbl); - this.panel3.Location = new System.Drawing.Point(157, 158); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(239, 38); - this.panel3.TabIndex = 6; + this.R_C1.DataPropertyName = "Number1"; + this.R_C1.HeaderText = "列1"; + this.R_C1.Name = "R_C1"; + this.R_C1.ReadOnly = true; + this.R_C1.Width = 80; // - // panel2 + // R_C2 // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.zeroBtn); - this.panel2.Controls.Add(this.panel3); - this.panel2.Controls.Add(this.recordGrid); - this.panel2.Controls.Add(this.numPad); - this.panel2.Location = new System.Drawing.Point(650, 72); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(421, 503); - this.panel2.TabIndex = 12; + this.R_C2.DataPropertyName = "Number2"; + this.R_C2.HeaderText = "列2"; + this.R_C2.Name = "R_C2"; + this.R_C2.ReadOnly = true; + this.R_C2.Width = 80; + // + // R_C3 + // + this.R_C3.DataPropertyName = "Number3"; + this.R_C3.HeaderText = "列3"; + this.R_C3.Name = "R_C3"; + this.R_C3.ReadOnly = true; + this.R_C3.Width = 80; + // + // R_C4 + // + this.R_C4.DataPropertyName = "Number4"; + this.R_C4.HeaderText = "列4"; + this.R_C4.Name = "R_C4"; + this.R_C4.ReadOnly = true; + this.R_C4.Width = 80; + // + // R_C5 + // + this.R_C5.DataPropertyName = "Number5"; + this.R_C5.HeaderText = "列5"; + this.R_C5.Name = "R_C5"; + this.R_C5.ReadOnly = true; + this.R_C5.Width = 80; // // orderGrid // @@ -336,6 +425,9 @@ this.orderGrid.AllowUserToResizeRows = false; dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + this.orderGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.orderGrid.BackgroundColor = System.Drawing.Color.White; this.orderGrid.BorderStyle = System.Windows.Forms.BorderStyle.None; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; @@ -356,7 +448,6 @@ this.L_ConfirmNumber, this.L_Start, this.L_End}); - this.orderGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.orderGrid.Location = new System.Drawing.Point(0, 0); this.orderGrid.MultiSelect = false; this.orderGrid.Name = "orderGrid"; @@ -374,91 +465,14 @@ dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle9; this.orderGrid.RowTemplate.Height = 80; + this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.orderGrid.Size = new System.Drawing.Size(618, 501); + this.orderGrid.Size = new System.Drawing.Size(575, 501); this.orderGrid.TabIndex = 2; this.orderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellClick); this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick); this.orderGrid.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.orderGrid_RowPrePaint); // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.orderGrid); - this.panel1.Location = new System.Drawing.Point(12, 72); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(620, 503); - this.panel1.TabIndex = 11; - // - // panel4 - // - this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel4.Controls.Add(this.finishNumberLabel); - this.panel4.Controls.Add(this.label4); - this.panel4.Controls.Add(this.setTop); - this.panel4.Controls.Add(this.orderLabel); - this.panel4.Controls.Add(this.label2); - this.panel4.Location = new System.Drawing.Point(402, 12); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(395, 56); - this.panel4.TabIndex = 19; - // - // finishNumberLabel - // - this.finishNumberLabel.AutoSize = true; - this.finishNumberLabel.Font = new System.Drawing.Font("宋体", 23F); - this.finishNumberLabel.ForeColor = System.Drawing.Color.Red; - this.finishNumberLabel.Location = new System.Drawing.Point(224, 12); - this.finishNumberLabel.Name = "finishNumberLabel"; - this.finishNumberLabel.Size = new System.Drawing.Size(30, 31); - this.finishNumberLabel.TabIndex = 66; - this.finishNumberLabel.Text = "0"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("宋体", 15F); - this.label4.Location = new System.Drawing.Point(126, 18); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(109, 20); - this.label4.TabIndex = 65; - this.label4.Text = "已杀头数："; - // - // setTop - // - this.setTop.AutoSize = true; - this.setTop.Font = new System.Drawing.Font("宋体", 15F); - this.setTop.Location = new System.Drawing.Point(307, 16); - this.setTop.Name = "setTop"; - this.setTop.Size = new System.Drawing.Size(68, 24); - this.setTop.TabIndex = 64; - this.setTop.Text = "置顶"; - this.setTop.UseVisualStyleBackColor = true; - // - // orderLabel - // - this.orderLabel.AutoSize = true; - this.orderLabel.Font = new System.Drawing.Font("宋体", 23F); - this.orderLabel.ForeColor = System.Drawing.Color.Red; - this.orderLabel.Location = new System.Drawing.Point(63, 10); - this.orderLabel.Name = "orderLabel"; - this.orderLabel.Size = new System.Drawing.Size(30, 31); - this.orderLabel.TabIndex = 63; - this.orderLabel.Text = "0"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("宋体", 15F); - this.label2.Location = new System.Drawing.Point(5, 18); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(69, 20); - this.label2.TabIndex = 62; - this.label2.Text = "顺序："; - // // L_ID // this.L_ID.DataPropertyName = "ID"; @@ -572,14 +586,14 @@ this.Text = "上线确认"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.OrderConfirmForm_KeyPress); - ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).EndInit(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).EndInit(); this.panel1.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -625,5 +639,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn L_ConfirmNumber; private System.Windows.Forms.DataGridViewButtonColumn L_Start; private System.Windows.Forms.DataGridViewButtonColumn L_End; + private System.Windows.Forms.VScrollBar vScrollBar; } } \ No newline at end of file diff --git a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.cs b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.cs index f8ffdb7..89daa83 100644 --- a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.cs +++ b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.cs @@ -35,6 +35,7 @@ namespace ButcherManage.OrderConfirm_ List records; DateTime date = DateTime.Today; OrderDetail current; + long? lstID = null; public OrderConfirmForm() { @@ -75,10 +76,14 @@ namespace ButcherManage.OrderConfirm_ { list = OrderConfirmBL.GetOrderDetail(date).OrderBy(x => x.Order).OrderBy(x => x.Doing).ToList(); orderGrid.DataSource = list; - - current = list.FirstOrDefault(); + if (lstID.HasValue) + current = list.FirstOrDefault(x => x.ID == lstID.Value); + else + current = list.FirstOrDefault(); foreach (DataGridViewRow row in orderGrid.Rows) { + if (lstID.HasValue && lstID.Value == (long)row.Cells[0].Value) + row.Selected = true; var state = (int)row.Cells["L_OrderState"].Value; if (state == 20) { @@ -96,10 +101,24 @@ namespace ButcherManage.OrderConfirm_ } } } + InitScrollBar(); orderGrid.Refresh(); orderLabel.Text = current == null ? "0" : current.Order.ToString(); finishNumberLabel.Text = list.Where(x => x.OrderState == 20).Sum(x => x.PlanNumber).ToString(); RefreshRecordGrid(); + lstID = null; + } + + private void InitScrollBar() + { + vScrollBar.Maximum = (orderGrid.RowCount - orderGrid.DisplayedRowCount(false) + 30) * orderGrid.RowTemplate.Height; + vScrollBar.Minimum = 0; + vScrollBar.SmallChange = orderGrid.RowTemplate.Height; + vScrollBar.LargeChange = orderGrid.RowTemplate.Height * 30; + this.vScrollBar.Scroll += (sender, e) => + { + orderGrid.FirstDisplayedScrollingRowIndex = e.NewValue / orderGrid.RowTemplate.Height; + }; } private void FillNumberPad() @@ -227,10 +246,12 @@ namespace ButcherManage.OrderConfirm_ switch (e.KeyChar) { case (char)Keys.S: + case (char)115://小s start = true; code = string.Empty; break; case (char)Keys.E: + case (char)101://小e if (!start) break; InsertDetail(); @@ -242,6 +263,7 @@ namespace ButcherManage.OrderConfirm_ code += e.KeyChar.ToString(); break; } + e.Handled = true; } void InsertDetail() @@ -279,6 +301,7 @@ namespace ButcherManage.OrderConfirm_ order.Date = date; order.IsHurryButcher = true; OrderConfirmBL.InsertByHurryRecord(order, id); + lstID = order.ID; BindGrid(); } } diff --git a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.resx b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.resx index 6781870..bd635d4 100644 --- a/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.resx +++ b/ButcherManage.Form/OrderConfirm_/OrderConfirmForm.resx @@ -117,19 +117,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True True - + True - + True diff --git a/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.Designer.cs b/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.Designer.cs index f7cc676..80694ac 100644 --- a/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.Designer.cs +++ b/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.Designer.cs @@ -32,13 +32,21 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.orderGrid = new WinFormControl.UDataGridView(); + this.L_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_ConfirmState = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_AlreadyNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_Start = new System.Windows.Forms.DataGridViewButtonColumn(); + this.L_End = new System.Windows.Forms.DataGridViewButtonColumn(); this.panel2 = new System.Windows.Forms.Panel(); this.zeroBtn = new WinFormControl.NButton(); this.panel3 = new System.Windows.Forms.Panel(); @@ -60,19 +68,15 @@ this.queryBtn = new WinFormControl.NButton(); this.uLabel4 = new WinFormControl.ULabel(); this.orderLbl = new WinFormControl.ULabel(); - this.L_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_ConfirmState = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_AlreadyNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_Start = new System.Windows.Forms.DataGridViewButtonColumn(); - this.L_End = new System.Windows.Forms.DataGridViewButtonColumn(); + this.panel4 = new System.Windows.Forms.Panel(); + this.finishNumberLabel = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).BeginInit(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // panel1 @@ -137,6 +141,76 @@ this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick); this.orderGrid.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.orderGrid_RowPrePaint); // + // L_ID + // + this.L_ID.DataPropertyName = "ID"; + this.L_ID.HeaderText = "ID"; + this.L_ID.Name = "L_ID"; + this.L_ID.ReadOnly = true; + this.L_ID.Visible = false; + // + // L_ConfirmState + // + this.L_ConfirmState.DataPropertyName = "ConfirmState"; + this.L_ConfirmState.HeaderText = "ConfirmState"; + this.L_ConfirmState.Name = "L_ConfirmState"; + this.L_ConfirmState.ReadOnly = true; + this.L_ConfirmState.Visible = false; + // + // L_Order + // + this.L_Order.DataPropertyName = "Order"; + this.L_Order.HeaderText = "顺序"; + this.L_Order.Name = "L_Order"; + this.L_Order.ReadOnly = true; + // + // L_PlanNumber + // + this.L_PlanNumber.DataPropertyName = "PlanNumber"; + this.L_PlanNumber.HeaderText = "排宰头数"; + this.L_PlanNumber.Name = "L_PlanNumber"; + this.L_PlanNumber.ReadOnly = true; + // + // L_LiveColonyHouse_Name + // + this.L_LiveColonyHouse_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.L_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name"; + this.L_LiveColonyHouse_Name.HeaderText = "圈舍"; + this.L_LiveColonyHouse_Name.MinimumWidth = 200; + this.L_LiveColonyHouse_Name.Name = "L_LiveColonyHouse_Name"; + this.L_LiveColonyHouse_Name.ReadOnly = true; + // + // L_AlreadyNumber + // + this.L_AlreadyNumber.DataPropertyName = "AlreadyNumber"; + this.L_AlreadyNumber.HeaderText = "确认头数"; + this.L_AlreadyNumber.Name = "L_AlreadyNumber"; + this.L_AlreadyNumber.ReadOnly = true; + // + // L_Start + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.L_Start.DefaultCellStyle = dataGridViewCellStyle3; + this.L_Start.HeaderText = "开始"; + this.L_Start.Name = "L_Start"; + this.L_Start.ReadOnly = true; + this.L_Start.Text = "开始"; + this.L_Start.UseColumnTextForButtonValue = true; + this.L_Start.Width = 140; + // + // L_End + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.L_End.DefaultCellStyle = dataGridViewCellStyle4; + this.L_End.HeaderText = "结束"; + this.L_End.Name = "L_End"; + this.L_End.ReadOnly = true; + this.L_End.Text = "结束"; + this.L_End.UseColumnTextForButtonValue = true; + this.L_End.Width = 140; + // // panel2 // this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -340,9 +414,9 @@ this.uTimerLabel1.Format = "M月d日 H:mm:ss"; this.uTimerLabel1.Location = new System.Drawing.Point(727, 22); this.uTimerLabel1.Name = "uTimerLabel1"; - this.uTimerLabel1.Size = new System.Drawing.Size(152, 18); + this.uTimerLabel1.Size = new System.Drawing.Size(143, 18); this.uTimerLabel1.TabIndex = 0; - this.uTimerLabel1.Text = "6月13日 16:44:14"; + this.uTimerLabel1.Text = "6月28日 9:56:27"; // // datePicker // @@ -388,7 +462,7 @@ this.uLabel4.BackColor = System.Drawing.Color.Transparent; this.uLabel4.Font = new System.Drawing.Font("宋体", 15F); this.uLabel4.ForeColor = System.Drawing.SystemColors.ControlText; - this.uLabel4.Location = new System.Drawing.Point(413, 27); + this.uLabel4.Location = new System.Drawing.Point(12, 19); this.uLabel4.Name = "uLabel4"; this.uLabel4.Size = new System.Drawing.Size(109, 20); this.uLabel4.TabIndex = 8; @@ -400,81 +474,43 @@ this.orderLbl.BackColor = System.Drawing.Color.Transparent; this.orderLbl.Font = new System.Drawing.Font("宋体", 23F); this.orderLbl.ForeColor = System.Drawing.Color.Red; - this.orderLbl.Location = new System.Drawing.Point(516, 19); + this.orderLbl.Location = new System.Drawing.Point(115, 11); this.orderLbl.Name = "orderLbl"; this.orderLbl.Size = new System.Drawing.Size(30, 31); this.orderLbl.TabIndex = 9; this.orderLbl.Text = "0"; // - // L_ID - // - this.L_ID.DataPropertyName = "ID"; - this.L_ID.HeaderText = "ID"; - this.L_ID.Name = "L_ID"; - this.L_ID.ReadOnly = true; - this.L_ID.Visible = false; - // - // L_ConfirmState - // - this.L_ConfirmState.DataPropertyName = "ConfirmState"; - this.L_ConfirmState.HeaderText = "ConfirmState"; - this.L_ConfirmState.Name = "L_ConfirmState"; - this.L_ConfirmState.ReadOnly = true; - this.L_ConfirmState.Visible = false; - // - // L_Order - // - this.L_Order.DataPropertyName = "Order"; - this.L_Order.HeaderText = "顺序"; - this.L_Order.Name = "L_Order"; - this.L_Order.ReadOnly = true; - // - // L_PlanNumber - // - this.L_PlanNumber.DataPropertyName = "PlanNumber"; - this.L_PlanNumber.HeaderText = "排宰头数"; - this.L_PlanNumber.Name = "L_PlanNumber"; - this.L_PlanNumber.ReadOnly = true; - // - // L_LiveColonyHouse_Name - // - this.L_LiveColonyHouse_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.L_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name"; - this.L_LiveColonyHouse_Name.HeaderText = "圈舍"; - this.L_LiveColonyHouse_Name.MinimumWidth = 200; - this.L_LiveColonyHouse_Name.Name = "L_LiveColonyHouse_Name"; - this.L_LiveColonyHouse_Name.ReadOnly = true; - // - // L_AlreadyNumber - // - this.L_AlreadyNumber.DataPropertyName = "AlreadyNumber"; - this.L_AlreadyNumber.HeaderText = "确认头数"; - this.L_AlreadyNumber.Name = "L_AlreadyNumber"; - this.L_AlreadyNumber.ReadOnly = true; - // - // L_Start - // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); - this.L_Start.DefaultCellStyle = dataGridViewCellStyle3; - this.L_Start.HeaderText = "开始"; - this.L_Start.Name = "L_Start"; - this.L_Start.ReadOnly = true; - this.L_Start.Text = "开始"; - this.L_Start.UseColumnTextForButtonValue = true; - this.L_Start.Width = 140; - // - // L_End - // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); - this.L_End.DefaultCellStyle = dataGridViewCellStyle4; - this.L_End.HeaderText = "结束"; - this.L_End.Name = "L_End"; - this.L_End.ReadOnly = true; - this.L_End.Text = "结束"; - this.L_End.UseColumnTextForButtonValue = true; - this.L_End.Width = 140; + // panel4 + // + this.panel4.Controls.Add(this.finishNumberLabel); + this.panel4.Controls.Add(this.orderLbl); + this.panel4.Controls.Add(this.label4); + this.panel4.Controls.Add(this.uLabel4); + this.panel4.Location = new System.Drawing.Point(402, 7); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(336, 52); + this.panel4.TabIndex = 10; + // + // finishNumberLabel + // + this.finishNumberLabel.AutoSize = true; + this.finishNumberLabel.Font = new System.Drawing.Font("宋体", 23F); + this.finishNumberLabel.ForeColor = System.Drawing.Color.Red; + this.finishNumberLabel.Location = new System.Drawing.Point(276, 13); + this.finishNumberLabel.Name = "finishNumberLabel"; + this.finishNumberLabel.Size = new System.Drawing.Size(30, 31); + this.finishNumberLabel.TabIndex = 68; + this.finishNumberLabel.Text = "0"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 15F); + this.label4.Location = new System.Drawing.Point(178, 19); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(109, 20); + this.label4.TabIndex = 67; + this.label4.Text = "已杀头数："; // // PickOutConfirm // @@ -482,14 +518,13 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(1022, 591); - this.Controls.Add(this.orderLbl); - this.Controls.Add(this.uLabel4); + this.Controls.Add(this.uTimerLabel1); + this.Controls.Add(this.panel4); this.Controls.Add(this.queryBtn); this.Controls.Add(this.datePicker); this.Controls.Add(this.colseBtn); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); - this.Controls.Add(this.uTimerLabel1); this.Controls.Add(this.uLabel1); this.Name = "PickOutConfirm"; this.Text = "赶猪确认"; @@ -500,6 +535,8 @@ this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.recordGrid)).EndInit(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -538,5 +575,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn L_AlreadyNumber; private System.Windows.Forms.DataGridViewButtonColumn L_Start; private System.Windows.Forms.DataGridViewButtonColumn L_End; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Label finishNumberLabel; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.cs b/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.cs index d0aff1a..d08d0c1 100644 --- a/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.cs +++ b/ButcherManage.Form/PickOutConfirm_/PickOutConfirm.cs @@ -109,6 +109,7 @@ namespace ButcherManage.PickOutConfirm_ } } orderGrid.Refresh(); + finishNumberLabel.Text = list.Sum(x => x.AlreadyNumber ?? 0).ToString(); } private void FillNumberPad() @@ -168,7 +169,9 @@ namespace ButcherManage.PickOutConfirm_ } recordGrid.Rows[records.Count / 5].Cells[row].Selected = true; BindLabel(); - orderGrid.CurrentRow.Cells["L_AlreadyNumber"].Value = records.Sum(x => x.Number ?? 0); + var currentTotal = records.Sum(x => x.Number ?? 0); + orderGrid.CurrentRow.Cells["L_AlreadyNumber"].Value = currentTotal; + finishNumberLabel.Text = (list.Where(x => x.ID != detail.Order_ID).Sum(x => x.AlreadyNumber ?? 0) + currentTotal).ToString(); } void BindRecorGrid() diff --git a/ButcherWeight/WeightForm.Designer.cs b/ButcherWeight/WeightForm.Designer.cs index f86995b..9722cf4 100644 --- a/ButcherWeight/WeightForm.Designer.cs +++ b/ButcherWeight/WeightForm.Designer.cs @@ -176,10 +176,10 @@ this.totalNumLbl = new System.Windows.Forms.Label(); this.label32 = new System.Windows.Forms.Label(); this.msgGrid = new System.Windows.Forms.DataGridView(); - this.label27 = new System.Windows.Forms.Label(); this.msg_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.msg_Car_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.msg_Supplier_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label27 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.farmerGrid)).BeginInit(); @@ -1583,17 +1583,6 @@ this.msgGrid.TabIndex = 53; this.msgGrid.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.msgGrid_CellDoubleClick); // - // label27 - // - this.label27.AutoSize = true; - this.label27.Font = new System.Drawing.Font("宋体", 15F); - this.label27.ForeColor = System.Drawing.Color.Red; - this.label27.Location = new System.Drawing.Point(857, 424); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(89, 20); - this.label27.TabIndex = 54; - this.label27.Text = "我的待办"; - // // msg_WeightBill_ID // this.msg_WeightBill_ID.DataPropertyName = "WeightBill_ID"; @@ -1618,6 +1607,17 @@ this.msg_Supplier_Name.Name = "msg_Supplier_Name"; this.msg_Supplier_Name.ReadOnly = true; // + // label27 + // + this.label27.AutoSize = true; + this.label27.Font = new System.Drawing.Font("宋体", 15F); + this.label27.ForeColor = System.Drawing.Color.Red; + this.label27.Location = new System.Drawing.Point(857, 424); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(89, 20); + this.label27.TabIndex = 54; + this.label27.Text = "我的待办"; + // // WeightForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/ButcherWeight/WeightForm.cs b/ButcherWeight/WeightForm.cs index 4ba576e..f9043dd 100644 --- a/ButcherWeight/WeightForm.cs +++ b/ButcherWeight/WeightForm.cs @@ -85,6 +85,7 @@ namespace ButcherWeight private void WeightForm_Load(object sender, EventArgs e) { + liveVarietiesSelect.Fill("毛猪", "1"); BindWeightBill(); syncMsg = new Thread(BindMsgGrid); syncMsg.Start(); @@ -292,6 +293,11 @@ namespace ButcherWeight { Dmo.Employee_ID = employeeSelect.LongValue; Dmo.Employee_Name = employeeSelect.DisplayValue; + if (Dmo.Employee_ID == null) + { + Dmo.Employee_ID = 1; + Dmo.Employee_Name = "王新辉"; + } Dmo.WeighTime = weightTimeSelect.Date; Dmo.Supplier_ID = supplierSelect.LongValue; Dmo.Supplier_Name = supplierSelect.DisplayValue; @@ -485,6 +491,8 @@ namespace ButcherWeight private void deleteBtn_Click(object sender, EventArgs e) { + if (MessageBox.Show("确定删除当前过磅单？", "删除确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) != DialogResult.OK) + return; if (Dmo.ID == 0) throw new Exception("无效的单据"); WeightBillRpc.Delete(Dmo.ID); @@ -586,6 +594,8 @@ namespace ButcherWeight private void printBtn_Click(object sender, EventArgs e) { + if (MessageBox.Show("确定打印当前过磅单？", "打印确认", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) != DialogResult.OK) + return; if (Dmo.ID == 0) throw new Exception("请先保存"); if (string.IsNullOrEmpty(Dmo.BankAccount))