From 81ceddd1d8728d2c5b2150aae181b1c85c0a8515 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Wed, 28 Feb 2018 11:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=B4=E4=BD=93=E6=89=93=E7=BA=A7=20?= =?UTF-8?q?=E5=8A=A0=E7=A3=85=E5=8D=95=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/BO/Bill/GradeAndWeight/DataConfirmList.cs | 1 + BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs | 2 + WeighAndGrading/DataConfirm.Designer.cs | 311 +++++++------- WeighAndGrading/DataConfirm.resx | 3 + WeighAndGrading/DataViewForm.Designer.cs | 430 ++++++++++--------- WeighAndGrading/DataViewForm.resx | 6 + WeighAndGrading/GradeFrom.Designer.cs | 308 +++++++------ WeighAndGrading/GradeFrom.resx | 120 +----- 8 files changed, 571 insertions(+), 610 deletions(-) diff --git a/BO/BO/Bill/GradeAndWeight/DataConfirmList.cs b/BO/BO/Bill/GradeAndWeight/DataConfirmList.cs index bf6d868..ebc5232 100644 --- a/BO/BO/Bill/GradeAndWeight/DataConfirmList.cs +++ b/BO/BO/Bill/GradeAndWeight/DataConfirmList.cs @@ -8,6 +8,7 @@ namespace BO.BO.Bill { public class DataConfirmList { + public long? WeightID { get; set; } public int Order { get; set; } public int PlanNumber { get; set; } diff --git a/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs b/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs index 9f62d3b..9fd7d3a 100644 --- a/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs +++ b/BO/BO/Bill/GradeAndWeight/GradeAndWeight.cs @@ -8,6 +8,8 @@ namespace BO.BO.Bill { public class GradeAndWeight { + public long? WeightID { get; set; } + public long OrderDetail_ID { get; set; } public int Order { get; set; } diff --git a/WeighAndGrading/DataConfirm.Designer.cs b/WeighAndGrading/DataConfirm.Designer.cs index b6d8b3e..8b56f5e 100644 --- a/WeighAndGrading/DataConfirm.Designer.cs +++ b/WeighAndGrading/DataConfirm.Designer.cs @@ -48,14 +48,20 @@ this.rightIndex = new BWP.WinFormControl.UTextBoxWithPad(); this.label4 = new System.Windows.Forms.Label(); this.orderGridView = new BWP.WinFormControl.UDataGridView(); - this.L_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_HotFadeNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.L_MaoNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.rightVScrollBar = new System.Windows.Forms.VScrollBar(); this.ttPanel = new System.Windows.Forms.FlowLayoutPanel(); this.mbPanel = new System.Windows.Forms.FlowLayoutPanel(); this.weightGrid = new BWP.WinFormControl.UDataGridView(); + this.H_SID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Technics = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Livestock_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Technics_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Livestock_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Time = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.H_Save = new System.Windows.Forms.DataGridViewButtonColumn(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.tangNumber = new System.Windows.Forms.Label(); @@ -69,16 +75,11 @@ this.tangBtn = new System.Windows.Forms.Button(); this.maoBtn = new System.Windows.Forms.Button(); this.leftVScrollBar = new System.Windows.Forms.VScrollBar(); - this.H_SID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Technics = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Livestock_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Technics_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Livestock_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Time = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.H_Save = new System.Windows.Forms.DataGridViewButtonColumn(); + this.L_WeightID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_HotFadeNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.L_MaoNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.orderGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.weightGrid)).BeginInit(); this.SuspendLayout(); @@ -140,7 +141,7 @@ // rightOrder // this.rightOrder.Font = new System.Drawing.Font("宋体", 20F); - this.rightOrder.Location = new System.Drawing.Point(936, 18); + this.rightOrder.Location = new System.Drawing.Point(952, 18); this.rightOrder.Name = "rightOrder"; this.rightOrder.Size = new System.Drawing.Size(100, 38); this.rightOrder.TabIndex = 10; @@ -150,7 +151,7 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 15F); - this.label3.Location = new System.Drawing.Point(841, 27); + this.label3.Location = new System.Drawing.Point(857, 27); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(89, 20); this.label3.TabIndex = 9; @@ -159,7 +160,7 @@ // rightBtn // this.rightBtn.Font = new System.Drawing.Font("宋体", 15F); - this.rightBtn.Location = new System.Drawing.Point(1294, 15); + this.rightBtn.Location = new System.Drawing.Point(1310, 15); this.rightBtn.Name = "rightBtn"; this.rightBtn.Size = new System.Drawing.Size(149, 41); this.rightBtn.TabIndex = 8; @@ -170,7 +171,7 @@ // rightIndex // this.rightIndex.Font = new System.Drawing.Font("宋体", 20F); - this.rightIndex.Location = new System.Drawing.Point(1154, 18); + this.rightIndex.Location = new System.Drawing.Point(1170, 18); this.rightIndex.Name = "rightIndex"; this.rightIndex.Size = new System.Drawing.Size(100, 38); this.rightIndex.TabIndex = 12; @@ -180,7 +181,7 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("宋体", 15F); - this.label4.Location = new System.Drawing.Point(1072, 27); + this.label4.Location = new System.Drawing.Point(1088, 27); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(69, 20); this.label4.TabIndex = 11; @@ -205,6 +206,7 @@ this.orderGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.orderGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.L_WeightID, this.L_Order, this.L_PlanNumber, this.L_HotFadeNumber, @@ -222,59 +224,27 @@ this.orderGridView.RowTemplate.Height = 60; this.orderGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.orderGridView.Size = new System.Drawing.Size(368, 617); + this.orderGridView.Size = new System.Drawing.Size(446, 617); this.orderGridView.TabIndex = 13; this.orderGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGridView_CellClick); // - // L_Order - // - this.L_Order.DataPropertyName = "Order"; - this.L_Order.HeaderText = "顺序号"; - this.L_Order.Name = "L_Order"; - this.L_Order.ReadOnly = true; - this.L_Order.Width = 95; - // - // L_PlanNumber - // - this.L_PlanNumber.DataPropertyName = "PlanNumber"; - this.L_PlanNumber.HeaderText = "头数"; - this.L_PlanNumber.Name = "L_PlanNumber"; - this.L_PlanNumber.ReadOnly = true; - this.L_PlanNumber.Width = 90; - // - // L_HotFadeNumber - // - this.L_HotFadeNumber.DataPropertyName = "HotFadeNumber"; - this.L_HotFadeNumber.HeaderText = "烫褪"; - this.L_HotFadeNumber.Name = "L_HotFadeNumber"; - this.L_HotFadeNumber.ReadOnly = true; - this.L_HotFadeNumber.Width = 90; - // - // L_MaoNumber - // - this.L_MaoNumber.DataPropertyName = "MaoNumber"; - this.L_MaoNumber.HeaderText = "毛剥"; - this.L_MaoNumber.Name = "L_MaoNumber"; - this.L_MaoNumber.ReadOnly = true; - this.L_MaoNumber.Width = 90; - // // rightVScrollBar // - this.rightVScrollBar.Location = new System.Drawing.Point(1403, 185); + this.rightVScrollBar.Location = new System.Drawing.Point(1419, 185); this.rightVScrollBar.Name = "rightVScrollBar"; this.rightVScrollBar.Size = new System.Drawing.Size(40, 525); this.rightVScrollBar.TabIndex = 52; // // ttPanel // - this.ttPanel.Location = new System.Drawing.Point(461, 116); + this.ttPanel.Location = new System.Drawing.Point(513, 116); this.ttPanel.Name = "ttPanel"; this.ttPanel.Size = new System.Drawing.Size(337, 276); this.ttPanel.TabIndex = 53; // // mbPanel // - this.mbPanel.Location = new System.Drawing.Point(461, 432); + this.mbPanel.Location = new System.Drawing.Point(513, 432); this.mbPanel.Name = "mbPanel"; this.mbPanel.Size = new System.Drawing.Size(337, 278); this.mbPanel.TabIndex = 54; @@ -308,7 +278,7 @@ this.H_Weight, this.H_Time, this.H_Save}); - this.weightGrid.Location = new System.Drawing.Point(843, 185); + this.weightGrid.Location = new System.Drawing.Point(859, 185); this.weightGrid.MultiSelect = false; this.weightGrid.Name = "weightGrid"; this.weightGrid.ReadOnly = true; @@ -324,11 +294,98 @@ this.weightGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.weightGrid_CellClick); this.weightGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.weightGrid_CellContentClick); // + // H_SID + // + this.H_SID.DataPropertyName = "SID"; + this.H_SID.HeaderText = "SID"; + this.H_SID.Name = "H_SID"; + this.H_SID.ReadOnly = true; + this.H_SID.Visible = false; + // + // H_Technics + // + this.H_Technics.DataPropertyName = "Technics"; + this.H_Technics.HeaderText = "Technics"; + this.H_Technics.Name = "H_Technics"; + this.H_Technics.ReadOnly = true; + this.H_Technics.Visible = false; + // + // H_Livestock_ID + // + this.H_Livestock_ID.DataPropertyName = "Livestock_ID"; + this.H_Livestock_ID.HeaderText = "Livestock_ID"; + this.H_Livestock_ID.Name = "H_Livestock_ID"; + this.H_Livestock_ID.ReadOnly = true; + this.H_Livestock_ID.Visible = false; + // + // H_Index + // + this.H_Index.DataPropertyName = "Index"; + this.H_Index.HeaderText = "序号"; + this.H_Index.Name = "H_Index"; + this.H_Index.ReadOnly = true; + this.H_Index.Width = 65; + // + // H_Order + // + this.H_Order.DataPropertyName = "Order"; + this.H_Order.HeaderText = "顺序"; + this.H_Order.Name = "H_Order"; + this.H_Order.ReadOnly = true; + this.H_Order.Width = 65; + // + // H_Technics_Name + // + this.H_Technics_Name.DataPropertyName = "Technics_Name"; + this.H_Technics_Name.HeaderText = "工艺"; + this.H_Technics_Name.Name = "H_Technics_Name"; + this.H_Technics_Name.ReadOnly = true; + this.H_Technics_Name.Width = 65; + // + // H_Livestock_Name + // + this.H_Livestock_Name.DataPropertyName = "Livestock_Name"; + this.H_Livestock_Name.HeaderText = "级别"; + this.H_Livestock_Name.Name = "H_Livestock_Name"; + this.H_Livestock_Name.ReadOnly = true; + this.H_Livestock_Name.Width = 90; + // + // H_Weight + // + this.H_Weight.DataPropertyName = "Weight"; + dataGridViewCellStyle6.Format = "#0.######"; + this.H_Weight.DefaultCellStyle = dataGridViewCellStyle6; + this.H_Weight.HeaderText = "重量"; + this.H_Weight.Name = "H_Weight"; + this.H_Weight.ReadOnly = true; + this.H_Weight.Width = 70; + // + // H_Time + // + this.H_Time.DataPropertyName = "Time"; + dataGridViewCellStyle7.Format = "HH:mm:ss"; + dataGridViewCellStyle7.NullValue = null; + this.H_Time.DefaultCellStyle = dataGridViewCellStyle7; + this.H_Time.HeaderText = "时间"; + this.H_Time.Name = "H_Time"; + this.H_Time.ReadOnly = true; + // + // H_Save + // + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.H_Save.DefaultCellStyle = dataGridViewCellStyle8; + this.H_Save.HeaderText = "保存"; + this.H_Save.Name = "H_Save"; + this.H_Save.ReadOnly = true; + this.H_Save.Text = "保存"; + this.H_Save.UseColumnTextForButtonValue = true; + // // label5 // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 15F); - this.label5.Location = new System.Drawing.Point(841, 75); + this.label5.Location = new System.Drawing.Point(857, 75); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(69, 20); this.label5.TabIndex = 56; @@ -338,7 +395,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 15F); - this.label6.Location = new System.Drawing.Point(1036, 78); + this.label6.Location = new System.Drawing.Point(1052, 78); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(69, 20); this.label6.TabIndex = 57; @@ -349,7 +406,7 @@ this.tangNumber.AutoSize = true; this.tangNumber.Font = new System.Drawing.Font("宋体", 18F); this.tangNumber.ForeColor = System.Drawing.Color.Red; - this.tangNumber.Location = new System.Drawing.Point(911, 74); + this.tangNumber.Location = new System.Drawing.Point(927, 74); this.tangNumber.Name = "tangNumber"; this.tangNumber.Size = new System.Drawing.Size(22, 24); this.tangNumber.TabIndex = 58; @@ -360,7 +417,7 @@ this.maoNumber.AutoSize = true; this.maoNumber.Font = new System.Drawing.Font("宋体", 18F); this.maoNumber.ForeColor = System.Drawing.Color.Red; - this.maoNumber.Location = new System.Drawing.Point(1101, 75); + this.maoNumber.Location = new System.Drawing.Point(1117, 75); this.maoNumber.Name = "maoNumber"; this.maoNumber.Size = new System.Drawing.Size(22, 24); this.maoNumber.TabIndex = 59; @@ -371,7 +428,7 @@ this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 15F); this.label7.ForeColor = System.Drawing.Color.Red; - this.label7.Location = new System.Drawing.Point(465, 91); + this.label7.Location = new System.Drawing.Point(516, 91); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(69, 20); this.label7.TabIndex = 60; @@ -382,7 +439,7 @@ this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("宋体", 15F); this.label8.ForeColor = System.Drawing.Color.Red; - this.label8.Location = new System.Drawing.Point(465, 407); + this.label8.Location = new System.Drawing.Point(516, 407); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(69, 20); this.label8.TabIndex = 61; @@ -391,7 +448,7 @@ // AddBtn // this.AddBtn.Font = new System.Drawing.Font("宋体", 15F); - this.AddBtn.Location = new System.Drawing.Point(1294, 73); + this.AddBtn.Location = new System.Drawing.Point(1310, 73); this.AddBtn.Name = "AddBtn"; this.AddBtn.Size = new System.Drawing.Size(149, 39); this.AddBtn.TabIndex = 62; @@ -402,7 +459,7 @@ // deleteBtn // this.deleteBtn.Font = new System.Drawing.Font("宋体", 15F); - this.deleteBtn.Location = new System.Drawing.Point(1294, 128); + this.deleteBtn.Location = new System.Drawing.Point(1310, 128); this.deleteBtn.Name = "deleteBtn"; this.deleteBtn.Size = new System.Drawing.Size(149, 39); this.deleteBtn.TabIndex = 63; @@ -415,7 +472,7 @@ this.tangW.AutoSize = true; this.tangW.Font = new System.Drawing.Font("宋体", 18F); this.tangW.ForeColor = System.Drawing.Color.Red; - this.tangW.Location = new System.Drawing.Point(888, 108); + this.tangW.Location = new System.Drawing.Point(904, 108); this.tangW.Name = "tangW"; this.tangW.Size = new System.Drawing.Size(22, 24); this.tangW.TabIndex = 66; @@ -426,7 +483,7 @@ this.maoW.AutoSize = true; this.maoW.Font = new System.Drawing.Font("宋体", 18F); this.maoW.ForeColor = System.Drawing.Color.Red; - this.maoW.Location = new System.Drawing.Point(1073, 108); + this.maoW.Location = new System.Drawing.Point(1089, 108); this.maoW.Name = "maoW"; this.maoW.Size = new System.Drawing.Size(22, 24); this.maoW.TabIndex = 67; @@ -435,7 +492,7 @@ // tangBtn // this.tangBtn.Font = new System.Drawing.Font("宋体", 15F); - this.tangBtn.Location = new System.Drawing.Point(842, 140); + this.tangBtn.Location = new System.Drawing.Point(858, 140); this.tangBtn.Name = "tangBtn"; this.tangBtn.Size = new System.Drawing.Size(149, 39); this.tangBtn.TabIndex = 68; @@ -446,7 +503,7 @@ // maoBtn // this.maoBtn.Font = new System.Drawing.Font("宋体", 15F); - this.maoBtn.Location = new System.Drawing.Point(1037, 140); + this.maoBtn.Location = new System.Drawing.Point(1053, 140); this.maoBtn.Name = "maoBtn"; this.maoBtn.Size = new System.Drawing.Size(149, 39); this.maoBtn.TabIndex = 69; @@ -456,97 +513,50 @@ // // leftVScrollBar // - this.leftVScrollBar.Location = new System.Drawing.Point(384, 93); + this.leftVScrollBar.Location = new System.Drawing.Point(465, 93); this.leftVScrollBar.Name = "leftVScrollBar"; this.leftVScrollBar.Size = new System.Drawing.Size(40, 617); this.leftVScrollBar.TabIndex = 70; // - // H_SID - // - this.H_SID.DataPropertyName = "SID"; - this.H_SID.HeaderText = "SID"; - this.H_SID.Name = "H_SID"; - this.H_SID.ReadOnly = true; - this.H_SID.Visible = false; + // L_WeightID // - // H_Technics + this.L_WeightID.DataPropertyName = "WeightID"; + this.L_WeightID.HeaderText = "磅单号"; + this.L_WeightID.Name = "L_WeightID"; + this.L_WeightID.ReadOnly = true; + this.L_WeightID.Width = 90; // - this.H_Technics.DataPropertyName = "Technics"; - this.H_Technics.HeaderText = "Technics"; - this.H_Technics.Name = "H_Technics"; - this.H_Technics.ReadOnly = true; - this.H_Technics.Visible = false; - // - // H_Livestock_ID - // - this.H_Livestock_ID.DataPropertyName = "Livestock_ID"; - this.H_Livestock_ID.HeaderText = "Livestock_ID"; - this.H_Livestock_ID.Name = "H_Livestock_ID"; - this.H_Livestock_ID.ReadOnly = true; - this.H_Livestock_ID.Visible = false; - // - // H_Index - // - this.H_Index.DataPropertyName = "Index"; - this.H_Index.HeaderText = "序号"; - this.H_Index.Name = "H_Index"; - this.H_Index.ReadOnly = true; - this.H_Index.Width = 65; - // - // H_Order - // - this.H_Order.DataPropertyName = "Order"; - this.H_Order.HeaderText = "顺序"; - this.H_Order.Name = "H_Order"; - this.H_Order.ReadOnly = true; - this.H_Order.Width = 65; - // - // H_Technics_Name - // - this.H_Technics_Name.DataPropertyName = "Technics_Name"; - this.H_Technics_Name.HeaderText = "工艺"; - this.H_Technics_Name.Name = "H_Technics_Name"; - this.H_Technics_Name.ReadOnly = true; - this.H_Technics_Name.Width = 65; - // - // H_Livestock_Name + // L_Order // - this.H_Livestock_Name.DataPropertyName = "Livestock_Name"; - this.H_Livestock_Name.HeaderText = "级别"; - this.H_Livestock_Name.Name = "H_Livestock_Name"; - this.H_Livestock_Name.ReadOnly = true; - this.H_Livestock_Name.Width = 90; + this.L_Order.DataPropertyName = "Order"; + this.L_Order.HeaderText = "顺序号"; + this.L_Order.Name = "L_Order"; + this.L_Order.ReadOnly = true; + this.L_Order.Width = 90; // - // H_Weight + // L_PlanNumber // - this.H_Weight.DataPropertyName = "Weight"; - dataGridViewCellStyle6.Format = "#0.######"; - this.H_Weight.DefaultCellStyle = dataGridViewCellStyle6; - this.H_Weight.HeaderText = "重量"; - this.H_Weight.Name = "H_Weight"; - this.H_Weight.ReadOnly = true; - this.H_Weight.Width = 70; + this.L_PlanNumber.DataPropertyName = "PlanNumber"; + this.L_PlanNumber.HeaderText = "头数"; + this.L_PlanNumber.Name = "L_PlanNumber"; + this.L_PlanNumber.ReadOnly = true; + this.L_PlanNumber.Width = 90; // - // H_Time + // L_HotFadeNumber // - this.H_Time.DataPropertyName = "Time"; - dataGridViewCellStyle7.Format = "HH:mm:ss"; - dataGridViewCellStyle7.NullValue = null; - this.H_Time.DefaultCellStyle = dataGridViewCellStyle7; - this.H_Time.HeaderText = "时间"; - this.H_Time.Name = "H_Time"; - this.H_Time.ReadOnly = true; + this.L_HotFadeNumber.DataPropertyName = "HotFadeNumber"; + this.L_HotFadeNumber.HeaderText = "烫褪"; + this.L_HotFadeNumber.Name = "L_HotFadeNumber"; + this.L_HotFadeNumber.ReadOnly = true; + this.L_HotFadeNumber.Width = 85; // - // H_Save + // L_MaoNumber // - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); - this.H_Save.DefaultCellStyle = dataGridViewCellStyle8; - this.H_Save.HeaderText = "保存"; - this.H_Save.Name = "H_Save"; - this.H_Save.ReadOnly = true; - this.H_Save.Text = "保存"; - this.H_Save.UseColumnTextForButtonValue = true; + this.L_MaoNumber.DataPropertyName = "MaoNumber"; + this.L_MaoNumber.HeaderText = "毛剥"; + this.L_MaoNumber.Name = "L_MaoNumber"; + this.L_MaoNumber.ReadOnly = true; + this.L_MaoNumber.Width = 85; // // DataConfirm // @@ -610,10 +620,6 @@ private System.Windows.Forms.FlowLayoutPanel ttPanel; private System.Windows.Forms.FlowLayoutPanel mbPanel; private BWP.WinFormControl.UDataGridView weightGrid; - private System.Windows.Forms.DataGridViewTextBoxColumn L_Order; - private System.Windows.Forms.DataGridViewTextBoxColumn L_PlanNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn L_HotFadeNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn L_MaoNumber; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label tangNumber; @@ -637,5 +643,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn H_Weight; private System.Windows.Forms.DataGridViewTextBoxColumn H_Time; private System.Windows.Forms.DataGridViewButtonColumn H_Save; + private System.Windows.Forms.DataGridViewTextBoxColumn L_WeightID; + private System.Windows.Forms.DataGridViewTextBoxColumn L_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn L_PlanNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn L_HotFadeNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn L_MaoNumber; } } \ No newline at end of file diff --git a/WeighAndGrading/DataConfirm.resx b/WeighAndGrading/DataConfirm.resx index 6280e9b..37d1942 100644 --- a/WeighAndGrading/DataConfirm.resx +++ b/WeighAndGrading/DataConfirm.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True diff --git a/WeighAndGrading/DataViewForm.Designer.cs b/WeighAndGrading/DataViewForm.Designer.cs index e5a14b8..34067f1 100644 --- a/WeighAndGrading/DataViewForm.Designer.cs +++ b/WeighAndGrading/DataViewForm.Designer.cs @@ -28,17 +28,17 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.H_Livestock_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.H_IsDrop = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.H_Technics = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -51,6 +51,10 @@ this.butcherTimeInput = new BWP.WinFormControl.UDatePicker(); this.stateLabel = new System.Windows.Forms.Label(); this.modifyPanel = new System.Windows.Forms.Panel(); + this.flagLabel = new System.Windows.Forms.Label(); + this.withOkPanel = new System.Windows.Forms.Panel(); + this.numberInput = new System.Windows.Forms.TextBox(); + this.SaveBtn = new System.Windows.Forms.Button(); this.cancelBtn = new System.Windows.Forms.Button(); this.discontPanel = new System.Windows.Forms.FlowLayoutPanel(); this.H_SID = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,11 +65,6 @@ this.ttPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblTangTui = new System.Windows.Forms.Label(); this.tangGridView = new BWP.WinFormControl.UDataGridView(); - this.T_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.alreadyLabel = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.orderLabel = new System.Windows.Forms.Label(); @@ -76,27 +75,31 @@ this.label12 = new System.Windows.Forms.Label(); this.historyGrid = new BWP.WinFormControl.UDataGridView(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.keyPanel = new System.Windows.Forms.FlowLayoutPanel(); this.label3 = new System.Windows.Forms.Label(); this.maoScrollBar = new System.Windows.Forms.VScrollBar(); this.maoGridView = new BWP.WinFormControl.UDataGridView(); - this.M_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.mbPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.keyPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblMaoBo = new System.Windows.Forms.Label(); this.dropPigBtn = new System.Windows.Forms.Button(); this.discontBtn = new System.Windows.Forms.Button(); this.statePic = new System.Windows.Forms.PictureBox(); this.printBtn = new System.Windows.Forms.Button(); this.isPrintCheckBox = new System.Windows.Forms.CheckBox(); - this.withOkPanel = new System.Windows.Forms.Panel(); - this.numberInput = new System.Windows.Forms.TextBox(); - this.SaveBtn = new System.Windows.Forms.Button(); - this.flagLabel = new System.Windows.Forms.Label(); + this.T_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_WeightID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_WeightID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.modifyPanel.SuspendLayout(); + this.withOkPanel.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tangGridView)).BeginInit(); this.groupBox3.SuspendLayout(); @@ -104,7 +107,6 @@ this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.maoGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.statePic)).BeginInit(); - this.withOkPanel.SuspendLayout(); this.SuspendLayout(); // // H_Livestock_ID @@ -165,8 +167,8 @@ // H_Weight // this.H_Weight.DataPropertyName = "Weight"; - dataGridViewCellStyle12.Format = "#0.######"; - this.H_Weight.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle1.Format = "#0.######"; + this.H_Weight.DefaultCellStyle = dataGridViewCellStyle1; this.H_Weight.HeaderText = "重量"; this.H_Weight.Name = "H_Weight"; this.H_Weight.ReadOnly = true; @@ -175,9 +177,9 @@ // H_Time // this.H_Time.DataPropertyName = "Time"; - dataGridViewCellStyle13.Format = "HH:mm:ss"; - dataGridViewCellStyle13.NullValue = null; - this.H_Time.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle2.Format = "HH:mm:ss"; + dataGridViewCellStyle2.NullValue = null; + this.H_Time.DefaultCellStyle = dataGridViewCellStyle2; this.H_Time.HeaderText = "时间"; this.H_Time.Name = "H_Time"; this.H_Time.ReadOnly = true; @@ -220,6 +222,46 @@ this.modifyPanel.TabIndex = 60; this.modifyPanel.Visible = false; // + // flagLabel + // + this.flagLabel.AutoSize = true; + this.flagLabel.Font = new System.Drawing.Font("宋体", 15F); + this.flagLabel.ForeColor = System.Drawing.Color.Red; + this.flagLabel.Location = new System.Drawing.Point(242, 19); + this.flagLabel.Name = "flagLabel"; + this.flagLabel.Size = new System.Drawing.Size(49, 20); + this.flagLabel.TabIndex = 53; + this.flagLabel.Text = "信息"; + // + // withOkPanel + // + this.withOkPanel.Controls.Add(this.numberInput); + this.withOkPanel.Controls.Add(this.SaveBtn); + this.withOkPanel.Location = new System.Drawing.Point(294, 4); + this.withOkPanel.Name = "withOkPanel"; + this.withOkPanel.Size = new System.Drawing.Size(192, 48); + this.withOkPanel.TabIndex = 53; + // + // numberInput + // + this.numberInput.Font = new System.Drawing.Font("宋体", 15F); + this.numberInput.ForeColor = System.Drawing.Color.Red; + this.numberInput.Location = new System.Drawing.Point(4, 9); + this.numberInput.Name = "numberInput"; + this.numberInput.Size = new System.Drawing.Size(72, 30); + this.numberInput.TabIndex = 40; + // + // SaveBtn + // + this.SaveBtn.Font = new System.Drawing.Font("宋体", 15F); + this.SaveBtn.ForeColor = System.Drawing.Color.Red; + this.SaveBtn.Location = new System.Drawing.Point(86, 3); + this.SaveBtn.Name = "SaveBtn"; + this.SaveBtn.Size = new System.Drawing.Size(102, 43); + this.SaveBtn.TabIndex = 39; + this.SaveBtn.Text = "确定"; + this.SaveBtn.UseVisualStyleBackColor = true; + // // cancelBtn // this.cancelBtn.Font = new System.Drawing.Font("宋体", 15F); @@ -308,21 +350,22 @@ this.tangGridView.AllowUserToDeleteRows = false; this.tangGridView.AllowUserToResizeColumns = false; this.tangGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.tangGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.tangGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.tangGridView.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.tangGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.tangGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.tangGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.tangGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.T_OrderDetail_ID, this.T_Finish, + this.T_WeightID, this.T_Order, this.T_Number, this.T_Already}); @@ -331,11 +374,11 @@ this.tangGridView.Name = "tangGridView"; this.tangGridView.ReadOnly = true; this.tangGridView.RowHeadersVisible = false; - dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black; - this.tangGridView.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; + this.tangGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; this.tangGridView.RowTemplate.Height = 65; this.tangGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; this.tangGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -343,46 +386,6 @@ this.tangGridView.TabIndex = 4; this.tangGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tangGridView_CellClick); // - // T_OrderDetail_ID - // - this.T_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; - this.T_OrderDetail_ID.HeaderText = "OrderDetail_ID"; - this.T_OrderDetail_ID.Name = "T_OrderDetail_ID"; - this.T_OrderDetail_ID.ReadOnly = true; - this.T_OrderDetail_ID.Visible = false; - // - // T_Finish - // - this.T_Finish.DataPropertyName = "Finish"; - this.T_Finish.HeaderText = "Finish"; - this.T_Finish.Name = "T_Finish"; - this.T_Finish.ReadOnly = true; - this.T_Finish.Visible = false; - // - // T_Order - // - this.T_Order.DataPropertyName = "Order"; - this.T_Order.HeaderText = "屠宰顺序"; - this.T_Order.Name = "T_Order"; - this.T_Order.ReadOnly = true; - this.T_Order.Width = 120; - // - // T_Number - // - this.T_Number.DataPropertyName = "Number"; - this.T_Number.HeaderText = "头数"; - this.T_Number.Name = "T_Number"; - this.T_Number.ReadOnly = true; - this.T_Number.Width = 115; - // - // T_Already - // - this.T_Already.DataPropertyName = "Already"; - this.T_Already.HeaderText = "已宰"; - this.T_Already.Name = "T_Already"; - this.T_Already.ReadOnly = true; - this.T_Already.Width = 115; - // // alreadyLabel // this.alreadyLabel.AutoSize = true; @@ -472,17 +475,17 @@ this.historyGrid.AllowUserToDeleteRows = false; this.historyGrid.AllowUserToResizeColumns = false; this.historyGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.historyGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.historyGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.historyGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.historyGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.historyGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.historyGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.historyGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.H_SID, @@ -500,11 +503,11 @@ this.historyGrid.Name = "historyGrid"; this.historyGrid.ReadOnly = true; this.historyGrid.RowHeadersVisible = false; - dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.Black; - this.historyGrid.RowsDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; + this.historyGrid.RowsDefaultCellStyle = dataGridViewCellStyle8; this.historyGrid.RowTemplate.Height = 55; this.historyGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.historyGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -525,13 +528,6 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "毛剥"; // - // keyPanel - // - this.keyPanel.Location = new System.Drawing.Point(827, 681); - this.keyPanel.Name = "keyPanel"; - this.keyPanel.Size = new System.Drawing.Size(596, 155); - this.keyPanel.TabIndex = 43; - // // label3 // this.label3.AutoSize = true; @@ -555,21 +551,22 @@ this.maoGridView.AllowUserToDeleteRows = false; this.maoGridView.AllowUserToResizeColumns = false; this.maoGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.maoGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.maoGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; this.maoGridView.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.maoGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.maoGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; this.maoGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.maoGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.M_OrderDetail_ID, this.M_Finish, + this.M_WeightID, this.M_Order, this.M_Number, this.M_Already}); @@ -578,11 +575,11 @@ this.maoGridView.Name = "maoGridView"; this.maoGridView.ReadOnly = true; this.maoGridView.RowHeadersVisible = false; - dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.Color.Black; - this.maoGridView.RowsDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Black; + this.maoGridView.RowsDefaultCellStyle = dataGridViewCellStyle11; this.maoGridView.RowTemplate.Height = 65; this.maoGridView.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; this.maoGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -590,46 +587,6 @@ this.maoGridView.TabIndex = 33; this.maoGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.maoGridView_CellClick); // - // M_OrderDetail_ID - // - this.M_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; - this.M_OrderDetail_ID.HeaderText = "OrderDetail_ID"; - this.M_OrderDetail_ID.Name = "M_OrderDetail_ID"; - this.M_OrderDetail_ID.ReadOnly = true; - this.M_OrderDetail_ID.Visible = false; - // - // M_Finish - // - this.M_Finish.DataPropertyName = "Finish"; - this.M_Finish.HeaderText = "Finish"; - this.M_Finish.Name = "M_Finish"; - this.M_Finish.ReadOnly = true; - this.M_Finish.Visible = false; - // - // M_Order - // - this.M_Order.DataPropertyName = "Order"; - this.M_Order.HeaderText = "屠宰顺序"; - this.M_Order.Name = "M_Order"; - this.M_Order.ReadOnly = true; - this.M_Order.Width = 120; - // - // M_Number - // - this.M_Number.DataPropertyName = "Number"; - this.M_Number.HeaderText = "头数"; - this.M_Number.Name = "M_Number"; - this.M_Number.ReadOnly = true; - this.M_Number.Width = 115; - // - // M_Already - // - this.M_Already.DataPropertyName = "Already"; - this.M_Already.HeaderText = "已宰"; - this.M_Already.Name = "M_Already"; - this.M_Already.ReadOnly = true; - this.M_Already.Width = 115; - // // mbPanel // this.mbPanel.Location = new System.Drawing.Point(431, 35); @@ -637,6 +594,13 @@ this.mbPanel.Size = new System.Drawing.Size(337, 298); this.mbPanel.TabIndex = 1; // + // keyPanel + // + this.keyPanel.Location = new System.Drawing.Point(827, 681); + this.keyPanel.Name = "keyPanel"; + this.keyPanel.Size = new System.Drawing.Size(596, 155); + this.keyPanel.TabIndex = 43; + // // lblMaoBo // this.lblMaoBo.AutoSize = true; @@ -701,45 +665,101 @@ this.isPrintCheckBox.Text = "打印条码"; this.isPrintCheckBox.UseVisualStyleBackColor = true; // - // withOkPanel + // T_OrderDetail_ID // - this.withOkPanel.Controls.Add(this.numberInput); - this.withOkPanel.Controls.Add(this.SaveBtn); - this.withOkPanel.Location = new System.Drawing.Point(294, 4); - this.withOkPanel.Name = "withOkPanel"; - this.withOkPanel.Size = new System.Drawing.Size(192, 48); - this.withOkPanel.TabIndex = 53; + this.T_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; + this.T_OrderDetail_ID.HeaderText = "OrderDetail_ID"; + this.T_OrderDetail_ID.Name = "T_OrderDetail_ID"; + this.T_OrderDetail_ID.ReadOnly = true; + this.T_OrderDetail_ID.Visible = false; // - // numberInput + // T_Finish // - this.numberInput.Font = new System.Drawing.Font("宋体", 15F); - this.numberInput.ForeColor = System.Drawing.Color.Red; - this.numberInput.Location = new System.Drawing.Point(4, 9); - this.numberInput.Name = "numberInput"; - this.numberInput.Size = new System.Drawing.Size(72, 30); - this.numberInput.TabIndex = 40; + this.T_Finish.DataPropertyName = "Finish"; + this.T_Finish.HeaderText = "Finish"; + this.T_Finish.Name = "T_Finish"; + this.T_Finish.ReadOnly = true; + this.T_Finish.Visible = false; // - // SaveBtn + // T_WeightID // - this.SaveBtn.Font = new System.Drawing.Font("宋体", 15F); - this.SaveBtn.ForeColor = System.Drawing.Color.Red; - this.SaveBtn.Location = new System.Drawing.Point(86, 3); - this.SaveBtn.Name = "SaveBtn"; - this.SaveBtn.Size = new System.Drawing.Size(102, 43); - this.SaveBtn.TabIndex = 39; - this.SaveBtn.Text = "确定"; - this.SaveBtn.UseVisualStyleBackColor = true; + this.T_WeightID.DataPropertyName = "WeightID"; + this.T_WeightID.HeaderText = "磅单号"; + this.T_WeightID.Name = "T_WeightID"; + this.T_WeightID.ReadOnly = true; + this.T_WeightID.Width = 90; // - // flagLabel + // T_Order // - this.flagLabel.AutoSize = true; - this.flagLabel.Font = new System.Drawing.Font("宋体", 15F); - this.flagLabel.ForeColor = System.Drawing.Color.Red; - this.flagLabel.Location = new System.Drawing.Point(242, 19); - this.flagLabel.Name = "flagLabel"; - this.flagLabel.Size = new System.Drawing.Size(49, 20); - this.flagLabel.TabIndex = 53; - this.flagLabel.Text = "信息"; + this.T_Order.DataPropertyName = "Order"; + this.T_Order.HeaderText = "顺序号"; + this.T_Order.Name = "T_Order"; + this.T_Order.ReadOnly = true; + this.T_Order.Width = 90; + // + // T_Number + // + this.T_Number.DataPropertyName = "Number"; + this.T_Number.HeaderText = "头数"; + this.T_Number.Name = "T_Number"; + this.T_Number.ReadOnly = true; + this.T_Number.Width = 85; + // + // T_Already + // + this.T_Already.DataPropertyName = "Already"; + this.T_Already.HeaderText = "已宰"; + this.T_Already.Name = "T_Already"; + this.T_Already.ReadOnly = true; + this.T_Already.Width = 85; + // + // M_OrderDetail_ID + // + this.M_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; + this.M_OrderDetail_ID.HeaderText = "OrderDetail_ID"; + this.M_OrderDetail_ID.Name = "M_OrderDetail_ID"; + this.M_OrderDetail_ID.ReadOnly = true; + this.M_OrderDetail_ID.Visible = false; + // + // M_Finish + // + this.M_Finish.DataPropertyName = "Finish"; + this.M_Finish.HeaderText = "Finish"; + this.M_Finish.Name = "M_Finish"; + this.M_Finish.ReadOnly = true; + this.M_Finish.Visible = false; + // + // M_WeightID + // + this.M_WeightID.DataPropertyName = "WeightID"; + this.M_WeightID.HeaderText = "磅单号"; + this.M_WeightID.Name = "M_WeightID"; + this.M_WeightID.ReadOnly = true; + this.M_WeightID.Width = 90; + // + // M_Order + // + this.M_Order.DataPropertyName = "Order"; + this.M_Order.HeaderText = "顺序号"; + this.M_Order.Name = "M_Order"; + this.M_Order.ReadOnly = true; + this.M_Order.Width = 90; + // + // M_Number + // + this.M_Number.DataPropertyName = "Number"; + this.M_Number.HeaderText = "头数"; + this.M_Number.Name = "M_Number"; + this.M_Number.ReadOnly = true; + this.M_Number.Width = 85; + // + // M_Already + // + this.M_Already.DataPropertyName = "Already"; + this.M_Already.HeaderText = "已宰"; + this.M_Already.Name = "M_Already"; + this.M_Already.ReadOnly = true; + this.M_Already.Width = 85; // // DataViewForm // @@ -773,6 +793,8 @@ this.Text = "数据实时校验"; this.modifyPanel.ResumeLayout(false); this.modifyPanel.PerformLayout(); + this.withOkPanel.ResumeLayout(false); + this.withOkPanel.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tangGridView)).EndInit(); @@ -783,8 +805,6 @@ this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.maoGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.statePic)).EndInit(); - this.withOkPanel.ResumeLayout(false); - this.withOkPanel.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -833,21 +853,23 @@ private System.Windows.Forms.PictureBox statePic; private System.Windows.Forms.Button printBtn; private System.Windows.Forms.Label label3; + private System.Windows.Forms.CheckBox isPrintCheckBox; + private System.Windows.Forms.FlowLayoutPanel keyPanel; + private System.Windows.Forms.Panel withOkPanel; + private System.Windows.Forms.TextBox numberInput; + private System.Windows.Forms.Button SaveBtn; + private System.Windows.Forms.Label flagLabel; private System.Windows.Forms.DataGridViewTextBoxColumn T_OrderDetail_ID; private System.Windows.Forms.DataGridViewTextBoxColumn T_Finish; + private System.Windows.Forms.DataGridViewTextBoxColumn T_WeightID; private System.Windows.Forms.DataGridViewTextBoxColumn T_Order; private System.Windows.Forms.DataGridViewTextBoxColumn T_Number; private System.Windows.Forms.DataGridViewTextBoxColumn T_Already; private System.Windows.Forms.DataGridViewTextBoxColumn M_OrderDetail_ID; private System.Windows.Forms.DataGridViewTextBoxColumn M_Finish; + private System.Windows.Forms.DataGridViewTextBoxColumn M_WeightID; private System.Windows.Forms.DataGridViewTextBoxColumn M_Order; private System.Windows.Forms.DataGridViewTextBoxColumn M_Number; private System.Windows.Forms.DataGridViewTextBoxColumn M_Already; - private System.Windows.Forms.CheckBox isPrintCheckBox; - private System.Windows.Forms.FlowLayoutPanel keyPanel; - private System.Windows.Forms.Panel withOkPanel; - private System.Windows.Forms.TextBox numberInput; - private System.Windows.Forms.Button SaveBtn; - private System.Windows.Forms.Label flagLabel; } } \ No newline at end of file diff --git a/WeighAndGrading/DataViewForm.resx b/WeighAndGrading/DataViewForm.resx index efd0570..0ff3ac3 100644 --- a/WeighAndGrading/DataViewForm.resx +++ b/WeighAndGrading/DataViewForm.resx @@ -153,6 +153,9 @@ True + + True + True @@ -168,6 +171,9 @@ True + + True + True diff --git a/WeighAndGrading/GradeFrom.Designer.cs b/WeighAndGrading/GradeFrom.Designer.cs index 1187778..648385f 100644 --- a/WeighAndGrading/GradeFrom.Designer.cs +++ b/WeighAndGrading/GradeFrom.Designer.cs @@ -31,16 +31,16 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.syncBtn = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); @@ -52,21 +52,9 @@ this.ttPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblTangTui = new System.Windows.Forms.Label(); this.tangGridView = new BWP.WinFormControl.UDataGridView(); - this.T_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.T_FinishBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.maoScrollBar = new System.Windows.Forms.VScrollBar(); this.maoGridView = new BWP.WinFormControl.UDataGridView(); - this.M_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.M_FinishBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.mbPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblMaoBo = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); @@ -101,6 +89,20 @@ this.btnStartWeight = new System.Windows.Forms.Button(); this.btnStopWeight = new System.Windows.Forms.Button(); this.dataConfirmBtn = new System.Windows.Forms.Button(); + this.T_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_WeightID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.T_FinishBtn = new System.Windows.Forms.DataGridViewButtonColumn(); + this.M_OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Finish = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_WeightID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_Already = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.M_FinishBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tangGridView)).BeginInit(); this.groupBox2.SuspendLayout(); @@ -181,21 +183,21 @@ this.groupBox1.Controls.Add(this.tangGridView); this.groupBox1.Location = new System.Drawing.Point(16, 175); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(783, 318); + this.groupBox1.Size = new System.Drawing.Size(853, 318); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "烫褪"; // // tangScrollBar // - this.tangScrollBar.Location = new System.Drawing.Point(373, 36); + this.tangScrollBar.Location = new System.Drawing.Point(457, 36); this.tangScrollBar.Name = "tangScrollBar"; this.tangScrollBar.Size = new System.Drawing.Size(40, 275); this.tangScrollBar.TabIndex = 51; // // ttPanel // - this.ttPanel.Location = new System.Drawing.Point(431, 35); + this.ttPanel.Location = new System.Drawing.Point(505, 35); this.ttPanel.Name = "ttPanel"; this.ttPanel.Size = new System.Drawing.Size(337, 276); this.ttPanel.TabIndex = 0; @@ -231,6 +233,7 @@ this.tangGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.T_OrderDetail_ID, this.T_Finish, + this.T_WeightID, this.T_Order, this.T_Number, this.T_Already, @@ -248,61 +251,11 @@ this.tangGridView.RowTemplate.Height = 65; this.tangGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; this.tangGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.tangGridView.Size = new System.Drawing.Size(363, 275); + this.tangGridView.Size = new System.Drawing.Size(445, 275); this.tangGridView.TabIndex = 4; this.tangGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tangGridView_CellClick); this.tangGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.tangGridView_CellContentClick); // - // T_OrderDetail_ID - // - this.T_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; - this.T_OrderDetail_ID.HeaderText = "OrderDetail_ID"; - this.T_OrderDetail_ID.Name = "T_OrderDetail_ID"; - this.T_OrderDetail_ID.ReadOnly = true; - this.T_OrderDetail_ID.Visible = false; - // - // T_Finish - // - this.T_Finish.DataPropertyName = "Finish"; - this.T_Finish.HeaderText = "Finish"; - this.T_Finish.Name = "T_Finish"; - this.T_Finish.ReadOnly = true; - this.T_Finish.Visible = false; - // - // T_Order - // - this.T_Order.DataPropertyName = "Order"; - this.T_Order.HeaderText = "屠宰顺序"; - this.T_Order.Name = "T_Order"; - this.T_Order.ReadOnly = true; - // - // T_Number - // - this.T_Number.DataPropertyName = "Number"; - this.T_Number.HeaderText = "头数"; - this.T_Number.Name = "T_Number"; - this.T_Number.ReadOnly = true; - this.T_Number.Width = 80; - // - // T_Already - // - this.T_Already.DataPropertyName = "Already"; - this.T_Already.HeaderText = "已宰"; - this.T_Already.Name = "T_Already"; - this.T_Already.ReadOnly = true; - this.T_Already.Width = 80; - // - // T_FinishBtn - // - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); - this.T_FinishBtn.DefaultCellStyle = dataGridViewCellStyle3; - this.T_FinishBtn.HeaderText = "完毕"; - this.T_FinishBtn.Name = "T_FinishBtn"; - this.T_FinishBtn.ReadOnly = true; - this.T_FinishBtn.Text = "完毕"; - this.T_FinishBtn.UseColumnTextForButtonValue = true; - // // groupBox2 // this.groupBox2.Controls.Add(this.maoScrollBar); @@ -310,14 +263,14 @@ this.groupBox2.Controls.Add(this.mbPanel); this.groupBox2.Location = new System.Drawing.Point(16, 508); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(783, 330); + this.groupBox2.Size = new System.Drawing.Size(853, 330); this.groupBox2.TabIndex = 10; this.groupBox2.TabStop = false; this.groupBox2.Text = "毛剥"; // // maoScrollBar // - this.maoScrollBar.Location = new System.Drawing.Point(373, 35); + this.maoScrollBar.Location = new System.Drawing.Point(456, 35); this.maoScrollBar.Name = "maoScrollBar"; this.maoScrollBar.Size = new System.Drawing.Size(40, 278); this.maoScrollBar.TabIndex = 52; @@ -343,6 +296,7 @@ this.maoGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.M_OrderDetail_ID, this.M_Finish, + this.M_WeightID, this.M_Order, this.M_Number, this.M_Already, @@ -360,64 +314,14 @@ this.maoGridView.RowTemplate.Height = 65; this.maoGridView.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal; this.maoGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.maoGridView.Size = new System.Drawing.Size(363, 278); + this.maoGridView.Size = new System.Drawing.Size(445, 278); this.maoGridView.TabIndex = 33; this.maoGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.maoGridView_CellClick); this.maoGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.maoGridView_CellContentClick); // - // M_OrderDetail_ID - // - this.M_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; - this.M_OrderDetail_ID.HeaderText = "OrderDetail_ID"; - this.M_OrderDetail_ID.Name = "M_OrderDetail_ID"; - this.M_OrderDetail_ID.ReadOnly = true; - this.M_OrderDetail_ID.Visible = false; - // - // M_Finish - // - this.M_Finish.DataPropertyName = "Finish"; - this.M_Finish.HeaderText = "Finish"; - this.M_Finish.Name = "M_Finish"; - this.M_Finish.ReadOnly = true; - this.M_Finish.Visible = false; - // - // M_Order - // - this.M_Order.DataPropertyName = "Order"; - this.M_Order.HeaderText = "屠宰顺序"; - this.M_Order.Name = "M_Order"; - this.M_Order.ReadOnly = true; - // - // M_Number - // - this.M_Number.DataPropertyName = "Number"; - this.M_Number.HeaderText = "头数"; - this.M_Number.Name = "M_Number"; - this.M_Number.ReadOnly = true; - this.M_Number.Width = 80; - // - // M_Already - // - this.M_Already.DataPropertyName = "Already"; - this.M_Already.HeaderText = "已宰"; - this.M_Already.Name = "M_Already"; - this.M_Already.ReadOnly = true; - this.M_Already.Width = 80; - // - // M_FinishBtn - // - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); - this.M_FinishBtn.DefaultCellStyle = dataGridViewCellStyle7; - this.M_FinishBtn.HeaderText = "完毕"; - this.M_FinishBtn.Name = "M_FinishBtn"; - this.M_FinishBtn.ReadOnly = true; - this.M_FinishBtn.Text = "完毕"; - this.M_FinishBtn.UseColumnTextForButtonValue = true; - // // mbPanel // - this.mbPanel.Location = new System.Drawing.Point(431, 35); + this.mbPanel.Location = new System.Drawing.Point(505, 35); this.mbPanel.Name = "mbPanel"; this.mbPanel.Size = new System.Drawing.Size(337, 278); this.mbPanel.TabIndex = 1; @@ -437,7 +341,7 @@ this.groupBox3.Controls.Add(this.vScrollBar2); this.groupBox3.Controls.Add(this.label12); this.groupBox3.Controls.Add(this.historyGrid); - this.groupBox3.Location = new System.Drawing.Point(826, 175); + this.groupBox3.Location = new System.Drawing.Point(881, 175); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(520, 663); this.groupBox3.TabIndex = 11; @@ -671,7 +575,7 @@ this.modifyPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.modifyPanel.Controls.Add(this.cancelBtn); this.modifyPanel.Controls.Add(this.stateLabel); - this.modifyPanel.Location = new System.Drawing.Point(826, 112); + this.modifyPanel.Location = new System.Drawing.Point(881, 112); this.modifyPanel.Name = "modifyPanel"; this.modifyPanel.Size = new System.Drawing.Size(438, 57); this.modifyPanel.TabIndex = 36; @@ -702,7 +606,7 @@ // // discontPanel // - this.discontPanel.Location = new System.Drawing.Point(1356, 182); + this.discontPanel.Location = new System.Drawing.Point(1411, 182); this.discontPanel.Name = "discontPanel"; this.discontPanel.Size = new System.Drawing.Size(71, 656); this.discontPanel.TabIndex = 33; @@ -720,7 +624,7 @@ // btnDeleteSelected // this.btnDeleteSelected.Font = new System.Drawing.Font("宋体", 15F); - this.btnDeleteSelected.Location = new System.Drawing.Point(1197, 14); + this.btnDeleteSelected.Location = new System.Drawing.Point(1252, 14); this.btnDeleteSelected.Name = "btnDeleteSelected"; this.btnDeleteSelected.Size = new System.Drawing.Size(102, 54); this.btnDeleteSelected.TabIndex = 34; @@ -733,7 +637,7 @@ this.lblSucessed.BackColor = System.Drawing.Color.Lime; this.lblSucessed.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblSucessed.ForeColor = System.Drawing.Color.Red; - this.lblSucessed.Location = new System.Drawing.Point(785, 70); + this.lblSucessed.Location = new System.Drawing.Point(840, 70); this.lblSucessed.Name = "lblSucessed"; this.lblSucessed.Size = new System.Drawing.Size(267, 39); this.lblSucessed.TabIndex = 39; @@ -744,7 +648,7 @@ // dropPigBtn // this.dropPigBtn.Font = new System.Drawing.Font("宋体", 15F); - this.dropPigBtn.Location = new System.Drawing.Point(1071, 14); + this.dropPigBtn.Location = new System.Drawing.Point(1126, 14); this.dropPigBtn.Name = "dropPigBtn"; this.dropPigBtn.Size = new System.Drawing.Size(102, 54); this.dropPigBtn.TabIndex = 40; @@ -778,7 +682,7 @@ // dataConfirmBtn // this.dataConfirmBtn.Font = new System.Drawing.Font("宋体", 15F); - this.dataConfirmBtn.Location = new System.Drawing.Point(1321, 14); + this.dataConfirmBtn.Location = new System.Drawing.Point(1376, 14); this.dataConfirmBtn.Name = "dataConfirmBtn"; this.dataConfirmBtn.Size = new System.Drawing.Size(102, 54); this.dataConfirmBtn.TabIndex = 42; @@ -786,11 +690,129 @@ this.dataConfirmBtn.UseVisualStyleBackColor = true; this.dataConfirmBtn.Click += new System.EventHandler(this.dataConfirmBtn_Click); // + // T_OrderDetail_ID + // + this.T_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; + this.T_OrderDetail_ID.HeaderText = "OrderDetail_ID"; + this.T_OrderDetail_ID.Name = "T_OrderDetail_ID"; + this.T_OrderDetail_ID.ReadOnly = true; + this.T_OrderDetail_ID.Visible = false; + // + // T_Finish + // + this.T_Finish.DataPropertyName = "Finish"; + this.T_Finish.HeaderText = "Finish"; + this.T_Finish.Name = "T_Finish"; + this.T_Finish.ReadOnly = true; + this.T_Finish.Visible = false; + // + // T_WeightID + // + this.T_WeightID.DataPropertyName = "WeightID"; + this.T_WeightID.HeaderText = "磅单号"; + this.T_WeightID.Name = "T_WeightID"; + this.T_WeightID.ReadOnly = true; + this.T_WeightID.Width = 90; + // + // T_Order + // + this.T_Order.DataPropertyName = "Order"; + this.T_Order.HeaderText = "顺序号"; + this.T_Order.Name = "T_Order"; + this.T_Order.ReadOnly = true; + this.T_Order.Width = 90; + // + // T_Number + // + this.T_Number.DataPropertyName = "Number"; + this.T_Number.HeaderText = "头数"; + this.T_Number.Name = "T_Number"; + this.T_Number.ReadOnly = true; + this.T_Number.Width = 80; + // + // T_Already + // + this.T_Already.DataPropertyName = "Already"; + this.T_Already.HeaderText = "已宰"; + this.T_Already.Name = "T_Already"; + this.T_Already.ReadOnly = true; + this.T_Already.Width = 80; + // + // T_FinishBtn + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.T_FinishBtn.DefaultCellStyle = dataGridViewCellStyle3; + this.T_FinishBtn.HeaderText = "完毕"; + this.T_FinishBtn.Name = "T_FinishBtn"; + this.T_FinishBtn.ReadOnly = true; + this.T_FinishBtn.Text = "完毕"; + this.T_FinishBtn.UseColumnTextForButtonValue = true; + // + // M_OrderDetail_ID + // + this.M_OrderDetail_ID.DataPropertyName = "OrderDetail_ID"; + this.M_OrderDetail_ID.HeaderText = "OrderDetail_ID"; + this.M_OrderDetail_ID.Name = "M_OrderDetail_ID"; + this.M_OrderDetail_ID.ReadOnly = true; + this.M_OrderDetail_ID.Visible = false; + // + // M_Finish + // + this.M_Finish.DataPropertyName = "Finish"; + this.M_Finish.HeaderText = "Finish"; + this.M_Finish.Name = "M_Finish"; + this.M_Finish.ReadOnly = true; + this.M_Finish.Visible = false; + // + // M_WeightID + // + this.M_WeightID.DataPropertyName = "WeightID"; + this.M_WeightID.HeaderText = "磅单号"; + this.M_WeightID.Name = "M_WeightID"; + this.M_WeightID.ReadOnly = true; + this.M_WeightID.Width = 90; + // + // M_Order + // + this.M_Order.DataPropertyName = "Order"; + this.M_Order.HeaderText = "顺序号"; + this.M_Order.Name = "M_Order"; + this.M_Order.ReadOnly = true; + this.M_Order.Width = 90; + // + // M_Number + // + this.M_Number.DataPropertyName = "Number"; + this.M_Number.HeaderText = "头数"; + this.M_Number.Name = "M_Number"; + this.M_Number.ReadOnly = true; + this.M_Number.Width = 80; + // + // M_Already + // + this.M_Already.DataPropertyName = "Already"; + this.M_Already.HeaderText = "已宰"; + this.M_Already.Name = "M_Already"; + this.M_Already.ReadOnly = true; + this.M_Already.Width = 80; + // + // M_FinishBtn + // + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.M_FinishBtn.DefaultCellStyle = dataGridViewCellStyle7; + this.M_FinishBtn.HeaderText = "完毕"; + this.M_FinishBtn.Name = "M_FinishBtn"; + this.M_FinishBtn.ReadOnly = true; + this.M_FinishBtn.Text = "完毕"; + this.M_FinishBtn.UseColumnTextForButtonValue = true; + // // GradeFrom // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1438, 845); + this.ClientSize = new System.Drawing.Size(1490, 845); this.Controls.Add(this.dataConfirmBtn); this.Controls.Add(this.btnStopWeight); this.Controls.Add(this.btnStartWeight); @@ -875,18 +897,6 @@ private BWP.WinFormControl.UDataGridView maoGridView; private System.Windows.Forms.PictureBox statePic; private System.Windows.Forms.Button btnDeleteSelected; - private System.Windows.Forms.DataGridViewTextBoxColumn T_OrderDetail_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn T_Finish; - private System.Windows.Forms.DataGridViewTextBoxColumn T_Order; - private System.Windows.Forms.DataGridViewTextBoxColumn T_Number; - private System.Windows.Forms.DataGridViewTextBoxColumn T_Already; - private System.Windows.Forms.DataGridViewButtonColumn T_FinishBtn; - private System.Windows.Forms.DataGridViewTextBoxColumn M_OrderDetail_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn M_Finish; - private System.Windows.Forms.DataGridViewTextBoxColumn M_Order; - private System.Windows.Forms.DataGridViewTextBoxColumn M_Number; - private System.Windows.Forms.DataGridViewTextBoxColumn M_Already; - private System.Windows.Forms.DataGridViewButtonColumn M_FinishBtn; private System.Windows.Forms.Label lblSucessed; private System.Windows.Forms.Button dropPigBtn; private System.Windows.Forms.Button btnStartWeight; @@ -902,5 +912,19 @@ private System.Windows.Forms.DataGridViewTextBoxColumn H_Livestock_Name; private System.Windows.Forms.DataGridViewTextBoxColumn H_Weight; private System.Windows.Forms.DataGridViewTextBoxColumn H_Time; + private System.Windows.Forms.DataGridViewTextBoxColumn T_OrderDetail_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn T_Finish; + private System.Windows.Forms.DataGridViewTextBoxColumn T_WeightID; + private System.Windows.Forms.DataGridViewTextBoxColumn T_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn T_Number; + private System.Windows.Forms.DataGridViewTextBoxColumn T_Already; + private System.Windows.Forms.DataGridViewButtonColumn T_FinishBtn; + private System.Windows.Forms.DataGridViewTextBoxColumn M_OrderDetail_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn M_Finish; + private System.Windows.Forms.DataGridViewTextBoxColumn M_WeightID; + private System.Windows.Forms.DataGridViewTextBoxColumn M_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn M_Number; + private System.Windows.Forms.DataGridViewTextBoxColumn M_Already; + private System.Windows.Forms.DataGridViewButtonColumn M_FinishBtn; } } \ No newline at end of file diff --git a/WeighAndGrading/GradeFrom.resx b/WeighAndGrading/GradeFrom.resx index 0f25fed..2cc6da9 100644 --- a/WeighAndGrading/GradeFrom.resx +++ b/WeighAndGrading/GradeFrom.resx @@ -117,45 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True True + + True + True @@ -168,21 +138,15 @@ True - - True - - - True - - - True - True True + + True + True @@ -195,24 +159,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - True @@ -243,58 +189,4 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file