From 60981d5567043b479dc2101368b30ee4459eceab Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 6 Mar 2018 09:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138861=20?= =?UTF-8?q?=E6=8E=92=E5=AE=B0=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=AF=8F=E4=B8=AA=E7=B1=BB=E5=88=AB=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=A4=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Utils/BillRpc/OrderDetailRpc.cs | 6 + .../OffLineQualityOrderForm.Designer.cs | 407 ++++++++++-------- .../OffLineQualityOrderForm.resx | 84 ++-- .../OffLineQualityOrderFormForTab2.cs | 15 +- QualityAndOrder/QualityOrderForm.Designer.cs | 273 +++++++----- QualityAndOrder/QualityOrderForm.resx | 82 ++-- QualityAndOrder/QualityOrderFormForTab2.cs | 15 +- 7 files changed, 492 insertions(+), 390 deletions(-) diff --git a/BO/Utils/BillRpc/OrderDetailRpc.cs b/BO/Utils/BillRpc/OrderDetailRpc.cs index b0ee902..6c92237 100644 --- a/BO/Utils/BillRpc/OrderDetailRpc.cs +++ b/BO/Utils/BillRpc/OrderDetailRpc.cs @@ -21,6 +21,12 @@ namespace BO.Utils.BillRpc return serializer.Deserialize>(result); } + public static Tuple GetEveryNumberTuple(DateTime date) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetEveryNumberTuple"; + return RpcFacade.Call>(method, date); + } + public static int GetLastNumber(long weightId, long orerID) { const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OrderDetailRpc/GetLastNumber"; diff --git a/OffLineQualityAndOrder/OffLineQualityOrderForm.Designer.cs b/OffLineQualityAndOrder/OffLineQualityOrderForm.Designer.cs index ee12ec8..0261c95 100644 --- a/OffLineQualityAndOrder/OffLineQualityOrderForm.Designer.cs +++ b/OffLineQualityAndOrder/OffLineQualityOrderForm.Designer.cs @@ -28,22 +28,22 @@ /// private void InitializeComponent() { - 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 dataGridViewCellStyle12 = 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle92 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle93 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle94 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle95 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle96 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle86 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle85 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle87 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle88 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle90 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle89 = 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(); @@ -93,10 +93,6 @@ this.label3 = new System.Windows.Forms.Label(); this.vScrollBar3 = new System.Windows.Forms.VScrollBar(); this.vScrollBar2 = new System.Windows.Forms.VScrollBar(); - this.panel3 = new System.Windows.Forms.Panel(); - this.showHidden = new System.Windows.Forms.RadioButton(); - this.showAvailable = new System.Windows.Forms.RadioButton(); - this.showAll = new System.Windows.Forms.RadioButton(); this.panel2 = new System.Windows.Forms.Panel(); this.tab2KeyPanel = new System.Windows.Forms.FlowLayoutPanel(); this.closeBtn2 = new System.Windows.Forms.Button(); @@ -115,9 +111,6 @@ this.P_OKBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.P_Hidden = new System.Windows.Forms.DataGridViewButtonColumn(); 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_Technics = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.O_IsHurryButcher = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -130,6 +123,16 @@ this.O_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.O_PlanNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.O_OKBtn = 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.panel3 = new System.Windows.Forms.Panel(); + this.totalNumLb = new System.Windows.Forms.Label(); + this.hiddenNumLb = new System.Windows.Forms.Label(); + this.displayNumLb = new System.Windows.Forms.Label(); + this.showHidden = new System.Windows.Forms.RadioButton(); + this.showAvailable = new System.Windows.Forms.RadioButton(); + this.showAll = new System.Windows.Forms.RadioButton(); this.uTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -140,10 +143,10 @@ ((System.ComponentModel.ISupportInitialize)(this.weightBillGrid)).BeginInit(); this.tabPage2.SuspendLayout(); this.groupBox1.SuspendLayout(); - this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.preOrderGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // uTabControl1 @@ -231,17 +234,17 @@ this.sanctionGrid.AllowUserToDeleteRows = false; this.sanctionGrid.AllowUserToResizeColumns = false; this.sanctionGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle91.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle91; this.sanctionGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle92.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle92.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle92.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle92.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle92.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle92.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle92.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle92; this.sanctionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.sanctionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.S_AbnormalItem_Name1, @@ -262,9 +265,9 @@ this.sanctionGrid.Name = "sanctionGrid"; this.sanctionGrid.ReadOnly = true; this.sanctionGrid.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.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle93.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle93.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle93; this.sanctionGrid.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.sanctionGrid.RowTemplate.Height = 50; this.sanctionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; @@ -473,17 +476,17 @@ this.weightBillGrid.AllowUserToDeleteRows = false; this.weightBillGrid.AllowUserToResizeColumns = false; this.weightBillGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle94.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle94; this.weightBillGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle95.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle95.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle95.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle95.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle95.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle95.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle95.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle95; this.weightBillGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.weightBillGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.W_ID, @@ -498,11 +501,11 @@ this.weightBillGrid.Name = "weightBillGrid"; this.weightBillGrid.ReadOnly = true; this.weightBillGrid.RowHeadersVisible = false; - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle96.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle96.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle96.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle96.SelectionForeColor = System.Drawing.Color.Black; + this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle96; this.weightBillGrid.RowTemplate.Height = 40; this.weightBillGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.weightBillGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -602,13 +605,13 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.panel3); this.tabPage2.Controls.Add(this.groupBox1); this.tabPage2.Controls.Add(this.butcherSearch); this.tabPage2.Controls.Add(this.butcherDateInput); this.tabPage2.Controls.Add(this.label3); this.tabPage2.Controls.Add(this.vScrollBar3); this.tabPage2.Controls.Add(this.vScrollBar2); - this.tabPage2.Controls.Add(this.panel3); this.tabPage2.Controls.Add(this.panel2); this.tabPage2.Controls.Add(this.closeBtn2); this.tabPage2.Controls.Add(this.label6); @@ -708,54 +711,6 @@ this.vScrollBar2.Size = new System.Drawing.Size(40, 388); this.vScrollBar2.TabIndex = 53; // - // panel3 - // - this.panel3.Controls.Add(this.showHidden); - this.panel3.Controls.Add(this.showAvailable); - this.panel3.Controls.Add(this.showAll); - this.panel3.Location = new System.Drawing.Point(706, 82); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(416, 42); - this.panel3.TabIndex = 45; - // - // showHidden - // - this.showHidden.AutoSize = true; - this.showHidden.Font = new System.Drawing.Font("宋体", 15F); - this.showHidden.Location = new System.Drawing.Point(161, 9); - this.showHidden.Name = "showHidden"; - this.showHidden.Size = new System.Drawing.Size(67, 24); - this.showHidden.TabIndex = 2; - this.showHidden.Text = "隐藏"; - this.showHidden.UseVisualStyleBackColor = true; - this.showHidden.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); - // - // showAvailable - // - this.showAvailable.AutoSize = true; - this.showAvailable.Checked = true; - this.showAvailable.Font = new System.Drawing.Font("宋体", 15F); - this.showAvailable.Location = new System.Drawing.Point(32, 9); - this.showAvailable.Name = "showAvailable"; - this.showAvailable.Size = new System.Drawing.Size(67, 24); - this.showAvailable.TabIndex = 1; - this.showAvailable.TabStop = true; - this.showAvailable.Text = "显示"; - this.showAvailable.UseVisualStyleBackColor = true; - this.showAvailable.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); - // - // showAll - // - this.showAll.AutoSize = true; - this.showAll.Font = new System.Drawing.Font("宋体", 15F); - this.showAll.Location = new System.Drawing.Point(293, 9); - this.showAll.Name = "showAll"; - this.showAll.Size = new System.Drawing.Size(67, 24); - this.showAll.TabIndex = 0; - this.showAll.Text = "全部"; - this.showAll.UseVisualStyleBackColor = true; - this.showAll.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); - // // panel2 // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -812,17 +767,17 @@ this.preOrderGrid.AllowUserToDeleteRows = false; this.preOrderGrid.AllowUserToResizeColumns = false; this.preOrderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle81.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle81; this.preOrderGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle82.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle82.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle82.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle82.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle82.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle82.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle82; this.preOrderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.preOrderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.P_WeightBill_ID, @@ -841,11 +796,11 @@ this.preOrderGrid.Name = "preOrderGrid"; this.preOrderGrid.ReadOnly = true; this.preOrderGrid.RowHeadersVisible = false; - dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; - this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle86.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle86.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle86.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle86.SelectionForeColor = System.Drawing.Color.Black; + this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle86; this.preOrderGrid.RowTemplate.Height = 60; this.preOrderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.preOrderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -921,9 +876,9 @@ // P_WeighTime // this.P_WeighTime.DataPropertyName = "WeighTime"; - dataGridViewCellStyle9.Format = "MM/dd HH:mm"; - dataGridViewCellStyle9.NullValue = null; - this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle83.Format = "MM/dd HH:mm"; + dataGridViewCellStyle83.NullValue = null; + this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle83; this.P_WeighTime.HeaderText = "过磅时间"; this.P_WeighTime.Name = "P_WeighTime"; this.P_WeighTime.ReadOnly = true; @@ -931,9 +886,9 @@ // // 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; + dataGridViewCellStyle84.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle84.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle84; this.P_OKBtn.HeaderText = "排宰"; this.P_OKBtn.Name = "P_OKBtn"; this.P_OKBtn.ReadOnly = true; @@ -945,9 +900,9 @@ // // 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; + dataGridViewCellStyle85.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle85.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle85; this.P_Hidden.HeaderText = "隐藏"; this.P_Hidden.Name = "P_Hidden"; this.P_Hidden.ReadOnly = true; @@ -960,17 +915,17 @@ this.orderGrid.AllowUserToDeleteRows = false; this.orderGrid.AllowUserToResizeColumns = false; this.orderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle87.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle87; this.orderGrid.BackgroundColor = System.Drawing.Color.White; - 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; + dataGridViewCellStyle88.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle88.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle88.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle88.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle88.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle88.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle88.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle88; this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.O_ID, @@ -990,11 +945,11 @@ this.orderGrid.Name = "orderGrid"; this.orderGrid.ReadOnly = true; this.orderGrid.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.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle90.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle90.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle90.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle90.SelectionForeColor = System.Drawing.Color.Black; + this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle90; this.orderGrid.RowTemplate.Height = 60; this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -1003,41 +958,6 @@ 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(841, 7); - 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(688, 17); - 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(587, 23); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(104, 19); - this.label4.TabIndex = 35; - this.label4.Text = "过磅日期："; - // // O_ID // this.O_ID.DataPropertyName = "ID"; @@ -1127,9 +1047,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; + dataGridViewCellStyle89.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle89.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle89; this.O_OKBtn.HeaderText = "确定"; this.O_OKBtn.Name = "O_OKBtn"; this.O_OKBtn.ReadOnly = true; @@ -1137,6 +1057,122 @@ this.O_OKBtn.UseColumnTextForButtonValue = true; this.O_OKBtn.Width = 95; // + // tab2SyncBtn + // + this.tab2SyncBtn.Font = new System.Drawing.Font("宋体", 15F); + this.tab2SyncBtn.Location = new System.Drawing.Point(841, 7); + 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(688, 17); + 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(587, 23); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(104, 19); + this.label4.TabIndex = 35; + this.label4.Text = "过磅日期："; + // + // panel3 + // + this.panel3.Controls.Add(this.totalNumLb); + this.panel3.Controls.Add(this.hiddenNumLb); + this.panel3.Controls.Add(this.displayNumLb); + this.panel3.Controls.Add(this.showHidden); + this.panel3.Controls.Add(this.showAvailable); + this.panel3.Controls.Add(this.showAll); + this.panel3.Location = new System.Drawing.Point(706, 82); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(490, 42); + this.panel3.TabIndex = 61; + // + // totalNumLb + // + this.totalNumLb.AutoSize = true; + this.totalNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.totalNumLb.ForeColor = System.Drawing.Color.Red; + this.totalNumLb.Location = new System.Drawing.Point(397, 16); + this.totalNumLb.Name = "totalNumLb"; + this.totalNumLb.Size = new System.Drawing.Size(0, 19); + this.totalNumLb.TabIndex = 5; + // + // hiddenNumLb + // + this.hiddenNumLb.AutoSize = true; + this.hiddenNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.hiddenNumLb.ForeColor = System.Drawing.Color.Red; + this.hiddenNumLb.Location = new System.Drawing.Point(241, 16); + this.hiddenNumLb.Name = "hiddenNumLb"; + this.hiddenNumLb.Size = new System.Drawing.Size(0, 19); + this.hiddenNumLb.TabIndex = 4; + // + // displayNumLb + // + this.displayNumLb.AutoSize = true; + this.displayNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.displayNumLb.ForeColor = System.Drawing.Color.Red; + this.displayNumLb.Location = new System.Drawing.Point(94, 16); + this.displayNumLb.Name = "displayNumLb"; + this.displayNumLb.Size = new System.Drawing.Size(0, 19); + this.displayNumLb.TabIndex = 3; + // + // showHidden + // + this.showHidden.AutoSize = true; + this.showHidden.Font = new System.Drawing.Font("宋体", 15F); + this.showHidden.Location = new System.Drawing.Point(178, 9); + this.showHidden.Name = "showHidden"; + this.showHidden.Size = new System.Drawing.Size(67, 24); + this.showHidden.TabIndex = 2; + this.showHidden.Text = "隐藏"; + this.showHidden.UseVisualStyleBackColor = true; + this.showHidden.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); + // + // showAvailable + // + this.showAvailable.AutoSize = true; + this.showAvailable.Checked = true; + this.showAvailable.Font = new System.Drawing.Font("宋体", 15F); + this.showAvailable.Location = new System.Drawing.Point(32, 9); + this.showAvailable.Name = "showAvailable"; + this.showAvailable.Size = new System.Drawing.Size(67, 24); + this.showAvailable.TabIndex = 1; + this.showAvailable.TabStop = true; + this.showAvailable.Text = "显示"; + this.showAvailable.UseVisualStyleBackColor = true; + this.showAvailable.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); + // + // showAll + // + this.showAll.AutoSize = true; + this.showAll.Font = new System.Drawing.Font("宋体", 15F); + this.showAll.Location = new System.Drawing.Point(334, 9); + this.showAll.Name = "showAll"; + this.showAll.Size = new System.Drawing.Size(67, 24); + this.showAll.TabIndex = 0; + this.showAll.Text = "全部"; + this.showAll.UseVisualStyleBackColor = true; + this.showAll.CheckedChanged += new System.EventHandler(this.showRadio_CheckedChanged); + // // OffLineQualityOrderForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1160,11 +1196,11 @@ this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); this.groupBox1.ResumeLayout(false); - this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.preOrderGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).EndInit(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); this.ResumeLayout(false); } @@ -1214,10 +1250,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn S_Sanction_ID3; private System.Windows.Forms.DataGridViewTextBoxColumn S_AbnormalItem_ID3; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.Panel panel3; - private System.Windows.Forms.RadioButton showHidden; - private System.Windows.Forms.RadioButton showAvailable; - private System.Windows.Forms.RadioButton showAll; private System.Windows.Forms.DataGridViewTextBoxColumn W_ID; private System.Windows.Forms.DataGridViewTextBoxColumn W_AlreadyHouse; private System.Windows.Forms.DataGridViewTextBoxColumn W_B3ID; @@ -1257,6 +1289,13 @@ private System.Windows.Forms.DataGridViewTextBoxColumn O_LiveColonyHouse_Name; private System.Windows.Forms.DataGridViewTextBoxColumn O_PlanNumber; private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Label totalNumLb; + private System.Windows.Forms.Label hiddenNumLb; + private System.Windows.Forms.Label displayNumLb; + private System.Windows.Forms.RadioButton showHidden; + private System.Windows.Forms.RadioButton showAvailable; + private System.Windows.Forms.RadioButton showAll; diff --git a/OffLineQualityAndOrder/OffLineQualityOrderForm.resx b/OffLineQualityAndOrder/OffLineQualityOrderForm.resx index b5d239b..1f5dacc 100644 --- a/OffLineQualityAndOrder/OffLineQualityOrderForm.resx +++ b/OffLineQualityAndOrder/OffLineQualityOrderForm.resx @@ -117,130 +117,130 @@ 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 - + True - + True - + True - + True - + True - + True - + True - + True - + 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 diff --git a/OffLineQualityAndOrder/OffLineQualityOrderFormForTab2.cs b/OffLineQualityAndOrder/OffLineQualityOrderFormForTab2.cs index 5834549..db3cae2 100644 --- a/OffLineQualityAndOrder/OffLineQualityOrderFormForTab2.cs +++ b/OffLineQualityAndOrder/OffLineQualityOrderFormForTab2.cs @@ -111,9 +111,10 @@ namespace OffLineQualityAndOrder while (true) { this.Invoke(new InvokeHandler(delegate() - { - BindPreOrderGrid(); - })); + { + BindEveryNumberLabel(); + BindPreOrderGrid(); + })); Thread.Sleep(5000); } } @@ -130,6 +131,14 @@ namespace OffLineQualityAndOrder } } + private void BindEveryNumberLabel() + { + var tuple = OrderDetailRpc.GetEveryNumberTuple(tab2DateSelect.Date.Value); + displayNumLb.Text = string.Format("({0})", tuple.Item1); + hiddenNumLb.Text = string.Format("({0})", tuple.Item2); + totalNumLb.Text = string.Format("({0})", tuple.Item1 + tuple.Item2); + } + NeedOrderEntity lastPreOrder; void BindPreOrderGrid() { diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs index 675722d..fb1c136 100644 --- a/QualityAndOrder/QualityOrderForm.Designer.cs +++ b/QualityAndOrder/QualityOrderForm.Designer.cs @@ -28,27 +28,27 @@ /// private void InitializeComponent() { - 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 dataGridViewCellStyle12 = 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = 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 dataGridViewCellStyle21 = 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 dataGridViewCellStyle74 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle75 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle76 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle77 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle78 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle64 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle73 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle81 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle84 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle82 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle83 = 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(); @@ -147,6 +147,9 @@ this.H_HurryNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewButtonColumn1 = new System.Windows.Forms.DataGridViewButtonColumn(); this.H_View = new System.Windows.Forms.DataGridViewButtonColumn(); + this.displayNumLb = new System.Windows.Forms.Label(); + this.hiddenNumLb = new System.Windows.Forms.Label(); + this.totalNumLb = new System.Windows.Forms.Label(); this.uTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -251,17 +254,17 @@ this.sanctionGrid.AllowUserToDeleteRows = false; this.sanctionGrid.AllowUserToResizeColumns = false; this.sanctionGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle74.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle74; this.sanctionGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle75.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle75.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle75.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle75.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle75.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle75.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle75.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.sanctionGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle75; this.sanctionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.sanctionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.S_AbnormalItem_Name1, @@ -282,9 +285,9 @@ this.sanctionGrid.Name = "sanctionGrid"; this.sanctionGrid.ReadOnly = true; this.sanctionGrid.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.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle76.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle76.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.sanctionGrid.RowsDefaultCellStyle = dataGridViewCellStyle76; this.sanctionGrid.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.sanctionGrid.RowTemplate.Height = 50; this.sanctionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; @@ -493,17 +496,17 @@ this.weightBillGrid.AllowUserToDeleteRows = false; this.weightBillGrid.AllowUserToResizeColumns = false; this.weightBillGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle77.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle77; this.weightBillGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle78.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle78.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle78.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.weightBillGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle78; this.weightBillGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.weightBillGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.W_ID, @@ -518,11 +521,11 @@ this.weightBillGrid.Name = "weightBillGrid"; this.weightBillGrid.ReadOnly = true; this.weightBillGrid.RowHeadersVisible = false; - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle79.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle79.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle79.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle79.SelectionForeColor = System.Drawing.Color.Black; + this.weightBillGrid.RowsDefaultCellStyle = dataGridViewCellStyle79; this.weightBillGrid.RowTemplate.Height = 40; this.weightBillGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.weightBillGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -640,7 +643,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 54); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1354, 683); + this.tabPage2.Size = new System.Drawing.Size(1354, 760); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "排宰顺序"; this.tabPage2.UseVisualStyleBackColor = true; @@ -696,19 +699,22 @@ // // panel3 // + this.panel3.Controls.Add(this.totalNumLb); + this.panel3.Controls.Add(this.hiddenNumLb); + this.panel3.Controls.Add(this.displayNumLb); this.panel3.Controls.Add(this.showHidden); this.panel3.Controls.Add(this.showAvailable); this.panel3.Controls.Add(this.showAll); this.panel3.Location = new System.Drawing.Point(706, 82); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(416, 42); + this.panel3.Size = new System.Drawing.Size(490, 42); this.panel3.TabIndex = 45; // // showHidden // this.showHidden.AutoSize = true; this.showHidden.Font = new System.Drawing.Font("宋体", 15F); - this.showHidden.Location = new System.Drawing.Point(161, 9); + this.showHidden.Location = new System.Drawing.Point(178, 9); this.showHidden.Name = "showHidden"; this.showHidden.Size = new System.Drawing.Size(67, 24); this.showHidden.TabIndex = 2; @@ -734,7 +740,7 @@ // this.showAll.AutoSize = true; this.showAll.Font = new System.Drawing.Font("宋体", 15F); - this.showAll.Location = new System.Drawing.Point(293, 9); + this.showAll.Location = new System.Drawing.Point(334, 9); this.showAll.Name = "showAll"; this.showAll.Size = new System.Drawing.Size(67, 24); this.showAll.TabIndex = 0; @@ -798,17 +804,17 @@ this.preOrderGrid.AllowUserToDeleteRows = false; this.preOrderGrid.AllowUserToResizeColumns = false; this.preOrderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle64.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle64; this.preOrderGrid.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle65.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle65.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle65.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle65.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle65.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle65.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.preOrderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle65; this.preOrderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.preOrderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.P_WeightBill_ID, @@ -827,11 +833,11 @@ this.preOrderGrid.Name = "preOrderGrid"; this.preOrderGrid.ReadOnly = true; this.preOrderGrid.RowHeadersVisible = false; - dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; - this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle69.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle69.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle69.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle69.SelectionForeColor = System.Drawing.Color.Black; + this.preOrderGrid.RowsDefaultCellStyle = dataGridViewCellStyle69; this.preOrderGrid.RowTemplate.Height = 60; this.preOrderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.preOrderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -907,9 +913,9 @@ // P_WeighTime // this.P_WeighTime.DataPropertyName = "WeighTime"; - dataGridViewCellStyle9.Format = "MM/dd HH:mm"; - dataGridViewCellStyle9.NullValue = null; - this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle66.Format = "MM/dd HH:mm"; + dataGridViewCellStyle66.NullValue = null; + this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle66; this.P_WeighTime.HeaderText = "过磅时间"; this.P_WeighTime.Name = "P_WeighTime"; this.P_WeighTime.ReadOnly = true; @@ -917,9 +923,9 @@ // // 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; + dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle67.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle67; this.P_OKBtn.HeaderText = "排宰"; this.P_OKBtn.Name = "P_OKBtn"; this.P_OKBtn.ReadOnly = true; @@ -931,9 +937,9 @@ // // 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; + dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle68.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle68; this.P_Hidden.HeaderText = "隐藏"; this.P_Hidden.Name = "P_Hidden"; this.P_Hidden.ReadOnly = true; @@ -946,17 +952,17 @@ this.orderGrid.AllowUserToDeleteRows = false; this.orderGrid.AllowUserToResizeColumns = false; this.orderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle70; this.orderGrid.BackgroundColor = System.Drawing.Color.White; - 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; + dataGridViewCellStyle71.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle71.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle71.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle71.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle71.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle71.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle71.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle71; this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.O_ID, @@ -975,11 +981,11 @@ this.orderGrid.Name = "orderGrid"; this.orderGrid.ReadOnly = true; this.orderGrid.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.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle73.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle73.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle73.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle73.SelectionForeColor = System.Drawing.Color.Black; + this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle73; this.orderGrid.RowTemplate.Height = 60; this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -1069,9 +1075,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; + dataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle72.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle72; this.O_OKBtn.HeaderText = "确定"; this.O_OKBtn.Name = "O_OKBtn"; this.O_OKBtn.ReadOnly = true; @@ -1125,7 +1131,7 @@ this.tabPage5.Location = new System.Drawing.Point(4, 54); this.tabPage5.Name = "tabPage5"; this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(1354, 683); + this.tabPage5.Size = new System.Drawing.Size(1354, 760); this.tabPage5.TabIndex = 2; this.tabPage5.Text = "急宰"; this.tabPage5.UseVisualStyleBackColor = true; @@ -1193,17 +1199,17 @@ this.orderGrid3.AllowUserToDeleteRows = false; this.orderGrid3.AllowUserToResizeColumns = false; this.orderGrid3.AllowUserToResizeRows = false; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle80.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle80; this.orderGrid3.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.orderGrid3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle81.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle81.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle81.Font = new System.Drawing.Font("宋体", 12F); + dataGridViewCellStyle81.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle81.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle81.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle81.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.orderGrid3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle81; this.orderGrid3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGrid3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.H_WeightBill_ID, @@ -1219,11 +1225,11 @@ this.orderGrid3.Name = "orderGrid3"; this.orderGrid3.ReadOnly = true; this.orderGrid3.RowHeadersVisible = false; - dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black; - this.orderGrid3.RowsDefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle84.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle84.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle84.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle84.SelectionForeColor = System.Drawing.Color.Black; + this.orderGrid3.RowsDefaultCellStyle = dataGridViewCellStyle84; this.orderGrid3.RowTemplate.Height = 60; this.orderGrid3.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid3.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -1282,9 +1288,9 @@ // // dataGridViewButtonColumn1 // - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.dataGridViewButtonColumn1.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle82.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.dataGridViewButtonColumn1.DefaultCellStyle = dataGridViewCellStyle82; this.dataGridViewButtonColumn1.HeaderText = "确定"; this.dataGridViewButtonColumn1.Name = "dataGridViewButtonColumn1"; this.dataGridViewButtonColumn1.ReadOnly = true; @@ -1294,9 +1300,9 @@ // // H_View // - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.H_View.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle83.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle83.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.H_View.DefaultCellStyle = dataGridViewCellStyle83; this.H_View.HeaderText = "查看"; this.H_View.Name = "H_View"; this.H_View.ReadOnly = true; @@ -1304,6 +1310,36 @@ this.H_View.UseColumnTextForButtonValue = true; this.H_View.Width = 110; // + // displayNumLb + // + this.displayNumLb.AutoSize = true; + this.displayNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.displayNumLb.ForeColor = System.Drawing.Color.Red; + this.displayNumLb.Location = new System.Drawing.Point(94, 16); + this.displayNumLb.Name = "displayNumLb"; + this.displayNumLb.Size = new System.Drawing.Size(0, 19); + this.displayNumLb.TabIndex = 3; + // + // hiddenNumLb + // + this.hiddenNumLb.AutoSize = true; + this.hiddenNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.hiddenNumLb.ForeColor = System.Drawing.Color.Red; + this.hiddenNumLb.Location = new System.Drawing.Point(241, 16); + this.hiddenNumLb.Name = "hiddenNumLb"; + this.hiddenNumLb.Size = new System.Drawing.Size(0, 19); + this.hiddenNumLb.TabIndex = 4; + // + // totalNumLb + // + this.totalNumLb.AutoSize = true; + this.totalNumLb.Font = new System.Drawing.Font("宋体", 14F); + this.totalNumLb.ForeColor = System.Drawing.Color.Red; + this.totalNumLb.Location = new System.Drawing.Point(397, 16); + this.totalNumLb.Name = "totalNumLb"; + this.totalNumLb.Size = new System.Drawing.Size(0, 19); + this.totalNumLb.TabIndex = 5; + // // QualityOrderForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1439,6 +1475,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn O_LiveColonyHouse_Name; private System.Windows.Forms.DataGridViewTextBoxColumn O_PlanNumber; private System.Windows.Forms.DataGridViewButtonColumn O_OKBtn; + private System.Windows.Forms.Label totalNumLb; + private System.Windows.Forms.Label hiddenNumLb; + private System.Windows.Forms.Label displayNumLb; diff --git a/QualityAndOrder/QualityOrderForm.resx b/QualityAndOrder/QualityOrderForm.resx index 9cdee26..605f6c6 100644 --- a/QualityAndOrder/QualityOrderForm.resx +++ b/QualityAndOrder/QualityOrderForm.resx @@ -117,127 +117,127 @@ 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 - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True diff --git a/QualityAndOrder/QualityOrderFormForTab2.cs b/QualityAndOrder/QualityOrderFormForTab2.cs index 1cceb2e..767062e 100644 --- a/QualityAndOrder/QualityOrderFormForTab2.cs +++ b/QualityAndOrder/QualityOrderFormForTab2.cs @@ -111,9 +111,10 @@ namespace QualityAndOrder while (true) { this.Invoke(new InvokeHandler(delegate() - { - BindPreOrderGrid(); - })); + { + BindEveryNumberLabel(); + BindPreOrderGrid(); + })); Thread.Sleep(5000); } } @@ -130,6 +131,14 @@ namespace QualityAndOrder } } + private void BindEveryNumberLabel() + { + var tuple = OrderDetailRpc.GetEveryNumberTuple(tab2DateSelect.Date.Value); + displayNumLb.Text = string.Format("({0})", tuple.Item1); + hiddenNumLb.Text = string.Format("({0})", tuple.Item2); + totalNumLb.Text = string.Format("({0})", tuple.Item1 + tuple.Item2); + } + NeedOrderEntity lastPreOrder; void BindPreOrderGrid() {