在产明细表 分组统计 增加查询条件

DK.Client/ReportModule/R01/M04/F_RPT_010401.Designer.cs

@@ -63,7 +63,6 @@
 			this.lblBarCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
 			this.dkproductionLineSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkproductionLineSearchBox();
-			this.dkUserInfoSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkUserInfoSearchBox();
 			this.lblCreateTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dtpCreateTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
 			this.dtpCreateTimeStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
@@ -72,16 +71,20 @@
 			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
 			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
 			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.Statistics = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.counts = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GROUTINGUSERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.delivertime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CompleteProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.proceduretime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsLevelName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GROUTINGUSERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.inscrapflag = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -89,7 +92,6 @@
 			this.ProductionLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.FinishedBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SecurityCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ProductionLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ProductionLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CompleteProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -122,6 +124,10 @@
 			this.UpdateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.TestMouldFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.GroutingUsersCode = new Dongke.IBOSS.PRD.Basics.BaseControls.DKTextBox();
+			this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.goodscodeText = new Dongke.IBOSS.PRD.Basics.BaseControls.DKTextBox();
+			this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			((System.ComponentModel.ISupportInitialize)(this.dgvInProduction)).BeginInit();
 			this.gbxCondition.SuspendLayout();
 			this.tsrOperate.SuspendLayout();
@@ -156,16 +162,20 @@
 			this.dgvInProduction.ColumnHeadersHeight = 29;
 			this.dgvInProduction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvInProduction.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Statistics,
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.counts,
+            this.GOODSSPECIFICATION,
+            this.GROUTINGUSERCODE,
+            this.goodstypename,
             this.delivertime,
             this.CompleteProcedureName,
             this.proceduretime,
             this.UserCode,
             this.STAFFNAME,
             this.GoodsLevelName,
-            this.GROUTINGUSERCODE,
             this.inscrapflag,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -173,7 +183,6 @@
             this.ProductionLineCode,
             this.FinishedBarCode,
             this.SecurityCode,
-            this.goodstypename,
             this.ProductionLineID,
             this.ProductionLineName,
             this.CompleteProcedureID,
@@ -234,7 +243,7 @@
 			this.dgvInProduction.RowsDefaultCellStyle = dataGridViewCellStyle8;
 			this.dgvInProduction.RowTemplate.Height = 21;
 			this.dgvInProduction.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvInProduction.Size = new System.Drawing.Size(1119, 247);
+			this.dgvInProduction.Size = new System.Drawing.Size(1393, 652);
 			this.dgvInProduction.SortOrderColumnName = null;
 			this.dgvInProduction.TabIndex = 2;
 			this.dgvInProduction.Tag = true;
@@ -247,6 +256,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.goodscodeText);
+			this.gbxCondition.Controls.Add(this.c_Label3);
+			this.gbxCondition.Controls.Add(this.GroutingUsersCode);
+			this.gbxCondition.Controls.Add(this.c_Label2);
 			this.gbxCondition.Controls.Add(this.txtGroutingLineCode);
 			this.gbxCondition.Controls.Add(this.lblGroutingLineCode);
 			this.gbxCondition.Controls.Add(this.txtSTAFFNAME);
@@ -271,7 +284,6 @@
 			this.gbxCondition.Controls.Add(this.lblBarCode);
 			this.gbxCondition.Controls.Add(this.dkProcedureSearchBox);
 			this.gbxCondition.Controls.Add(this.dkproductionLineSearchBox);
-			this.gbxCondition.Controls.Add(this.dkUserInfoSearchBox);
 			this.gbxCondition.Controls.Add(this.lblCreateTimeEnd);
 			this.gbxCondition.Controls.Add(this.dtpCreateTimeEnd);
 			this.gbxCondition.Controls.Add(this.dtpCreateTimeStart);
@@ -283,7 +295,7 @@
 			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(1119, 110);
+			this.gbxCondition.Size = new System.Drawing.Size(1393, 110);
 			this.gbxCondition.TabIndex = 1;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
@@ -342,7 +354,7 @@
 			this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
 			this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
 			this.chkTestMouldFlag.FalseText = "否";
-			this.chkTestMouldFlag.Location = new System.Drawing.Point(901, 53);
+			this.chkTestMouldFlag.Location = new System.Drawing.Point(922, 53);
 			this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
 			this.chkTestMouldFlag.Name = "chkTestMouldFlag";
 			this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
@@ -418,7 +430,7 @@
 			// 
 			this.chkIsReworkFlag.AutoSize = true;
 			this.chkIsReworkFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.chkIsReworkFlag.Location = new System.Drawing.Point(847, 52);
+			this.chkIsReworkFlag.Location = new System.Drawing.Point(868, 52);
 			this.chkIsReworkFlag.Name = "chkIsReworkFlag";
 			this.chkIsReworkFlag.Size = new System.Drawing.Size(48, 16);
 			this.chkIsReworkFlag.TabIndex = 17;
@@ -429,7 +441,7 @@
 			// 
 			this.radScrap.AutoSize = true;
 			this.radScrap.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.radScrap.Location = new System.Drawing.Point(952, 22);
+			this.radScrap.Location = new System.Drawing.Point(1176, 20);
 			this.radScrap.Name = "radScrap";
 			this.radScrap.Size = new System.Drawing.Size(71, 16);
 			this.radScrap.TabIndex = 9;
@@ -440,7 +452,7 @@
 			// 
 			this.radNormal.AutoSize = true;
 			this.radNormal.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.radNormal.Location = new System.Drawing.Point(900, 22);
+			this.radNormal.Location = new System.Drawing.Point(1124, 20);
 			this.radNormal.Name = "radNormal";
 			this.radNormal.Size = new System.Drawing.Size(47, 16);
 			this.radNormal.TabIndex = 8;
@@ -452,7 +464,7 @@
 			this.radAll.AutoSize = true;
 			this.radAll.Checked = true;
 			this.radAll.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.radAll.Location = new System.Drawing.Point(847, 22);
+			this.radAll.Location = new System.Drawing.Point(1071, 20);
 			this.radAll.Name = "radAll";
 			this.radAll.Size = new System.Drawing.Size(47, 16);
 			this.radAll.TabIndex = 7;
@@ -466,7 +478,7 @@
 			this.chkUpdateTime.Checked = true;
 			this.chkUpdateTime.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.chkUpdateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.chkUpdateTime.Location = new System.Drawing.Point(429, 52);
+			this.chkUpdateTime.Location = new System.Drawing.Point(450, 52);
 			this.chkUpdateTime.Name = "chkUpdateTime";
 			this.chkUpdateTime.Size = new System.Drawing.Size(72, 16);
 			this.chkUpdateTime.TabIndex = 13;
@@ -480,7 +492,7 @@
 			this.c_Label1.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label1.Location = new System.Drawing.Point(668, 54);
+			this.c_Label1.Location = new System.Drawing.Point(689, 54);
 			this.c_Label1.Name = "c_Label1";
 			this.c_Label1.Size = new System.Drawing.Size(11, 12);
 			this.c_Label1.TabIndex = 15;
@@ -491,7 +503,7 @@
 			this.dtpUpdateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
 			this.dtpUpdateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpUpdateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpUpdateTimeEnd.Location = new System.Drawing.Point(686, 50);
+			this.dtpUpdateTimeEnd.Location = new System.Drawing.Point(707, 50);
 			this.dtpUpdateTimeEnd.Name = "dtpUpdateTimeEnd";
 			this.dtpUpdateTimeEnd.Size = new System.Drawing.Size(155, 21);
 			this.dtpUpdateTimeEnd.TabIndex = 16;
@@ -501,7 +513,7 @@
 			this.dtpUpdateTimeStart.CustomFormat = "yyyy-MM-dd HH:mm:ss";
 			this.dtpUpdateTimeStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpUpdateTimeStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpUpdateTimeStart.Location = new System.Drawing.Point(507, 50);
+			this.dtpUpdateTimeStart.Location = new System.Drawing.Point(528, 50);
 			this.dtpUpdateTimeStart.Name = "dtpUpdateTimeStart";
 			this.dtpUpdateTimeStart.Size = new System.Drawing.Size(155, 21);
 			this.dtpUpdateTimeStart.TabIndex = 14;
@@ -512,7 +524,7 @@
 			this.chkCreateTime.Checked = true;
 			this.chkCreateTime.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.chkCreateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.chkCreateTime.Location = new System.Drawing.Point(429, 22);
+			this.chkCreateTime.Location = new System.Drawing.Point(653, 20);
 			this.chkCreateTime.Name = "chkCreateTime";
 			this.chkCreateTime.Size = new System.Drawing.Size(72, 16);
 			this.chkCreateTime.TabIndex = 3;
@@ -577,7 +589,7 @@
 			this.dkproductionLineSearchBox.Enabled = true;
 			this.dkproductionLineSearchBox.IsEnablePurview = false;
 			this.dkproductionLineSearchBox.IsMustInput = false;
-			this.dkproductionLineSearchBox.Location = new System.Drawing.Point(22, 20);
+			this.dkproductionLineSearchBox.Location = new System.Drawing.Point(22, 21);
 			this.dkproductionLineSearchBox.Margin = new System.Windows.Forms.Padding(4);
 			this.dkproductionLineSearchBox.Name = "dkproductionLineSearchBox";
 			this.dkproductionLineSearchBox.ProductionLineCode = "";
@@ -592,33 +604,13 @@
 			this.dkproductionLineSearchBox.Title = "  生产线";
 			this.dkproductionLineSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
 			// 
-			// dkUserInfoSearchBox
-			// 
-			this.dkUserInfoSearchBox.DataSource = null;
-			this.dkUserInfoSearchBox.Enabled = true;
-			this.dkUserInfoSearchBox.IsMustInput = false;
-			this.dkUserInfoSearchBox.IsWorker = false;
-			this.dkUserInfoSearchBox.Location = new System.Drawing.Point(22, 50);
-			this.dkUserInfoSearchBox.Margin = new System.Windows.Forms.Padding(4);
-			this.dkUserInfoSearchBox.Name = "dkUserInfoSearchBox";
-			this.dkUserInfoSearchBox.PurviewType = ((byte)(0));
-			this.dkUserInfoSearchBox.SelectMore = true;
-			this.dkUserInfoSearchBox.Size = new System.Drawing.Size(193, 21);
-			this.dkUserInfoSearchBox.TabIndex = 10;
-			this.dkUserInfoSearchBox.Title = "生产工号";
-			this.dkUserInfoSearchBox.TxtUserBackColor = System.Drawing.SystemColors.Control;
-			this.dkUserInfoSearchBox.UserCode = "";
-			this.dkUserInfoSearchBox.UserID = null;
-			this.dkUserInfoSearchBox.UserIDS = null;
-			this.dkUserInfoSearchBox.UserName = null;
-			// 
 			// lblCreateTimeEnd
 			// 
 			this.lblCreateTimeEnd.AutoSize = true;
 			this.lblCreateTimeEnd.BackColor = System.Drawing.Color.Transparent;
 			this.lblCreateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.lblCreateTimeEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblCreateTimeEnd.Location = new System.Drawing.Point(668, 24);
+			this.lblCreateTimeEnd.Location = new System.Drawing.Point(892, 22);
 			this.lblCreateTimeEnd.Name = "lblCreateTimeEnd";
 			this.lblCreateTimeEnd.Size = new System.Drawing.Size(11, 12);
 			this.lblCreateTimeEnd.TabIndex = 5;
@@ -629,7 +621,7 @@
 			this.dtpCreateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
 			this.dtpCreateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpCreateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpCreateTimeEnd.Location = new System.Drawing.Point(686, 20);
+			this.dtpCreateTimeEnd.Location = new System.Drawing.Point(910, 18);
 			this.dtpCreateTimeEnd.Name = "dtpCreateTimeEnd";
 			this.dtpCreateTimeEnd.Size = new System.Drawing.Size(155, 21);
 			this.dtpCreateTimeEnd.TabIndex = 6;
@@ -639,7 +631,7 @@
 			this.dtpCreateTimeStart.CustomFormat = "yyyy-MM-dd HH:mm:ss";
 			this.dtpCreateTimeStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpCreateTimeStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpCreateTimeStart.Location = new System.Drawing.Point(507, 20);
+			this.dtpCreateTimeStart.Location = new System.Drawing.Point(731, 18);
 			this.dtpCreateTimeStart.Name = "dtpCreateTimeStart";
 			this.dtpCreateTimeStart.Size = new System.Drawing.Size(155, 21);
 			this.dtpCreateTimeStart.TabIndex = 4;
@@ -651,7 +643,7 @@
 			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
 			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-			this.btnClearCondition.Location = new System.Drawing.Point(1028, 73);
+			this.btnClearCondition.Location = new System.Drawing.Point(1302, 73);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
 			this.btnClearCondition.TabIndex = 26;
@@ -666,7 +658,7 @@
 			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
-			this.btnSearch.Location = new System.Drawing.Point(937, 73);
+			this.btnSearch.Location = new System.Drawing.Point(1211, 73);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(85, 30);
 			this.btnSearch.TabIndex = 25;
@@ -687,7 +679,7 @@
 			this.tsrOperate.Name = "tsrOperate";
 			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
 			this.tsrOperate.ShowItemToolTips = false;
-			this.tsrOperate.Size = new System.Drawing.Size(1131, 35);
+			this.tsrOperate.Size = new System.Drawing.Size(1405, 35);
 			this.tsrOperate.TabIndex = 0;
 			this.tsrOperate.Text = "toolStrip1";
 			// 
@@ -713,6 +705,13 @@
 			this.tsbtnClose.Text = "关闭(&X)";
 			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
 			// 
+			// Statistics
+			// 
+			this.Statistics.DataPropertyName = "统计方式";
+			this.Statistics.HeaderText = "统计方式";
+			this.Statistics.Name = "Statistics";
+			this.Statistics.ReadOnly = true;
+			// 
 			// BarCode
 			// 
 			this.BarCode.DataPropertyName = "BarCode";
@@ -740,6 +739,38 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.Width = 125;
 			// 
+			// counts
+			// 
+			this.counts.DataPropertyName = "counts";
+			this.counts.HeaderText = "数量";
+			this.counts.Name = "counts";
+			this.counts.ReadOnly = true;
+			// 
+			// GOODSSPECIFICATION
+			// 
+			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.HeaderText = "产品规格";
+			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.ReadOnly = true;
+			// 
+			// GROUTINGUSERCODE
+			// 
+			this.GROUTINGUSERCODE.DataPropertyName = "GROUTINGUSERCODE";
+			this.GROUTINGUSERCODE.HeaderText = "成型工号";
+			this.GROUTINGUSERCODE.MinimumWidth = 6;
+			this.GROUTINGUSERCODE.Name = "GROUTINGUSERCODE";
+			this.GROUTINGUSERCODE.ReadOnly = true;
+			this.GROUTINGUSERCODE.Width = 125;
+			// 
+			// goodstypename
+			// 
+			this.goodstypename.DataPropertyName = "goodstypename";
+			this.goodstypename.HeaderText = "产品类别";
+			this.goodstypename.MinimumWidth = 6;
+			this.goodstypename.Name = "goodstypename";
+			this.goodstypename.ReadOnly = true;
+			this.goodstypename.Width = 125;
+			// 
 			// delivertime
 			// 
 			this.delivertime.DataPropertyName = "delivertime";
@@ -800,15 +831,6 @@
 			this.GoodsLevelName.Visible = false;
 			this.GoodsLevelName.Width = 125;
 			// 
-			// GROUTINGUSERCODE
-			// 
-			this.GROUTINGUSERCODE.DataPropertyName = "GROUTINGUSERCODE";
-			this.GROUTINGUSERCODE.HeaderText = "成型工号";
-			this.GROUTINGUSERCODE.MinimumWidth = 6;
-			this.GROUTINGUSERCODE.Name = "GROUTINGUSERCODE";
-			this.GROUTINGUSERCODE.ReadOnly = true;
-			this.GROUTINGUSERCODE.Width = 125;
-			// 
 			// inscrapflag
 			// 
 			this.inscrapflag.DataPropertyName = "inscrapflag";
@@ -875,15 +897,6 @@
 			this.SecurityCode.ReadOnly = true;
 			this.SecurityCode.Width = 125;
 			// 
-			// goodstypename
-			// 
-			this.goodstypename.DataPropertyName = "goodstypename";
-			this.goodstypename.HeaderText = "产品类别";
-			this.goodstypename.MinimumWidth = 6;
-			this.goodstypename.Name = "goodstypename";
-			this.goodstypename.ReadOnly = true;
-			this.goodstypename.Width = 125;
-			// 
 			// ProductionLineID
 			// 
 			this.ProductionLineID.DataPropertyName = "ProductionLineID";
@@ -1213,11 +1226,57 @@
 			this.TestMouldFlag.TrueValue = "1";
 			this.TestMouldFlag.Width = 125;
 			// 
+			// GroutingUsersCode
+			// 
+			this.GroutingUsersCode.BackColor = System.Drawing.SystemColors.Window;
+			this.GroutingUsersCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.GroutingUsersCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.GroutingUsersCode.Location = new System.Drawing.Point(78, 56);
+			this.GroutingUsersCode.Margin = new System.Windows.Forms.Padding(2);
+			this.GroutingUsersCode.Name = "GroutingUsersCode";
+			this.GroutingUsersCode.Size = new System.Drawing.Size(137, 21);
+			this.GroutingUsersCode.TabIndex = 53;
+			// 
+			// c_Label2
+			// 
+			this.c_Label2.AutoSize = true;
+			this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label2.Location = new System.Drawing.Point(20, 59);
+			this.c_Label2.Name = "c_Label2";
+			this.c_Label2.Size = new System.Drawing.Size(53, 12);
+			this.c_Label2.TabIndex = 52;
+			this.c_Label2.Text = "成型工号";
+			// 
+			// goodscodeText
+			// 
+			this.goodscodeText.BackColor = System.Drawing.SystemColors.Window;
+			this.goodscodeText.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.goodscodeText.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.goodscodeText.Location = new System.Drawing.Point(504, 16);
+			this.goodscodeText.Margin = new System.Windows.Forms.Padding(2);
+			this.goodscodeText.Name = "goodscodeText";
+			this.goodscodeText.Size = new System.Drawing.Size(130, 21);
+			this.goodscodeText.TabIndex = 55;
+			// 
+			// c_Label3
+			// 
+			this.c_Label3.AutoSize = true;
+			this.c_Label3.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label3.Location = new System.Drawing.Point(448, 20);
+			this.c_Label3.Name = "c_Label3";
+			this.c_Label3.Size = new System.Drawing.Size(53, 12);
+			this.c_Label3.TabIndex = 54;
+			this.c_Label3.Text = "产品编码";
+			// 
 			// F_RPT_010401
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1131, 401);
+			this.ClientSize = new System.Drawing.Size(1405, 806);
 			this.Controls.Add(this.dgvInProduction);
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.tsrOperate);
@@ -1248,7 +1307,6 @@
         private Basics.BaseControls.C_DateTimePicker dtpCreateTimeStart;
         private Basics.BaseControls.C_Label lblCreateTimeEnd;
         private Basics.BaseControls.C_DateTimePicker dtpCreateTimeEnd;
-        private Controls.SearchTextBox.dkUserInfoSearchBox dkUserInfoSearchBox;
         private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox;
         private Controls.SearchTextBox.dkproductionLineSearchBox dkproductionLineSearchBox;
         private Basics.BaseControls.C_TXT_BarCode txtBarCode;
@@ -1273,16 +1331,20 @@
 		private Basics.BaseControls.DKTextBox txtSTAFFNAME;
 		private Basics.BaseControls.C_TextBox txtGroutingLineCode;
 		private Basics.BaseControls.C_Label lblGroutingLineCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Statistics;
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn counts;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GROUTINGUSERCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
 		private System.Windows.Forms.DataGridViewTextBoxColumn delivertime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn proceduretime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsLevelName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GROUTINGUSERCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn inscrapflag;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -1290,7 +1352,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn FinishedBarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SecurityCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureID;
@@ -1323,5 +1384,9 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn TestMouldFlag;
+		private Basics.BaseControls.DKTextBox goodscodeText;
+		private Basics.BaseControls.C_Label c_Label3;
+		private Basics.BaseControls.DKTextBox GroutingUsersCode;
+		private Basics.BaseControls.C_Label c_Label2;
 	}
 }

DK.Client/ReportModule/R01/M04/F_RPT_010401.cs

@@ -188,7 +188,6 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.txtGroutingLineCode.Clear();
 			this.dkProcedureSearchBox.ClearControl();
 			this.dkproductionLineSearchBox.ClearControl();
-			this.dkUserInfoSearchBox.ClearControl();
 			this.dtpCreateTimeStart.Value = DateTime.Now.Date;
 			this.dtpCreateTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
 			this.dtpUpdateTimeStart.Value = DateTime.Now.Date;
@@ -238,7 +237,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				se.ProductionLineIDS = dkproductionLineSearchBox.ProductionLineIDS;
 				se.ProcedureIDS = dkProcedureSearchBox.ProcedureIDS;
 				se.GoodsIDS = this.scbGoods.CheckedPKMember;
-				se.UserIDS = dkUserInfoSearchBox.UserIDS;
+				se.GroutingUserCodes = this.GroutingUsersCode.Text;
+				se.GoodsCode = this.goodscodeText.Text;
 				se.GroutingLineCode = this.txtGroutingLineCode.Text;
 				se.GMouldTypeIDS = this.scbGMouldType.CheckedPKMember;
 				if (this.chkCreateTime.Checked == true)

DK.Client/ReportModule/R01/M04/F_RPT_010401.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Statistics.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -126,6 +129,18 @@
   <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="counts.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="goodstypename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="delivertime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,9 +159,6 @@
   <metadata name="GoodsLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="inscrapflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -168,9 +180,6 @@
   <metadata name="SecurityCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="goodstypename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="ProductionLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -17,6 +17,7 @@ using Dongke.IBOSS.PRD.WCF.DataModels.ReportModule;
 using Dongke.WinForm.Utilities;
 using Oracle.ManagedDataAccess.Client;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Net.NetworkInformation;
@@ -1863,8 +1864,83 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                         sql.Append("  AND instr(STAFF.STAFFNAME,:STAFFNAME)>0 ");
                         parameters.Add(new OracleParameter(":STAFFNAME", OracleDbType.NVarchar2, se.StaffName, ParameterDirection.Input));
                     }
+
+
+                    //产品编码 
+                    if (!string.IsNullOrEmpty(se.GoodsCode))
+                    {
+                        sql.Append("  AND instr(TP_PM_InProduction.GoodsCode,:GoodsCode)>0 ");
+                        parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
+                    }
+
+                    //成型工号 
+                    if (!string.IsNullOrEmpty(se.GroutingUserCodes))
+                    {
+                        sql.Append("  AND instr(TP_PM_InProduction.GROUTINGUSERCODE,:GroutingUserCodes)>0 ");
+                        parameters.Add(new OracleParameter(":GroutingUserCodes", OracleDbType.NVarchar2, se.GroutingUserCodes, ParameterDirection.Input));
+                    }
+
+
                 }
-                sql.Append("  order by TP_PM_InProduction.UpdateTime desc");
+                sql.Append(@"GROUP BY grouping sets((
+                        TP_PM_InProduction.BarCode,
+                    	TP_PM_InProduction.GoodsID,
+                    	TP_PM_InProduction.GoodsCode,
+                    	TP_PM_InProduction.GoodsName,Goods.GOODSSPECIFICATION,
+                    	gt.goodstypename,
+                    	TP_PM_InProduction.Userid,
+                    	A.USERNAME,
+                    	A.USERCode ,
+                    	TP_PM_InProduction.ProductionLineID,
+                    	TP_PM_InProduction.ProductionLineCode,
+                    	TP_PM_InProduction.ProductionLineName,
+                    	TP_PM_InProduction.ModelType,
+                    	TP_PM_InProduction.inscrapflag,
+                    	TP_PM_InProduction.IsPublicBody,
+                    	TP_PM_InProduction.IsReFire,
+                    	TP_PM_InProduction.IsReworkFlag,
+                    	TP_PM_InProduction.CanManyTimes,
+                    	TP_PM_InProduction.ProcedureModel,
+                    	TP_PM_InProduction.GroutingDailyID,
+                    	TP_PM_InProduction.GroutingDailyDetailID,
+                    	TP_PM_InProduction.GroutingDate,
+                    	TP_PM_InProduction.GroutingLineID,
+                    	TP_PM_InProduction.GroutingLineCode,
+                    	TP_PM_InProduction.GroutingLineName,
+                    	TP_PM_InProduction.KILNCODE,
+                    	TP_PM_InProduction.KILNCARCODE,
+                    	TP_PM_InProduction.ProcedureID,
+                    	D.ProcedureName,
+                    	TP_PM_InProduction.GMouldTypeID,
+                    	TP_MST_GMouldType.GMOULDTYPENAME,
+                    	TP_PM_InProduction.GroutingLineDetailID,
+                    	TP_PM_InProduction.GroutingMouldCode,
+                    	TP_PM_InProduction.SPECIALREPAIRFLAG,
+                    	TP_PM_InProduction.GROUTINGUSERCODE,
+                    	TP_PM_GroutingDailyDetail.GROUTINGCOUNT,
+                    	TP_PM_GroutingDailyDetail.GROUTINGBATCHNO,
+                    	TP_PM_GroutingDailyDetail.delivertime,
+                    	TP_PM_InProduction.proceduretime,
+                    	TP_PM_InProduction.Remarks,
+                    	TP_PM_InProduction.GoodsLevelID,
+                    	TP_MST_GoodsLevel.GOODSLEVELNAME,
+                    	TP_PM_InProduction.GoodsLevelTypeID,
+                    	TP_SYS_GoodsLevelType.GOODSLEVELTYPENAME,
+                    	TP_PM_InProduction.AccountID,
+                    	TP_PM_InProduction.ValueFlag,
+                    	TP_PM_GroutingDailyDetail.glazingroom,
+                    	TP_PM_GroutingDailyDetail.SecurityCode,
+                    	TP_PM_GroutingDailyDetail.TestMouldFlag,
+                    	TP_PM_InProduction.CreateTime,
+                    	TP_PM_InProduction.CreateUserID,
+                    	B.USERNAME,
+                    	TP_PM_InProduction.PROCEDURETIME,
+                    	TP_PM_InProduction.UpdateUserID,
+                    	C.USERNAME,TP_MST_Logo.Logoname ,TP_MST_Logo.Logocode,TP_PM_GroutingDailyDetail.outlabelcode,TP_PM_GroutingDailyDetail.MaterialCode,TP_PM_GroutingDailyDetail.accountid,TP_MST_Logo.tagcode,TP_PM_GroutingDailyDetail.onlycode ,STAFF.STAFFNAME),
+            (TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,Goods.GOODSSPECIFICATION,gt.goodstypename,TP_PM_InProduction.ProcedureID,D.ProcedureName),
+			(TP_PM_InProduction.GoodsID,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,Goods.GOODSSPECIFICATION,gt.goodstypename,TP_PM_InProduction.ProcedureID,D.ProcedureName),
+            (TP_PM_InProduction.ProcedureID,D.ProcedureName))
+			ORDER BY TP_PM_InProduction.ProcedureID,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.GROUTINGUSERCODE,grouping_id(TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.ProcedureID,D.ProcedureName),TP_PM_InProduction.BarCode");
                 DataTable data = conn.GetSqlResultToDt(sql.ToString(), parameters.ToArray());
 
                 ServiceResultEntity sre = new ServiceResultEntity();
@@ -1897,13 +1973,19 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         /// <returns>sql</returns>
         private static string GetRPT010401SSQL()
         {
-            string selSql = @"
-                     SELECT
+            string selSql = @"   SELECT grouping_id(TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.ProcedureID,D.ProcedureName) GID,
+										 CASE WHEN grouping_id(TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.ProcedureID,D.ProcedureName)=16 THEN '合计'
+													WHEN grouping_id(TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.ProcedureID,D.ProcedureName)=28 THEN '总计'
+													WHEN grouping_id(TP_PM_InProduction.GROUTINGUSERCODE,TP_PM_InProduction.GoodsCode,TP_PM_InProduction.GoodsName,TP_PM_InProduction.ProcedureID,D.ProcedureName)=0 AND TP_PM_InProduction.BarCode is null THEN '小计' END AS 统计方式,
                     	TP_PM_InProduction.BarCode,
                     	TP_PM_InProduction.GoodsID,
                     	TP_PM_InProduction.GoodsCode,
-                    	TP_PM_InProduction.GoodsName,
+                    	TP_PM_InProduction.GoodsName,Goods.GOODSSPECIFICATION,
                     	gt.goodstypename,
+						TP_PM_InProduction.ProcedureID CompleteProcedureID,
+                    	D.ProcedureName AS CompleteProcedureName,
+						TP_PM_InProduction.GROUTINGUSERCODE,
+						COUNT(1) counts,
                     	TP_PM_InProduction.Userid,
                     	A.USERNAME AS UserName,
                     	A.USERCode AS UserCode,
@@ -1925,14 +2007,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     	TP_PM_InProduction.GroutingLineName,
                     	TP_PM_InProduction.KILNCODE,
                     	TP_PM_InProduction.KILNCARCODE,
-                    	TP_PM_InProduction.ProcedureID CompleteProcedureID,
-                    	D.ProcedureName AS CompleteProcedureName,
+
                     	TP_PM_InProduction.GMouldTypeID,
                     	TP_MST_GMouldType.GMOULDTYPENAME AS GMouldTypeName,
                     	TP_PM_InProduction.GroutingLineDetailID,
                     	TP_PM_InProduction.GroutingMouldCode,
                     	TP_PM_InProduction.SPECIALREPAIRFLAG,
-                    	TP_PM_InProduction.GROUTINGUSERCODE,
+                    	
                     	TP_PM_GroutingDailyDetail.GROUTINGCOUNT,
                     	TP_PM_GroutingDailyDetail.GROUTINGBATCHNO,
                     	TP_PM_GroutingDailyDetail.delivertime,
@@ -1994,7 +2075,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     	) STAFF ON PD.CLASSESSETTINGID = STAFF.CLASSESSETTINGID
                     WHERE
                     	TP_PM_InProduction.ValueFlag = 1 
-                    	AND TP_PM_InProduction.AccountID = :AccountID
+                    	AND TP_PM_InProduction.AccountID = 1
                         AND PD.VALUEFLAG=1
                     ";
 

WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT010401_SE.cs

@@ -184,5 +184,24 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+        /// <summary>
+        /// 产品编码
+        /// </summary>
+        [DataMember]
+        public string GoodsCode
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 成型工号
+        /// </summary>
+        [DataMember]
+        public string GroutingUserCodes
+        {
+            get;
+            set;
+        }
     }
 }