diff --git a/BWP.WinFormControl/BWP.WinFormControl.csproj b/BWP.WinFormControl/BWP.WinFormControl.csproj index 4d5942c..bd56434 100644 --- a/BWP.WinFormControl/BWP.WinFormControl.csproj +++ b/BWP.WinFormControl/BWP.WinFormControl.csproj @@ -55,6 +55,12 @@ + + Form + + + UMessageBox.cs + Component @@ -106,6 +112,9 @@ + + UMessageBox.cs + WeightControl.cs diff --git a/BWP.WinFormControl/UMessageBox.Designer.cs b/BWP.WinFormControl/UMessageBox.Designer.cs new file mode 100644 index 0000000..8b64897 --- /dev/null +++ b/BWP.WinFormControl/UMessageBox.Designer.cs @@ -0,0 +1,79 @@ +namespace BWP.WinFormControl +{ + partial class UMessageBox + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.msgLabel = new System.Windows.Forms.Label(); + this.OKBtn = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // msgLabel + // + this.msgLabel.AutoSize = true; + this.msgLabel.Font = new System.Drawing.Font("宋体", 15F); + this.msgLabel.Location = new System.Drawing.Point(83, 38); + this.msgLabel.Name = "msgLabel"; + this.msgLabel.Size = new System.Drawing.Size(49, 20); + this.msgLabel.TabIndex = 0; + this.msgLabel.Text = "消息"; + // + // OKBtn + // + this.OKBtn.Font = new System.Drawing.Font("宋体", 15F); + this.OKBtn.Location = new System.Drawing.Point(111, 112); + this.OKBtn.Name = "OKBtn"; + this.OKBtn.Size = new System.Drawing.Size(131, 50); + this.OKBtn.TabIndex = 1; + this.OKBtn.Text = "确定"; + this.OKBtn.UseVisualStyleBackColor = true; + this.OKBtn.Click += new System.EventHandler(this.OKBtn_Click); + // + // UMessageBox + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(352, 197); + this.Controls.Add(this.OKBtn); + this.Controls.Add(this.msgLabel); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "UMessageBox"; + this.ShowIcon = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label msgLabel; + private System.Windows.Forms.Button OKBtn; + } +} \ No newline at end of file diff --git a/BWP.WinFormControl/UMessageBox.cs b/BWP.WinFormControl/UMessageBox.cs new file mode 100644 index 0000000..92ef739 --- /dev/null +++ b/BWP.WinFormControl/UMessageBox.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace BWP.WinFormControl +{ + public partial class UMessageBox : Form + { + public static void Show(string msg) + { + new UMessageBox(msg).ShowDialog(); + } + + public static void Show(string msg, string title) + { + new UMessageBox(msg, title).ShowDialog(); + } + + private UMessageBox(string msg) + { + InitializeComponent(); + this.msgLabel.Text = msg; + } + + private UMessageBox(string msg, string title) + { + InitializeComponent(); + this.msgLabel.Text = msg; + this.Text = title; + } + + private void OKBtn_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/BWP.WinFormControl/UMessageBox.resx b/BWP.WinFormControl/UMessageBox.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/BWP.WinFormControl/UMessageBox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ButcherOrder/ButcherOrderForm.Designer.cs b/ButcherOrder/ButcherOrderForm.Designer.cs index bec2518..476e59f 100644 --- a/ButcherOrder/ButcherOrderForm.Designer.cs +++ b/ButcherOrder/ButcherOrderForm.Designer.cs @@ -30,7 +30,9 @@ { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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.label1 = new System.Windows.Forms.Label(); this.syncBtn = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); @@ -40,8 +42,9 @@ this.numberInput = new System.Windows.Forms.TextBox(); this.keyPanel = new System.Windows.Forms.FlowLayoutPanel(); this.okBtn = new System.Windows.Forms.Button(); - this.uDatePicker1 = new BWP.WinFormControl.UDatePicker(); + this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); this.secondOrderGridView = new BWP.WinFormControl.UDataGridView(); + this.uDatePicker1 = new BWP.WinFormControl.UDatePicker(); this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OrderDetail_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.IsOk = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -50,7 +53,6 @@ this.HotFadeNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.updateBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.viewBtn = new System.Windows.Forms.DataGridViewButtonColumn(); - this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); ((System.ComponentModel.ISupportInitialize)(this.secondOrderGridView)).BeginInit(); this.SuspendLayout(); // @@ -144,19 +146,12 @@ this.okBtn.UseVisualStyleBackColor = true; this.okBtn.Click += new System.EventHandler(this.okBtn_Click); // - // uDatePicker1 + // vScrollBar1 // - this.uDatePicker1.BackColor = System.Drawing.Color.White; - this.uDatePicker1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.uDatePicker1.Date = new System.DateTime(2017, 9, 5, 0, 0, 0, 0); - this.uDatePicker1.Font = new System.Drawing.Font("宋体", 15F); - this.uDatePicker1.Location = new System.Drawing.Point(166, 23); - this.uDatePicker1.Name = "uDatePicker1"; - this.uDatePicker1.Size = new System.Drawing.Size(150, 30); - this.uDatePicker1.TabIndex = 1; - this.uDatePicker1.Text = "2017/09/05"; - this.uDatePicker1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uDatePicker1.Type = BWP.WinFormControl.DateTimeType.Date; + this.vScrollBar1.Location = new System.Drawing.Point(544, 91); + this.vScrollBar1.Name = "vScrollBar1"; + this.vScrollBar1.Size = new System.Drawing.Size(40, 569); + this.vScrollBar1.TabIndex = 51; // // secondOrderGridView // @@ -190,15 +185,29 @@ this.secondOrderGridView.Name = "secondOrderGridView"; this.secondOrderGridView.ReadOnly = true; this.secondOrderGridView.RowHeadersVisible = false; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - this.secondOrderGridView.RowsDefaultCellStyle = dataGridViewCellStyle3; - this.secondOrderGridView.RowTemplate.Height = 40; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.secondOrderGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.secondOrderGridView.RowTemplate.Height = 60; this.secondOrderGridView.ScrollBars = System.Windows.Forms.ScrollBars.None; this.secondOrderGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.secondOrderGridView.Size = new System.Drawing.Size(573, 569); + this.secondOrderGridView.Size = new System.Drawing.Size(513, 569); this.secondOrderGridView.TabIndex = 12; - this.secondOrderGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.secondOrderGridView_CellClick); + this.secondOrderGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.secondOrderGridView_CellContentClick); + // + // uDatePicker1 + // + this.uDatePicker1.BackColor = System.Drawing.Color.White; + this.uDatePicker1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.uDatePicker1.Date = new System.DateTime(2017, 9, 5, 0, 0, 0, 0); + this.uDatePicker1.Font = new System.Drawing.Font("宋体", 15F); + this.uDatePicker1.Location = new System.Drawing.Point(166, 23); + this.uDatePicker1.Name = "uDatePicker1"; + this.uDatePicker1.Size = new System.Drawing.Size(150, 30); + this.uDatePicker1.TabIndex = 1; + this.uDatePicker1.Text = "2017/09/05"; + this.uDatePicker1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.uDatePicker1.Type = BWP.WinFormControl.DateTimeType.Date; // // ID // @@ -248,28 +257,25 @@ // // updateBtn // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.updateBtn.DefaultCellStyle = dataGridViewCellStyle3; this.updateBtn.HeaderText = "更新"; this.updateBtn.Name = "updateBtn"; this.updateBtn.ReadOnly = true; this.updateBtn.Text = "更新"; this.updateBtn.UseColumnTextForButtonValue = true; - this.updateBtn.Width = 130; // // viewBtn // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(5, 10, 5, 10); + this.viewBtn.DefaultCellStyle = dataGridViewCellStyle4; this.viewBtn.HeaderText = "查看"; this.viewBtn.Name = "viewBtn"; this.viewBtn.ReadOnly = true; this.viewBtn.Text = "查看"; this.viewBtn.UseColumnTextForButtonValue = true; - this.viewBtn.Width = 130; - // - // vScrollBar1 - // - this.vScrollBar1.Location = new System.Drawing.Point(603, 91); - this.vScrollBar1.Name = "vScrollBar1"; - this.vScrollBar1.Size = new System.Drawing.Size(40, 569); - this.vScrollBar1.TabIndex = 51; // // ButcherOrderForm // @@ -312,6 +318,7 @@ private System.Windows.Forms.FlowLayoutPanel keyPanel; private System.Windows.Forms.Button okBtn; private BWP.WinFormControl.UDataGridView secondOrderGridView; + private System.Windows.Forms.VScrollBar vScrollBar1; private System.Windows.Forms.DataGridViewTextBoxColumn ID; private System.Windows.Forms.DataGridViewTextBoxColumn OrderDetail_ID; private System.Windows.Forms.DataGridViewTextBoxColumn IsOk; @@ -320,6 +327,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn HotFadeNumber; private System.Windows.Forms.DataGridViewButtonColumn updateBtn; private System.Windows.Forms.DataGridViewButtonColumn viewBtn; - private System.Windows.Forms.VScrollBar vScrollBar1; } } \ No newline at end of file diff --git a/ButcherOrder/ButcherOrderForm.cs b/ButcherOrder/ButcherOrderForm.cs index e865b43..6744d74 100644 --- a/ButcherOrder/ButcherOrderForm.cs +++ b/ButcherOrder/ButcherOrderForm.cs @@ -135,7 +135,7 @@ namespace ButcherOrder secondOrderGridView.RowsDefaultCellStyle.SelectionBackColor = Color.FromArgb(66, 163, 218); } - private void secondOrderGridView_CellClick(object sender, DataGridViewCellEventArgs e) + private void secondOrderGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex == -1) return; diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs index bff029e..6b5c64d 100644 --- a/QualityAndOrder/QualityOrderForm.Designer.cs +++ b/QualityAndOrder/QualityOrderForm.Designer.cs @@ -36,11 +36,15 @@ 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = 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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = 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 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.uTabControl1 = new BWP.WinFormControl.UTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); @@ -94,6 +98,19 @@ this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.preOrderGrid = new BWP.WinFormControl.UDataGridView(); + this.orderGrid = new BWP.WinFormControl.UDataGridView(); + this.tab2SyncBtn = new System.Windows.Forms.Button(); + this.tab2DateSelect = new BWP.WinFormControl.UDatePicker(); + this.label4 = new System.Windows.Forms.Label(); + this.O_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_B3WeighBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.O_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn(); + this.O_HurryBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.P_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.P_Show = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.P_B3ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -105,19 +122,6 @@ this.P_WeighTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.P_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.P_Hidden = new System.Windows.Forms.DataGridViewButtonColumn(); - this.orderGrid = new BWP.WinFormControl.UDataGridView(); - this.O_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_WeightBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_B3WeighBill_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.O_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn(); - this.O_HurryBtn = new System.Windows.Forms.DataGridViewButtonColumn(); - this.tab2SyncBtn = new System.Windows.Forms.Button(); - this.tab2DateSelect = new BWP.WinFormControl.UDatePicker(); - this.label4 = new System.Windows.Forms.Label(); this.uTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -754,109 +758,15 @@ this.preOrderGrid.Name = "preOrderGrid"; this.preOrderGrid.ReadOnly = true; this.preOrderGrid.RowHeadersVisible = false; - dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle10; - this.preOrderGrid.RowTemplate.Height = 40; + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle12; + this.preOrderGrid.RowTemplate.Height = 60; this.preOrderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.preOrderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.preOrderGrid.Size = new System.Drawing.Size(743, 663); this.preOrderGrid.TabIndex = 38; - this.preOrderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.preOrderGrid_CellClick); - // - // P_WeightBill_ID - // - this.P_WeightBill_ID.DataPropertyName = "WeightBill_ID"; - this.P_WeightBill_ID.HeaderText = "WeightBill_ID"; - this.P_WeightBill_ID.Name = "P_WeightBill_ID"; - this.P_WeightBill_ID.ReadOnly = true; - this.P_WeightBill_ID.Visible = false; - // - // P_Show - // - this.P_Show.DataPropertyName = "Show"; - this.P_Show.HeaderText = "Show"; - this.P_Show.Name = "P_Show"; - this.P_Show.ReadOnly = true; - this.P_Show.Visible = false; - // - // P_B3ID - // - this.P_B3ID.DataPropertyName = "B3ID"; - this.P_B3ID.HeaderText = "磅单号"; - this.P_B3ID.Name = "P_B3ID"; - this.P_B3ID.ReadOnly = true; - this.P_B3ID.Width = 80; - // - // P_Supplier_Name - // - this.P_Supplier_Name.DataPropertyName = "Supplier_Name"; - this.P_Supplier_Name.HeaderText = "供应商"; - this.P_Supplier_Name.Name = "P_Supplier_Name"; - this.P_Supplier_Name.ReadOnly = true; - this.P_Supplier_Name.Width = 80; - // - // P_HouseNames - // - this.P_HouseNames.DataPropertyName = "HouseNames"; - this.P_HouseNames.HeaderText = "圈舍"; - this.P_HouseNames.Name = "P_HouseNames"; - this.P_HouseNames.ReadOnly = true; - this.P_HouseNames.Width = 95; - // - // P_Number - // - this.P_Number.DataPropertyName = "Number"; - this.P_Number.HeaderText = "总头数"; - this.P_Number.Name = "P_Number"; - this.P_Number.ReadOnly = true; - this.P_Number.Width = 80; - // - // P_AlreadyNumber - // - this.P_AlreadyNumber.DataPropertyName = "AlreadyNumber"; - this.P_AlreadyNumber.HeaderText = "已排"; - this.P_AlreadyNumber.Name = "P_AlreadyNumber"; - this.P_AlreadyNumber.ReadOnly = true; - this.P_AlreadyNumber.Width = 65; - // - // P_LastNumber - // - this.P_LastNumber.DataPropertyName = "LastNumber"; - this.P_LastNumber.HeaderText = "剩余"; - this.P_LastNumber.Name = "P_LastNumber"; - this.P_LastNumber.ReadOnly = true; - this.P_LastNumber.Width = 65; - // - // P_WeighTime - // - this.P_WeighTime.DataPropertyName = "WeighTime"; - dataGridViewCellStyle9.Format = "MM/dd HH:mm"; - dataGridViewCellStyle9.NullValue = null; - this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle9; - this.P_WeighTime.HeaderText = "过磅时间"; - this.P_WeighTime.Name = "P_WeighTime"; - this.P_WeighTime.ReadOnly = true; - this.P_WeighTime.Width = 105; - // - // P_OKBtn - // - this.P_OKBtn.HeaderText = "排宰"; - this.P_OKBtn.Name = "P_OKBtn"; - this.P_OKBtn.ReadOnly = true; - this.P_OKBtn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.P_OKBtn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.P_OKBtn.Text = "排宰"; - this.P_OKBtn.UseColumnTextForButtonValue = true; - this.P_OKBtn.Width = 85; - // - // P_Hidden - // - this.P_Hidden.HeaderText = "隐藏"; - this.P_Hidden.Name = "P_Hidden"; - this.P_Hidden.ReadOnly = true; - this.P_Hidden.Text = "隐藏"; - this.P_Hidden.Width = 85; + this.preOrderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.preOrderGrid_CellContentClick); // // orderGrid // @@ -864,17 +774,17 @@ this.orderGrid.AllowUserToDeleteRows = false; this.orderGrid.AllowUserToResizeColumns = false; this.orderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; this.orderGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.O_ID, @@ -891,15 +801,50 @@ this.orderGrid.Name = "orderGrid"; this.orderGrid.ReadOnly = true; this.orderGrid.RowHeadersVisible = false; - dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle13; - this.orderGrid.RowTemplate.Height = 40; + dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle17; + this.orderGrid.RowTemplate.Height = 60; this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.orderGrid.Size = new System.Drawing.Size(513, 388); this.orderGrid.TabIndex = 38; - this.orderGrid.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellClick); + this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick); + // + // tab2SyncBtn + // + this.tab2SyncBtn.Font = new System.Drawing.Font("宋体", 15F); + this.tab2SyncBtn.Location = new System.Drawing.Point(277, 9); + this.tab2SyncBtn.Name = "tab2SyncBtn"; + this.tab2SyncBtn.Size = new System.Drawing.Size(94, 56); + this.tab2SyncBtn.TabIndex = 37; + this.tab2SyncBtn.Text = "同步"; + this.tab2SyncBtn.UseVisualStyleBackColor = true; + this.tab2SyncBtn.Click += new System.EventHandler(this.tab2SyncBtn_Click); + // + // tab2DateSelect + // + this.tab2DateSelect.BackColor = System.Drawing.Color.White; + this.tab2DateSelect.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tab2DateSelect.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0); + this.tab2DateSelect.Font = new System.Drawing.Font("宋体", 15F); + this.tab2DateSelect.Location = new System.Drawing.Point(124, 19); + this.tab2DateSelect.Name = "tab2DateSelect"; + this.tab2DateSelect.Size = new System.Drawing.Size(135, 30); + this.tab2DateSelect.TabIndex = 36; + this.tab2DateSelect.Text = "2017/09/08"; + this.tab2DateSelect.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.tab2DateSelect.Type = BWP.WinFormControl.DateTimeType.Date; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("宋体", 14F); + this.label4.Location = new System.Drawing.Point(23, 25); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(104, 19); + this.label4.TabIndex = 35; + this.label4.Text = "过磅日期："; // // O_ID // @@ -958,6 +903,9 @@ // // O_OKBtn // + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle15; this.O_OKBtn.HeaderText = "确定"; this.O_OKBtn.Name = "O_OKBtn"; this.O_OKBtn.ReadOnly = true; @@ -967,6 +915,9 @@ // // O_HurryBtn // + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle16.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.O_HurryBtn.DefaultCellStyle = dataGridViewCellStyle16; this.O_HurryBtn.HeaderText = "急宰"; this.O_HurryBtn.Name = "O_HurryBtn"; this.O_HurryBtn.ReadOnly = true; @@ -974,40 +925,105 @@ this.O_HurryBtn.UseColumnTextForButtonValue = true; this.O_HurryBtn.Width = 95; // - // tab2SyncBtn + // P_WeightBill_ID // - this.tab2SyncBtn.Font = new System.Drawing.Font("宋体", 15F); - this.tab2SyncBtn.Location = new System.Drawing.Point(277, 9); - this.tab2SyncBtn.Name = "tab2SyncBtn"; - this.tab2SyncBtn.Size = new System.Drawing.Size(94, 56); - this.tab2SyncBtn.TabIndex = 37; - this.tab2SyncBtn.Text = "同步"; - this.tab2SyncBtn.UseVisualStyleBackColor = true; - this.tab2SyncBtn.Click += new System.EventHandler(this.tab2SyncBtn_Click); + this.P_WeightBill_ID.DataPropertyName = "WeightBill_ID"; + this.P_WeightBill_ID.HeaderText = "WeightBill_ID"; + this.P_WeightBill_ID.Name = "P_WeightBill_ID"; + this.P_WeightBill_ID.ReadOnly = true; + this.P_WeightBill_ID.Visible = false; // - // tab2DateSelect + // P_Show // - this.tab2DateSelect.BackColor = System.Drawing.Color.White; - this.tab2DateSelect.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tab2DateSelect.Date = new System.DateTime(2017, 9, 8, 0, 0, 0, 0); - this.tab2DateSelect.Font = new System.Drawing.Font("宋体", 15F); - this.tab2DateSelect.Location = new System.Drawing.Point(124, 19); - this.tab2DateSelect.Name = "tab2DateSelect"; - this.tab2DateSelect.Size = new System.Drawing.Size(135, 30); - this.tab2DateSelect.TabIndex = 36; - this.tab2DateSelect.Text = "2017/09/08"; - this.tab2DateSelect.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.tab2DateSelect.Type = BWP.WinFormControl.DateTimeType.Date; + this.P_Show.DataPropertyName = "Show"; + this.P_Show.HeaderText = "Show"; + this.P_Show.Name = "P_Show"; + this.P_Show.ReadOnly = true; + this.P_Show.Visible = false; // - // label4 + // P_B3ID // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("宋体", 14F); - this.label4.Location = new System.Drawing.Point(23, 25); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(104, 19); - this.label4.TabIndex = 35; - this.label4.Text = "过磅日期："; + this.P_B3ID.DataPropertyName = "B3ID"; + this.P_B3ID.HeaderText = "磅单号"; + this.P_B3ID.Name = "P_B3ID"; + this.P_B3ID.ReadOnly = true; + this.P_B3ID.Width = 80; + // + // P_Supplier_Name + // + this.P_Supplier_Name.DataPropertyName = "Supplier_Name"; + this.P_Supplier_Name.HeaderText = "供应商"; + this.P_Supplier_Name.Name = "P_Supplier_Name"; + this.P_Supplier_Name.ReadOnly = true; + this.P_Supplier_Name.Width = 80; + // + // P_HouseNames + // + this.P_HouseNames.DataPropertyName = "HouseNames"; + this.P_HouseNames.HeaderText = "圈舍"; + this.P_HouseNames.Name = "P_HouseNames"; + this.P_HouseNames.ReadOnly = true; + this.P_HouseNames.Width = 95; + // + // P_Number + // + this.P_Number.DataPropertyName = "Number"; + this.P_Number.HeaderText = "总头数"; + this.P_Number.Name = "P_Number"; + this.P_Number.ReadOnly = true; + this.P_Number.Width = 80; + // + // P_AlreadyNumber + // + this.P_AlreadyNumber.DataPropertyName = "AlreadyNumber"; + this.P_AlreadyNumber.HeaderText = "已排"; + this.P_AlreadyNumber.Name = "P_AlreadyNumber"; + this.P_AlreadyNumber.ReadOnly = true; + this.P_AlreadyNumber.Width = 65; + // + // P_LastNumber + // + this.P_LastNumber.DataPropertyName = "LastNumber"; + this.P_LastNumber.HeaderText = "剩余"; + this.P_LastNumber.Name = "P_LastNumber"; + this.P_LastNumber.ReadOnly = true; + this.P_LastNumber.Width = 65; + // + // P_WeighTime + // + this.P_WeighTime.DataPropertyName = "WeighTime"; + dataGridViewCellStyle9.Format = "MM/dd HH:mm"; + dataGridViewCellStyle9.NullValue = null; + this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle9; + this.P_WeighTime.HeaderText = "过磅时间"; + this.P_WeighTime.Name = "P_WeighTime"; + this.P_WeighTime.ReadOnly = true; + this.P_WeighTime.Width = 105; + // + // P_OKBtn + // + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle10; + this.P_OKBtn.HeaderText = "排宰"; + this.P_OKBtn.Name = "P_OKBtn"; + this.P_OKBtn.ReadOnly = true; + this.P_OKBtn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.P_OKBtn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.P_OKBtn.Text = "排宰"; + this.P_OKBtn.UseColumnTextForButtonValue = true; + this.P_OKBtn.Width = 85; + // + // P_Hidden + // + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle11; + this.P_Hidden.HeaderText = "隐藏"; + this.P_Hidden.Name = "P_Hidden"; + this.P_Hidden.ReadOnly = true; + this.P_Hidden.Text = "隐藏"; + this.P_Hidden.Width = 85; // // QualityOrderForm // @@ -1084,15 +1100,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID2; private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID3; private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID3; - private System.Windows.Forms.DataGridViewTextBoxColumn O_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn O_IsHurryButcher; - private System.Windows.Forms.DataGridViewTextBoxColumn O_WeightBill_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn O_Order; - private System.Windows.Forms.DataGridViewTextBoxColumn O_B3WeighBill_ID; - private System.Windows.Forms.DataGridViewTextBoxColumn O_PlanNumber; - private System.Windows.Forms.DataGridViewTextBoxColumn O_LiveColonyHouse_Name; - private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn; - private System.Windows.Forms.DataGridViewButtonColumn O_HurryBtn; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.RadioButton showHidden; @@ -1105,6 +1112,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn W_Supplier_Name; private System.Windows.Forms.DataGridViewTextBoxColumn W_Number; private System.Windows.Forms.DataGridViewTextBoxColumn W_HouseNames; + private System.Windows.Forms.VScrollBar vScrollBar1; + private System.Windows.Forms.VScrollBar vScrollBar2; + private System.Windows.Forms.VScrollBar vScrollBar3; private System.Windows.Forms.DataGridViewTextBoxColumn P_WeightBill_ID; private System.Windows.Forms.DataGridViewTextBoxColumn P_Show; private System.Windows.Forms.DataGridViewTextBoxColumn P_B3ID; @@ -1116,9 +1126,15 @@ private System.Windows.Forms.DataGridViewTextBoxColumn P_WeighTime; private System.Windows.Forms.DataGridViewButtonColumn P_OKBtn; private System.Windows.Forms.DataGridViewButtonColumn P_Hidden; - private System.Windows.Forms.VScrollBar vScrollBar1; - private System.Windows.Forms.VScrollBar vScrollBar2; - private System.Windows.Forms.VScrollBar vScrollBar3; + private System.Windows.Forms.DataGridViewTextBoxColumn O_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn O_IsHurryButcher; + private System.Windows.Forms.DataGridViewTextBoxColumn O_WeightBill_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn O_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn O_B3WeighBill_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn O_PlanNumber; + private System.Windows.Forms.DataGridViewTextBoxColumn O_LiveColonyHouse_Name; + private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn; + private System.Windows.Forms.DataGridViewButtonColumn O_HurryBtn; diff --git a/QualityAndOrder/QualityOrderForm.cs b/QualityAndOrder/QualityOrderForm.cs index eb5098e..f748b62 100644 --- a/QualityAndOrder/QualityOrderForm.cs +++ b/QualityAndOrder/QualityOrderForm.cs @@ -345,6 +345,7 @@ namespace QualityAndOrder BindWeightBillGrid(); BindNumberLabel(); ResetTab1Controls(); + UMessageBox.Show("提交成功！"); } private void syncBtn_Click(object sender, EventArgs e) diff --git a/QualityAndOrder/QualityOrderFormForTab2.cs b/QualityAndOrder/QualityOrderFormForTab2.cs index 9c3c2b2..1ee95ff 100644 --- a/QualityAndOrder/QualityOrderFormForTab2.cs +++ b/QualityAndOrder/QualityOrderFormForTab2.cs @@ -160,7 +160,7 @@ namespace QualityAndOrder orderGrid.Refresh(); } - private void preOrderGrid_CellClick(object sender, DataGridViewCellEventArgs e) + private void preOrderGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex == -1) return; @@ -192,7 +192,7 @@ namespace QualityAndOrder BindPreOrderGrid(); } - private void orderGrid_CellClick(object sender, DataGridViewCellEventArgs e) + private void orderGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex == -1) return;