From 48ce0311b5108d99c530571e5320a87fd80d236b Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 10 Mar 2018 15:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=20=E8=B5=B6=E7=8C=AA=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E3=80=82=E5=8A=A0=20=E7=AA=92=E6=99=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3ButcherManageClient.sln | 6 + BO/BO.csproj | 2 + BO/BO/Bill/OrderDetail/BeforeDeathDetail.cs | 19 ++ BO/BO/Bill/OrderDetail/OutHouseObj.cs | 19 ++ BO/Utils/AfterLoginUtil.cs | 4 + BO/Utils/BillRpc/OrderDetailRpc.cs | 33 ++ BeforeDeathClient/BeforeDeathClient.csproj | 58 ++++ BeforeDeathClient/Properties/AssemblyInfo.cs | 36 +++ ButcherOrder/ButcherOrderForm.Designer.cs | 30 +- OutHouseView/BeforeDeathConfirm.Designer.cs | 222 +++++++++++++ OutHouseView/BeforeDeathConfirm.cs | 132 ++++++++ OutHouseView/BeforeDeathConfirm.resx | 135 ++++++++ OutHouseView/OutHouseFrom.Designer.cs | 168 ++++++++++ OutHouseView/OutHouseFrom.cs | 91 ++++++ OutHouseView/OutHouseFrom.resx | 135 ++++++++ OutHouseView/OutHouseView.csproj | 98 ++++++ OutHouseView/Properties/AssemblyInfo.cs | 36 +++ OutHouseView/ViewDetail.Designer.cs | 222 +++++++++++++ OutHouseView/ViewDetail.cs | 74 +++++ OutHouseView/ViewDetail.resx | 132 ++++++++ QualityAndOrder/QualityOrderForm.Designer.cs | 309 ++++++++++--------- QualityAndOrder/QualityOrderForm.resx | 82 ++--- QualityAndOrder/QualityOrderFormForTab3.cs | 1 + 23 files changed, 1847 insertions(+), 197 deletions(-) create mode 100644 BO/BO/Bill/OrderDetail/BeforeDeathDetail.cs create mode 100644 BO/BO/Bill/OrderDetail/OutHouseObj.cs create mode 100644 BeforeDeathClient/BeforeDeathClient.csproj create mode 100644 BeforeDeathClient/Properties/AssemblyInfo.cs create mode 100644 OutHouseView/BeforeDeathConfirm.Designer.cs create mode 100644 OutHouseView/BeforeDeathConfirm.cs create mode 100644 OutHouseView/BeforeDeathConfirm.resx create mode 100644 OutHouseView/OutHouseFrom.Designer.cs create mode 100644 OutHouseView/OutHouseFrom.cs create mode 100644 OutHouseView/OutHouseFrom.resx create mode 100644 OutHouseView/OutHouseView.csproj create mode 100644 OutHouseView/Properties/AssemblyInfo.cs create mode 100644 OutHouseView/ViewDetail.Designer.cs create mode 100644 OutHouseView/ViewDetail.cs create mode 100644 OutHouseView/ViewDetail.resx diff --git a/B3ButcherManageClient.sln b/B3ButcherManageClient.sln index 8a36370..094fd94 100644 --- a/B3ButcherManageClient.sln +++ b/B3ButcherManageClient.sln @@ -43,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialRequisition", "Mate EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OffLineQualityAndOrder", "OffLineQualityAndOrder\OffLineQualityAndOrder.csproj", "{20BB780C-237B-4998-9ABF-85951596E4FF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutHouseView", "OutHouseView\OutHouseView.csproj", "{B91C97B1-8E29-41B9-980A-CC477717D699}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -127,6 +129,10 @@ Global {20BB780C-237B-4998-9ABF-85951596E4FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {20BB780C-237B-4998-9ABF-85951596E4FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {20BB780C-237B-4998-9ABF-85951596E4FF}.Release|Any CPU.Build.0 = Release|Any CPU + {B91C97B1-8E29-41B9-980A-CC477717D699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B91C97B1-8E29-41B9-980A-CC477717D699}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B91C97B1-8E29-41B9-980A-CC477717D699}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B91C97B1-8E29-41B9-980A-CC477717D699}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BO/BO.csproj b/BO/BO.csproj index 1a118ed..f79dbc0 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -75,10 +75,12 @@ + + diff --git a/BO/BO/Bill/OrderDetail/BeforeDeathDetail.cs b/BO/BO/Bill/OrderDetail/BeforeDeathDetail.cs new file mode 100644 index 0000000..2980dae --- /dev/null +++ b/BO/BO/Bill/OrderDetail/BeforeDeathDetail.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BO.BO.Bill +{ + public class BeforeDeathDetail + { + public long ID { get; set; } + + public long Main_ID { get; set; } + + public int Number { get; set; } + + public DateTime Time { get; set; } + } +} diff --git a/BO/BO/Bill/OrderDetail/OutHouseObj.cs b/BO/BO/Bill/OrderDetail/OutHouseObj.cs new file mode 100644 index 0000000..2c1dbaa --- /dev/null +++ b/BO/BO/Bill/OrderDetail/OutHouseObj.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BO.BO.Bill +{ + public class OutHouseObj + { + public long ID { get; set; } + + public int Order { get; set; } + + public string LiveColonyHouse_Name { get; set; } + + public int Number { get; set; } + } +} diff --git a/BO/Utils/AfterLoginUtil.cs b/BO/Utils/AfterLoginUtil.cs index 8dbd2c4..f6560bf 100644 --- a/BO/Utils/AfterLoginUtil.cs +++ b/BO/Utils/AfterLoginUtil.cs @@ -33,6 +33,8 @@ namespace BO.Utils new Tuple("车间业务.分割称重",@"C:\BwpB3Project\src\B3ButcherManageClient\SegmentationWeight\bin\Debug\SegmentationWeight"), new Tuple("车间业务.分割入库",@"C:\BwpB3Project\src\B3ButcherManageClient\SegmentationInStore\bin\Debug\SegmentationInStore"), new Tuple("车间业务.车间配货",@"C:\BwpB3Project\src\B3ButcherManageClient\Distribution\bin\Debug\Distribution"), + new Tuple("收购业务.赶猪出圈",@"C:\BwpB3Project\src\B3ButcherManageClient\OutHouseView\bin\Debug\OutHouseView"), + new Tuple("收购业务.窒晕确认",@"C:\BwpB3Project\src\B3ButcherManageClient\OutHouseView\bin\Debug\OutHouseView"), }; //luanhui 公司电脑 @@ -59,6 +61,8 @@ namespace BO.Utils new Tuple("收购业务.烫毛计数",@"ButcherOrder"), new Tuple("收购业务.掉猪处理",@"DropPigReOrder"), new Tuple("收购业务.称重定级,收购业务.定级校验",@"WeighAndGrading"), + new Tuple("收购业务.赶猪出圈",@"OutHouseView"), + new Tuple("收购业务.窒晕确认",@"OutHouseView"), new Tuple("车间业务.白条入库",@"TrunksIousOutInStore"), new Tuple("车间业务.领料退料",@"MaterialRequisition"), diff --git a/BO/Utils/BillRpc/OrderDetailRpc.cs b/BO/Utils/BillRpc/OrderDetailRpc.cs index 6c92237..46207ac 100644 --- a/BO/Utils/BillRpc/OrderDetailRpc.cs +++ b/BO/Utils/BillRpc/OrderDetailRpc.cs @@ -167,5 +167,38 @@ namespace BO.Utils.BillRpc const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/DropPigRpc/InsertDropPig"; return RpcFacade.Call(method, orderID, number, type); } + + public static List GetUnFinishList(string fieldName) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OutHouseRpc/GetUnFinishList"; + var result = RpcFacade.Call(method, fieldName); + return serializer.Deserialize>(result); + } + + public static void SetOrderFinish(long id,string fieldName) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/OutHouseRpc/SetOrderFinish"; + RpcFacade.Call(method, id, fieldName); + } + + public static void InsertBeforeDeathDetail(BeforeDeathDetail entity) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/BeforeDeathRpc/InsertBeforeDeathDetail"; + RpcFacade.Call(method, serializer.Serialize(entity)); + } + + public static List GetBeforeDeathDetails(long id) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/BeforeDeathRpc/GetBeforeDeathDetails"; + var result = RpcFacade.Call(method, id); + result = result.ESerializeDateTime(); + return serializer.Deserialize>(result); + } + + public static void DeleteBeforeDeathDetail(long id) + { + const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/BeforeDeathRpc/DeleteBeforeDeathDetail"; + RpcFacade.Call(method, id); + } } } diff --git a/BeforeDeathClient/BeforeDeathClient.csproj b/BeforeDeathClient/BeforeDeathClient.csproj new file mode 100644 index 0000000..4b06519 --- /dev/null +++ b/BeforeDeathClient/BeforeDeathClient.csproj @@ -0,0 +1,58 @@ + + + + + Debug + AnyCPU + {8899DECA-DE49-44F2-899C-AEFCC64A25D8} + Library + Properties + BeforeDeathClient + BeforeDeathClient + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {8968f14a-c7c7-4751-96ce-b114fbfd65ef} + BO + + + + + \ No newline at end of file diff --git a/BeforeDeathClient/Properties/AssemblyInfo.cs b/BeforeDeathClient/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8e03703 --- /dev/null +++ b/BeforeDeathClient/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的常规信息通过以下 +// 特性集控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("BeforeDeathClient")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("BeforeDeathClient")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 使此程序集中的类型 +// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， +// 则将该类型上的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("6cafe84d-85cb-4d47-ad4d-1cec335039d9")] + +// 程序集的版本信息由下面四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， +// 方法是按如下所示使用“*”: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ButcherOrder/ButcherOrderForm.Designer.cs b/ButcherOrder/ButcherOrderForm.Designer.cs index 897b342..43e7c42 100644 --- a/ButcherOrder/ButcherOrderForm.Designer.cs +++ b/ButcherOrder/ButcherOrderForm.Designer.cs @@ -44,7 +44,6 @@ this.okBtn = new System.Windows.Forms.Button(); 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(); @@ -54,6 +53,7 @@ this.HotFadeNumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.updateBtn = new System.Windows.Forms.DataGridViewButtonColumn(); this.viewBtn = new System.Windows.Forms.DataGridViewButtonColumn(); + this.uDatePicker1 = new BWP.WinFormControl.UDatePicker(); ((System.ComponentModel.ISupportInitialize)(this.secondOrderGridView)).BeginInit(); this.SuspendLayout(); // @@ -200,20 +200,6 @@ 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 // this.ID.DataPropertyName = "ID"; @@ -290,6 +276,20 @@ this.viewBtn.Text = "查看"; this.viewBtn.UseColumnTextForButtonValue = true; // + // 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; + // // ButcherOrderForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/OutHouseView/BeforeDeathConfirm.Designer.cs b/OutHouseView/BeforeDeathConfirm.Designer.cs new file mode 100644 index 0000000..5929045 --- /dev/null +++ b/OutHouseView/BeforeDeathConfirm.Designer.cs @@ -0,0 +1,222 @@ +namespace OutHouseView +{ + partial class BeforeDeathConfirm + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.orderGrid = new BWP.WinFormControl.UDataGridView(); + this.closeBtn = new System.Windows.Forms.Button(); + this.keyPanel = new System.Windows.Forms.FlowLayoutPanel(); + this.label1 = new System.Windows.Forms.Label(); + this.kbBtn = new System.Windows.Forms.Button(); + this.numLbl = new System.Windows.Forms.Label(); + this.C_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_View = new System.Windows.Forms.DataGridViewButtonColumn(); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); + this.SuspendLayout(); + // + // orderGrid + // + this.orderGrid.AllowUserToAddRows = false; + this.orderGrid.AllowUserToDeleteRows = false; + this.orderGrid.AllowUserToResizeColumns = false; + this.orderGrid.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.orderGrid.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.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.C_ID, + this.C_Order, + this.C_LiveColonyHouse_Name, + this.C_Number, + this.C_View}); + this.orderGrid.Location = new System.Drawing.Point(20, 83); + this.orderGrid.MultiSelect = false; + this.orderGrid.Name = "orderGrid"; + this.orderGrid.ReadOnly = true; + this.orderGrid.RowHeadersVisible = false; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 20F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; + this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.orderGrid.RowTemplate.Height = 80; + this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.orderGrid.Size = new System.Drawing.Size(573, 509); + this.orderGrid.TabIndex = 4; + this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick); + // + // closeBtn + // + this.closeBtn.Font = new System.Drawing.Font("宋体", 15F); + this.closeBtn.Location = new System.Drawing.Point(904, 12); + this.closeBtn.Name = "closeBtn"; + this.closeBtn.Size = new System.Drawing.Size(143, 49); + this.closeBtn.TabIndex = 3; + this.closeBtn.Text = "退出"; + this.closeBtn.UseVisualStyleBackColor = true; + this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click); + // + // keyPanel + // + this.keyPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.keyPanel.Location = new System.Drawing.Point(657, 166); + this.keyPanel.Name = "keyPanel"; + this.keyPanel.Padding = new System.Windows.Forms.Padding(15); + this.keyPanel.Size = new System.Drawing.Size(390, 386); + this.keyPanel.TabIndex = 10; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 15F); + this.label1.Location = new System.Drawing.Point(653, 111); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 20); + this.label1.TabIndex = 11; + this.label1.Text = "合计："; + // + // kbBtn + // + this.kbBtn.Font = new System.Drawing.Font("宋体", 15F); + this.kbBtn.Location = new System.Drawing.Point(904, 97); + this.kbBtn.Name = "kbBtn"; + this.kbBtn.Size = new System.Drawing.Size(92, 49); + this.kbBtn.TabIndex = 13; + this.kbBtn.Text = "确定"; + this.kbBtn.UseVisualStyleBackColor = true; + this.kbBtn.Click += new System.EventHandler(this.kbBtn_Click); + // + // numLbl + // + this.numLbl.AutoSize = true; + this.numLbl.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); + this.numLbl.ForeColor = System.Drawing.Color.Red; + this.numLbl.Location = new System.Drawing.Point(741, 107); + this.numLbl.Name = "numLbl"; + this.numLbl.Size = new System.Drawing.Size(23, 24); + this.numLbl.TabIndex = 14; + this.numLbl.Text = "0"; + // + // C_ID + // + this.C_ID.DataPropertyName = "ID"; + this.C_ID.HeaderText = "ID"; + this.C_ID.Name = "C_ID"; + this.C_ID.ReadOnly = true; + this.C_ID.Visible = false; + // + // C_Order + // + this.C_Order.DataPropertyName = "Order"; + this.C_Order.HeaderText = "序号"; + this.C_Order.Name = "C_Order"; + this.C_Order.ReadOnly = true; + // + // C_LiveColonyHouse_Name + // + this.C_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name"; + this.C_LiveColonyHouse_Name.HeaderText = "圈舍"; + this.C_LiveColonyHouse_Name.Name = "C_LiveColonyHouse_Name"; + this.C_LiveColonyHouse_Name.ReadOnly = true; + this.C_LiveColonyHouse_Name.Visible = false; + this.C_LiveColonyHouse_Name.Width = 400; + // + // C_Number + // + this.C_Number.DataPropertyName = "Number"; + this.C_Number.HeaderText = "头数"; + this.C_Number.Name = "C_Number"; + this.C_Number.ReadOnly = true; + this.C_Number.Width = 200; + // + // C_View + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(10); + this.C_View.DefaultCellStyle = dataGridViewCellStyle3; + this.C_View.HeaderText = "查看"; + this.C_View.Name = "C_View"; + this.C_View.ReadOnly = true; + this.C_View.Text = "查看"; + this.C_View.UseColumnTextForButtonValue = true; + this.C_View.Width = 150; + // + // BeforeDeathConfirm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1067, 604); + this.Controls.Add(this.numLbl); + this.Controls.Add(this.kbBtn); + this.Controls.Add(this.label1); + this.Controls.Add(this.keyPanel); + this.Controls.Add(this.orderGrid); + this.Controls.Add(this.closeBtn); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.Name = "BeforeDeathConfirm"; + this.Text = "窒晕校验"; + this.Load += new System.EventHandler(this.OutHouseFrom_Load); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private BWP.WinFormControl.UDataGridView orderGrid; + private System.Windows.Forms.Button closeBtn; + private System.Windows.Forms.FlowLayoutPanel keyPanel; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button kbBtn; + private System.Windows.Forms.Label numLbl; + private System.Windows.Forms.DataGridViewTextBoxColumn C_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn C_LiveColonyHouse_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Number; + private System.Windows.Forms.DataGridViewButtonColumn C_View; + } +} \ No newline at end of file diff --git a/OutHouseView/BeforeDeathConfirm.cs b/OutHouseView/BeforeDeathConfirm.cs new file mode 100644 index 0000000..d14b0d4 --- /dev/null +++ b/OutHouseView/BeforeDeathConfirm.cs @@ -0,0 +1,132 @@ +using BO.BO.Bill; +using BO.Utils; +using BO.Utils.BillRpc; +using BWP.WinFormControl; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace OutHouseView +{ + public partial class BeforeDeathConfirm : Form, IAfterLogin + { + public List RoleName + { + get + { + return new List() { "收购业务.窒晕确认" }; + } + } + + public Form Generate() + { + return this; + } + + private delegate void InvokeHandler(); + List orderList; + Thread syncThread; + public BeforeDeathConfirm() + { + InitializeComponent(); + AddKeyPad(); + orderGrid.AutoGenerateColumns = false; + orderGrid.DataSource = null; + this.FormClosing += delegate + { + if (syncThread != null && syncThread.IsAlive) + syncThread.Abort(); + }; + } + + private void closeBtn_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void AddKeyPad() + { + for (var i = 1; i < 10; i++) + { + var btn = new Button() { Name = "_" + i, Text = i.ToString(), Size = new Size(85, 85), TextAlign = ContentAlignment.MiddleCenter, Margin = new Padding { All = 15 }, Font = new Font("宋体", 15) }; + btn.Click += (sender, e) => + { + if (orderGrid.CurrentRow == null) + return; + var c = orderGrid.CurrentRow.DataBoundItem as OutHouseObj; + var btnNumber = int.Parse(btn.Text); + var total = (int.Parse(numLbl.Text) + btnNumber); + numLbl.Text = total.ToString(); + if (total > c.Number) + UMessageBox.Show("头数合计超过排宰头数！", "警告"); + var entity = new BeforeDeathDetail(); + entity.Main_ID = c.ID; + entity.Number = btnNumber; + entity.Time = DateTime.Now; + OrderDetailRpc.InsertBeforeDeathDetail(entity); + }; + keyPanel.Controls.Add(btn); + } + } + + private void OutHouseFrom_Load(object sender, EventArgs e) + { + syncThread = new Thread(SyncTask); + syncThread.Start(); + } + + private void SyncTask() + { + while (true) + { + this.Invoke(new InvokeHandler(delegate() + { + BindOrderGrid(); + })); + Thread.Sleep(5000); + } + } + + private void BindOrderGrid() + { + orderList = OrderDetailRpc.GetUnFinishList("AlreadyDeath"); + orderGrid.DataSource = orderList.OrderBy(x => x.Order).ToList(); + orderGrid.Refresh(); + } + + private void orderGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex == -1) + return; + if (e.ColumnIndex < orderGrid.ColumnCount - 1) + return; + var id = (long)orderGrid.CurrentRow.Cells["C_ID"].Value; + + var view = new ViewDetail(id); + if (view.ShowDialog() == DialogResult.OK) + { + numLbl.Text = view.TotalNumber.ToString(); + orderGrid.Refresh(); + } + } + + private void kbBtn_Click(object sender, EventArgs e) + { + if (orderGrid.CurrentRow == null) + return; + var c = orderGrid.CurrentRow.DataBoundItem as OutHouseObj; + var n = int.Parse(numLbl.Text); + if (n != c.Number) + UMessageBox.Show(string.Format("头数合计 {0}于 排宰头数！", n > c.Number ? "大" : "小"), "警告"); + OrderDetailRpc.SetOrderFinish(c.ID, "AlreadyDeath"); + BindOrderGrid(); + } + } +} diff --git a/OutHouseView/BeforeDeathConfirm.resx b/OutHouseView/BeforeDeathConfirm.resx new file mode 100644 index 0000000..5ed42d3 --- /dev/null +++ b/OutHouseView/BeforeDeathConfirm.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/OutHouseView/OutHouseFrom.Designer.cs b/OutHouseView/OutHouseFrom.Designer.cs new file mode 100644 index 0000000..2d0ea90 --- /dev/null +++ b/OutHouseView/OutHouseFrom.Designer.cs @@ -0,0 +1,168 @@ +namespace OutHouseView +{ + partial class OutHouseFrom + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + this.closeBtn = new System.Windows.Forms.Button(); + this.orderGrid = new BWP.WinFormControl.UDataGridView(); + this.C_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Order = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_LiveColonyHouse_Name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Finish = new System.Windows.Forms.DataGridViewButtonColumn(); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).BeginInit(); + this.SuspendLayout(); + // + // closeBtn + // + this.closeBtn.Font = new System.Drawing.Font("宋体", 15F); + this.closeBtn.Location = new System.Drawing.Point(905, 12); + this.closeBtn.Name = "closeBtn"; + this.closeBtn.Size = new System.Drawing.Size(143, 49); + this.closeBtn.TabIndex = 1; + this.closeBtn.Text = "退出"; + this.closeBtn.UseVisualStyleBackColor = true; + this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click); + // + // orderGrid + // + this.orderGrid.AllowUserToAddRows = false; + this.orderGrid.AllowUserToDeleteRows = false; + this.orderGrid.AllowUserToResizeColumns = false; + this.orderGrid.AllowUserToResizeRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.orderGrid.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.orderGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.orderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.orderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.C_ID, + this.C_Order, + this.C_LiveColonyHouse_Name, + this.C_Number, + this.C_Finish}); + this.orderGrid.Location = new System.Drawing.Point(21, 83); + this.orderGrid.MultiSelect = false; + this.orderGrid.Name = "orderGrid"; + this.orderGrid.ReadOnly = true; + this.orderGrid.RowHeadersVisible = false; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 20F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; + this.orderGrid.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.orderGrid.RowTemplate.Height = 80; + this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.orderGrid.Size = new System.Drawing.Size(1027, 509); + this.orderGrid.TabIndex = 2; + this.orderGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.orderGrid_CellContentClick); + // + // C_ID + // + this.C_ID.DataPropertyName = "ID"; + this.C_ID.HeaderText = "ID"; + this.C_ID.Name = "C_ID"; + this.C_ID.ReadOnly = true; + this.C_ID.Visible = false; + // + // C_Order + // + this.C_Order.DataPropertyName = "Order"; + this.C_Order.HeaderText = "序号"; + this.C_Order.Name = "C_Order"; + this.C_Order.ReadOnly = true; + // + // C_LiveColonyHouse_Name + // + this.C_LiveColonyHouse_Name.DataPropertyName = "LiveColonyHouse_Name"; + this.C_LiveColonyHouse_Name.HeaderText = "圈舍"; + this.C_LiveColonyHouse_Name.Name = "C_LiveColonyHouse_Name"; + this.C_LiveColonyHouse_Name.ReadOnly = true; + this.C_LiveColonyHouse_Name.Width = 600; + // + // C_Number + // + this.C_Number.DataPropertyName = "Number"; + this.C_Number.HeaderText = "头数"; + this.C_Number.Name = "C_Number"; + this.C_Number.ReadOnly = true; + this.C_Number.Width = 150; + // + // C_Finish + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(10); + this.C_Finish.DefaultCellStyle = dataGridViewCellStyle3; + this.C_Finish.HeaderText = "完毕"; + this.C_Finish.Name = "C_Finish"; + this.C_Finish.ReadOnly = true; + this.C_Finish.Text = "完毕"; + this.C_Finish.UseColumnTextForButtonValue = true; + this.C_Finish.Width = 170; + // + // OutHouseFrom + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1067, 604); + this.Controls.Add(this.orderGrid); + this.Controls.Add(this.closeBtn); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.Name = "OutHouseFrom"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "赶猪进场"; + this.Load += new System.EventHandler(this.OutHouseFrom_Load); + ((System.ComponentModel.ISupportInitialize)(this.orderGrid)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button closeBtn; + private BWP.WinFormControl.UDataGridView orderGrid; + private System.Windows.Forms.DataGridViewTextBoxColumn C_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Order; + private System.Windows.Forms.DataGridViewTextBoxColumn C_LiveColonyHouse_Name; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Number; + private System.Windows.Forms.DataGridViewButtonColumn C_Finish; + } +} \ No newline at end of file diff --git a/OutHouseView/OutHouseFrom.cs b/OutHouseView/OutHouseFrom.cs new file mode 100644 index 0000000..cb7e227 --- /dev/null +++ b/OutHouseView/OutHouseFrom.cs @@ -0,0 +1,91 @@ +using BO.BO.Bill; +using BO.Utils; +using BO.Utils.BillRpc; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace OutHouseView +{ + public partial class OutHouseFrom : Form, IAfterLogin + { + #region IAfterLogin + public List RoleName + { + get + { + return new List() { "收购业务.赶猪出圈" }; + } + } + + public Form Generate() + { + return this; + } + + #endregion + + private delegate void InvokeHandler(); + List orderList; + Thread syncThread; + public OutHouseFrom() + { + InitializeComponent(); + orderGrid.AutoGenerateColumns = false; + orderGrid.DataSource = null; + this.FormClosing += delegate + { + if (syncThread != null && syncThread.IsAlive) + syncThread.Abort(); + }; + } + + private void closeBtn_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void OutHouseFrom_Load(object sender, EventArgs e) + { + syncThread = new Thread(SyncTask); + syncThread.Start(); + } + + private void SyncTask() + { + while (true) + { + this.Invoke(new InvokeHandler(delegate() + { + BindOrderGrid(); + })); + Thread.Sleep(5000); + } + } + + private void BindOrderGrid() + { + orderList = OrderDetailRpc.GetUnFinishList("OutHouse"); + orderGrid.DataSource = orderList.OrderBy(x => x.Order).ToList(); + orderGrid.Refresh(); + } + + private void orderGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex == -1) + return; + if (e.ColumnIndex < orderGrid.ColumnCount - 1) + return; + var id = (long)orderGrid.CurrentRow.Cells["C_ID"].Value; + OrderDetailRpc.SetOrderFinish(id, "OutHouse"); + BindOrderGrid(); + } + } +} diff --git a/OutHouseView/OutHouseFrom.resx b/OutHouseView/OutHouseFrom.resx new file mode 100644 index 0000000..b1abeac --- /dev/null +++ b/OutHouseView/OutHouseFrom.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/OutHouseView/OutHouseView.csproj b/OutHouseView/OutHouseView.csproj new file mode 100644 index 0000000..e2d5dbe --- /dev/null +++ b/OutHouseView/OutHouseView.csproj @@ -0,0 +1,98 @@ + + + + + Debug + AnyCPU + {B91C97B1-8E29-41B9-980A-CC477717D699} + Library + Properties + OutHouseView + OutHouseView + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + Form + + + BeforeDeathConfirm.cs + + + Form + + + OutHouseFrom.cs + + + + Form + + + ViewDetail.cs + + + + + BeforeDeathConfirm.cs + + + OutHouseFrom.cs + + + ViewDetail.cs + + + + + {8968f14a-c7c7-4751-96ce-b114fbfd65ef} + BO + + + {A782B23E-BE6D-4F51-B5CB-5CD259BA97CC} + BWP.WinFormControl + + + + + \ No newline at end of file diff --git a/OutHouseView/Properties/AssemblyInfo.cs b/OutHouseView/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..b435509 --- /dev/null +++ b/OutHouseView/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的常规信息通过以下 +// 特性集控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("OutHouseView")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("OutHouseView")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 使此程序集中的类型 +// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型， +// 则将该类型上的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("abb79c90-0114-4f14-bf13-4adef9dd2a2f")] + +// 程序集的版本信息由下面四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， +// 方法是按如下所示使用“*”: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/OutHouseView/ViewDetail.Designer.cs b/OutHouseView/ViewDetail.Designer.cs new file mode 100644 index 0000000..9968cdc --- /dev/null +++ b/OutHouseView/ViewDetail.Designer.cs @@ -0,0 +1,222 @@ +namespace OutHouseView +{ + partial class ViewDetail + { + /// + /// 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() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = 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(); + this.detailGridView1 = new BWP.WinFormControl.UDataGridView(); + this.closeBtn = new System.Windows.Forms.Button(); + this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); + this.label1 = new System.Windows.Forms.Label(); + this.numLbl = new System.Windows.Forms.Label(); + this.C_ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Time = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.C_Number = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DeleteBtn = new System.Windows.Forms.DataGridViewButtonColumn(); + this.lineCountLbl = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.detailGridView1)).BeginInit(); + this.SuspendLayout(); + // + // detailGridView1 + // + this.detailGridView1.AllowUserToAddRows = false; + this.detailGridView1.AllowUserToDeleteRows = false; + this.detailGridView1.AllowUserToResizeColumns = false; + this.detailGridView1.AllowUserToResizeRows = false; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.detailGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + this.detailGridView1.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.detailGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + this.detailGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.detailGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.C_ID, + this.C_Time, + this.C_Number, + this.DeleteBtn}); + this.detailGridView1.Location = new System.Drawing.Point(27, 66); + this.detailGridView1.MultiSelect = false; + this.detailGridView1.Name = "detailGridView1"; + this.detailGridView1.ReadOnly = true; + this.detailGridView1.RowHeadersVisible = false; + dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15F); + dataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218))))); + this.detailGridView1.RowsDefaultCellStyle = dataGridViewCellStyle15; + this.detailGridView1.RowTemplate.Height = 50; + this.detailGridView1.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.detailGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.detailGridView1.Size = new System.Drawing.Size(467, 356); + this.detailGridView1.TabIndex = 5; + this.detailGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.detailGridView1_CellContentClick); + // + // closeBtn + // + this.closeBtn.Font = new System.Drawing.Font("宋体", 15F); + this.closeBtn.Location = new System.Drawing.Point(435, 12); + this.closeBtn.Name = "closeBtn"; + this.closeBtn.Size = new System.Drawing.Size(108, 41); + this.closeBtn.TabIndex = 6; + this.closeBtn.Text = "关闭"; + this.closeBtn.UseVisualStyleBackColor = true; + this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click); + // + // vScrollBar1 + // + this.vScrollBar1.Location = new System.Drawing.Point(495, 66); + this.vScrollBar1.Name = "vScrollBar1"; + this.vScrollBar1.Size = new System.Drawing.Size(48, 356); + this.vScrollBar1.TabIndex = 7; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 15F); + this.label1.Location = new System.Drawing.Point(82, 29); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 20); + this.label1.TabIndex = 8; + this.label1.Text = "合计："; + // + // numLbl + // + this.numLbl.AutoSize = true; + this.numLbl.Font = new System.Drawing.Font("宋体", 20F); + this.numLbl.ForeColor = System.Drawing.Color.Red; + this.numLbl.Location = new System.Drawing.Point(187, 23); + this.numLbl.Name = "numLbl"; + this.numLbl.Size = new System.Drawing.Size(26, 27); + this.numLbl.TabIndex = 9; + this.numLbl.Text = "0"; + // + // C_ID + // + this.C_ID.DataPropertyName = "ID"; + this.C_ID.HeaderText = "ID"; + this.C_ID.Name = "C_ID"; + this.C_ID.ReadOnly = true; + this.C_ID.Visible = false; + // + // C_Time + // + this.C_Time.DataPropertyName = "Time"; + dataGridViewCellStyle13.Format = "HH:mm:ss"; + this.C_Time.DefaultCellStyle = dataGridViewCellStyle13; + this.C_Time.HeaderText = "时间"; + this.C_Time.Name = "C_Time"; + this.C_Time.ReadOnly = true; + this.C_Time.Width = 150; + // + // C_Number + // + this.C_Number.DataPropertyName = "Number"; + this.C_Number.HeaderText = "头数"; + this.C_Number.Name = "C_Number"; + this.C_Number.ReadOnly = true; + this.C_Number.Width = 150; + // + // DeleteBtn + // + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.Padding = new System.Windows.Forms.Padding(10, 7, 10, 7); + this.DeleteBtn.DefaultCellStyle = dataGridViewCellStyle14; + this.DeleteBtn.HeaderText = "删除"; + this.DeleteBtn.Name = "DeleteBtn"; + this.DeleteBtn.ReadOnly = true; + this.DeleteBtn.Text = "删除"; + this.DeleteBtn.UseColumnTextForButtonValue = true; + this.DeleteBtn.Width = 160; + // + // lineCountLbl + // + this.lineCountLbl.AutoSize = true; + this.lineCountLbl.Font = new System.Drawing.Font("宋体", 20F); + this.lineCountLbl.ForeColor = System.Drawing.Color.Red; + this.lineCountLbl.Location = new System.Drawing.Point(366, 23); + this.lineCountLbl.Name = "lineCountLbl"; + this.lineCountLbl.Size = new System.Drawing.Size(26, 27); + this.lineCountLbl.TabIndex = 11; + this.lineCountLbl.Text = "0"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 15F); + this.label3.Location = new System.Drawing.Point(261, 29); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(69, 20); + this.label3.TabIndex = 10; + this.label3.Text = "行数："; + // + // ViewDetail + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(576, 436); + this.ControlBox = false; + this.Controls.Add(this.lineCountLbl); + this.Controls.Add(this.label3); + this.Controls.Add(this.numLbl); + this.Controls.Add(this.label1); + this.Controls.Add(this.vScrollBar1); + this.Controls.Add(this.closeBtn); + this.Controls.Add(this.detailGridView1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Name = "ViewDetail"; + this.Text = "查看明细"; + ((System.ComponentModel.ISupportInitialize)(this.detailGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private BWP.WinFormControl.UDataGridView detailGridView1; + private System.Windows.Forms.Button closeBtn; + private System.Windows.Forms.VScrollBar vScrollBar1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label numLbl; + private System.Windows.Forms.DataGridViewTextBoxColumn C_ID; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Time; + private System.Windows.Forms.DataGridViewTextBoxColumn C_Number; + private System.Windows.Forms.DataGridViewButtonColumn DeleteBtn; + private System.Windows.Forms.Label lineCountLbl; + private System.Windows.Forms.Label label3; + } +} \ No newline at end of file diff --git a/OutHouseView/ViewDetail.cs b/OutHouseView/ViewDetail.cs new file mode 100644 index 0000000..fe49334 --- /dev/null +++ b/OutHouseView/ViewDetail.cs @@ -0,0 +1,74 @@ +using BO.BO.Bill; +using BO.Utils.BillRpc; +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 OutHouseView +{ + public partial class ViewDetail : Form + { + List details; + static bool changed = false; + public ViewDetail(long id) + { + InitializeComponent(); + detailGridView1.AutoGenerateColumns = false; + details = OrderDetailRpc.GetBeforeDeathDetails(id).OrderByDescending(x => x.ID).ToList(); + detailGridView1.DataSource = null; + detailGridView1.DataSource = details; + InitScrollBar1(); + detailGridView1.Refresh(); + + numLbl.Text = TotalNumber.ToString(); + lineCountLbl.Text = details.Count.ToString(); + } + + private void closeBtn_Click(object sender, EventArgs e) + { + if (changed) + DialogResult = DialogResult.OK; + this.Close(); + } + + public int TotalNumber { get { return details.Sum(x => x.Number); } } + + private void detailGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex == -1) + return; + if (e.ColumnIndex != detailGridView1.ColumnCount - 1) + return; + var id = (long)detailGridView1.CurrentRow.Cells["C_ID"].Value; + OrderDetailRpc.DeleteBeforeDeathDetail(id); + details.RemoveAll(x => x.ID == id); + numLbl.Text = TotalNumber.ToString(); + lineCountLbl.Text = details.Count.ToString(); + if (!changed) + changed = true; + detailGridView1.DataSource = null; + if (details.Any()) + detailGridView1.DataSource = details; + detailGridView1.Refresh(); + } + + private void InitScrollBar1() + { + vScrollBar1.Maximum = (detailGridView1.RowCount - detailGridView1.DisplayedRowCount(false) + 30) * detailGridView1.RowTemplate.Height; + vScrollBar1.Minimum = 0; + vScrollBar1.SmallChange = detailGridView1.RowTemplate.Height; + vScrollBar1.LargeChange = detailGridView1.RowTemplate.Height * 30; + this.vScrollBar1.Scroll += (sender, e) => + { + var roll = e.NewValue / detailGridView1.RowTemplate.Height; + detailGridView1.FirstDisplayedScrollingRowIndex = roll; + }; + } + } +} diff --git a/OutHouseView/ViewDetail.resx b/OutHouseView/ViewDetail.resx new file mode 100644 index 0000000..3fbbba0 --- /dev/null +++ b/OutHouseView/ViewDetail.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/QualityAndOrder/QualityOrderForm.Designer.cs b/QualityAndOrder/QualityOrderForm.Designer.cs index fb1c136..b4a1814 100644 --- a/QualityAndOrder/QualityOrderForm.Designer.cs +++ b/QualityAndOrder/QualityOrderForm.Designer.cs @@ -28,27 +28,27 @@ /// private void InitializeComponent() { - 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(); + 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(); this.uTabControl1 = new BWP.WinFormControl.UTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); @@ -96,6 +96,9 @@ this.vScrollBar3 = new System.Windows.Forms.VScrollBar(); this.vScrollBar2 = new System.Windows.Forms.VScrollBar(); 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(); @@ -147,9 +150,8 @@ 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.label7 = new System.Windows.Forms.Label(); + this.h_totalLbl = new System.Windows.Forms.Label(); this.uTabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.panel1.SuspendLayout(); @@ -254,17 +256,17 @@ this.sanctionGrid.AllowUserToDeleteRows = false; this.sanctionGrid.AllowUserToResizeColumns = false; this.sanctionGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle74.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle74; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.sanctionGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.sanctionGrid.BackgroundColor = System.Drawing.Color.White; - 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; + 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; this.sanctionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.sanctionGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.S_AbnormalItem_Name1, @@ -285,9 +287,9 @@ this.sanctionGrid.Name = "sanctionGrid"; this.sanctionGrid.ReadOnly = true; this.sanctionGrid.RowHeadersVisible = false; - 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; + 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; 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; @@ -496,17 +498,17 @@ this.weightBillGrid.AllowUserToDeleteRows = false; this.weightBillGrid.AllowUserToResizeColumns = false; this.weightBillGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle77.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle77; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.weightBillGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; this.weightBillGrid.BackgroundColor = System.Drawing.Color.White; - 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; + 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; this.weightBillGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.weightBillGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.W_ID, @@ -521,11 +523,11 @@ this.weightBillGrid.Name = "weightBillGrid"; this.weightBillGrid.ReadOnly = true; this.weightBillGrid.RowHeadersVisible = false; - 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; + 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; this.weightBillGrid.RowTemplate.Height = 40; this.weightBillGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.weightBillGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -710,6 +712,36 @@ this.panel3.Size = new System.Drawing.Size(490, 42); this.panel3.TabIndex = 45; // + // 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; @@ -804,17 +836,17 @@ this.preOrderGrid.AllowUserToDeleteRows = false; this.preOrderGrid.AllowUserToResizeColumns = false; this.preOrderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle64.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle64; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.preOrderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7; this.preOrderGrid.BackgroundColor = System.Drawing.Color.White; - 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; + 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; this.preOrderGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.preOrderGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.P_WeightBill_ID, @@ -833,11 +865,11 @@ this.preOrderGrid.Name = "preOrderGrid"; this.preOrderGrid.ReadOnly = true; this.preOrderGrid.RowHeadersVisible = false; - 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; + 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; this.preOrderGrid.RowTemplate.Height = 60; this.preOrderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.preOrderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -913,9 +945,9 @@ // P_WeighTime // this.P_WeighTime.DataPropertyName = "WeighTime"; - dataGridViewCellStyle66.Format = "MM/dd HH:mm"; - dataGridViewCellStyle66.NullValue = null; - this.P_WeighTime.DefaultCellStyle = dataGridViewCellStyle66; + 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; @@ -923,9 +955,9 @@ // // P_OKBtn // - dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle67.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.P_OKBtn.DefaultCellStyle = dataGridViewCellStyle67; + 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; @@ -937,9 +969,9 @@ // // P_Hidden // - dataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle68.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.P_Hidden.DefaultCellStyle = dataGridViewCellStyle68; + 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; @@ -952,17 +984,17 @@ this.orderGrid.AllowUserToDeleteRows = false; this.orderGrid.AllowUserToResizeColumns = false; this.orderGrid.AllowUserToResizeRows = false; - dataGridViewCellStyle70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle70; + 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; - 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; + 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, @@ -981,11 +1013,11 @@ this.orderGrid.Name = "orderGrid"; this.orderGrid.ReadOnly = true; this.orderGrid.RowHeadersVisible = false; - 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; + 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; this.orderGrid.RowTemplate.Height = 60; this.orderGrid.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -1075,9 +1107,9 @@ // // O_OKBtn // - dataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle72.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.O_OKBtn.DefaultCellStyle = dataGridViewCellStyle72; + 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; @@ -1122,6 +1154,8 @@ // // tabPage5 // + this.tabPage5.Controls.Add(this.h_totalLbl); + this.tabPage5.Controls.Add(this.label7); this.tabPage5.Controls.Add(this.tb3CloseBtn); this.tabPage5.Controls.Add(this.vScrollBar4); this.tabPage5.Controls.Add(this.tab3SearchBtn); @@ -1199,17 +1233,17 @@ this.orderGrid3.AllowUserToDeleteRows = false; this.orderGrid3.AllowUserToResizeColumns = false; this.orderGrid3.AllowUserToResizeRows = false; - dataGridViewCellStyle80.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.orderGrid3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle80; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); + this.orderGrid3.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17; this.orderGrid3.BackgroundColor = System.Drawing.Color.White; - 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; + 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; this.orderGrid3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.orderGrid3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.H_WeightBill_ID, @@ -1225,11 +1259,11 @@ this.orderGrid3.Name = "orderGrid3"; this.orderGrid3.ReadOnly = true; this.orderGrid3.RowHeadersVisible = false; - 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; + 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; this.orderGrid3.RowTemplate.Height = 60; this.orderGrid3.ScrollBars = System.Windows.Forms.ScrollBars.None; this.orderGrid3.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -1288,9 +1322,9 @@ // // dataGridViewButtonColumn1 // - dataGridViewCellStyle82.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle82.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.dataGridViewButtonColumn1.DefaultCellStyle = dataGridViewCellStyle82; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.dataGridViewButtonColumn1.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridViewButtonColumn1.HeaderText = "确定"; this.dataGridViewButtonColumn1.Name = "dataGridViewButtonColumn1"; this.dataGridViewButtonColumn1.ReadOnly = true; @@ -1300,9 +1334,9 @@ // // H_View // - dataGridViewCellStyle83.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle83.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); - this.H_View.DefaultCellStyle = dataGridViewCellStyle83; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(7, 10, 7, 10); + this.H_View.DefaultCellStyle = dataGridViewCellStyle20; this.H_View.HeaderText = "查看"; this.H_View.Name = "H_View"; this.H_View.ReadOnly = true; @@ -1310,35 +1344,26 @@ this.H_View.UseColumnTextForButtonValue = true; this.H_View.Width = 110; // - // displayNumLb + // label7 // - 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; + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("宋体", 15F); + this.label7.Location = new System.Drawing.Point(233, 54); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(89, 20); + this.label7.TabIndex = 66; + this.label7.Text = "总头数："; // - // hiddenNumLb + // h_totalLbl // - 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; + this.h_totalLbl.AutoSize = true; + this.h_totalLbl.Font = new System.Drawing.Font("宋体", 20F); + this.h_totalLbl.ForeColor = System.Drawing.Color.Red; + this.h_totalLbl.Location = new System.Drawing.Point(328, 50); + this.h_totalLbl.Name = "h_totalLbl"; + this.h_totalLbl.Size = new System.Drawing.Size(26, 27); + this.h_totalLbl.TabIndex = 67; + this.h_totalLbl.Text = "0"; // // QualityOrderForm // @@ -1478,6 +1503,8 @@ private System.Windows.Forms.Label totalNumLb; private System.Windows.Forms.Label hiddenNumLb; private System.Windows.Forms.Label displayNumLb; + private System.Windows.Forms.Label h_totalLbl; + private System.Windows.Forms.Label label7; diff --git a/QualityAndOrder/QualityOrderForm.resx b/QualityAndOrder/QualityOrderForm.resx index 605f6c6..9cdee26 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/QualityOrderFormForTab3.cs b/QualityAndOrder/QualityOrderFormForTab3.cs index 7addcbe..d127393 100644 --- a/QualityAndOrder/QualityOrderFormForTab3.cs +++ b/QualityAndOrder/QualityOrderFormForTab3.cs @@ -90,6 +90,7 @@ namespace QualityAndOrder this.Invoke(new InvokeHandler(delegate() { BindOrderGrid3(); + h_totalLbl.Text = hurryList.Sum(x => x.WeightNumber).ToString(); })); Thread.Sleep(5000); }