中陶相关修改

DK.Client/Client.Controls/SelectForm/F_Goods.cs

@@ -125,15 +125,22 @@ namespace Dongke.IBOSS.PRD.Client.Controls.SearchBox
 				ServiceResultEntity sre = null;
 				DoAsync(() => { return CommonModuleProxy.Service.DoRequest(cre); }, out sre);
 
-				if (!(sre.Status == Constant.ServiceResultStatus.Success))
-				{
-					//StateMessageClass.GetErrorMessageByStatus(this, sre.Status);
+				//if (!(sre.Status == Constant.ServiceResultStatus.Success))
+				//{
+				//	//StateMessageClass.GetErrorMessageByStatus(this, sre.Status);
 
-					// 提示未查找到数据
-					MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
-						 MessageBoxButtons.OK, MessageBoxIcon.Information);
-				}
-				return sre;
+				//	// 提示未查找到数据
+				//	MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+				//		 MessageBoxButtons.OK, MessageBoxIcon.Information);
+				//}
+                if (sre.Status == Constant.ServiceResultStatus.NoSearchResults ||
+                    sre.Data == null || sre.Data.Tables.Count == 0 || sre.Data.Tables[0].Rows.Count == 0)
+                {
+                    // 提示未查找到数据
+                    MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+                         MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                return sre;
 			}
 			catch (Exception ex)
 			{

DK.Client/PCModule/F_PC_0102_1_1.Designer.cs

@@ -28,16 +28,16 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0102_1_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
             this.lblBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.lblFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -68,9 +68,8 @@
             this.btnDeleteSelected = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.txtFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_GroupBox1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.scbUser1 = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbUser();
+            this.HighPressureFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.lblGMouldType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbGMouldType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGMouldType();
             this.txtGroutingLineNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -92,7 +91,6 @@
             this.txtGMouldCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.pnlAuto = new System.Windows.Forms.Panel();
-            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtStandardGroutingCount = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -100,7 +98,9 @@
             this.txtBeginNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
             this.rabBinding = new Dongke.IBOSS.PRD.Basics.BaseControls.C_RadioButton();
             this.btnAdaptive = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.HighPressureFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.scbUser1 = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbUser();
+            this.scbGMouldType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGMouldType();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
             this.c_GroupBox1.SuspendLayout();
             this.tabControl1.SuspendLayout();
@@ -119,10 +119,9 @@
             this.lblBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblBuildingNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblBuildingNo.IsMustInput = true;
-            this.lblBuildingNo.Location = new System.Drawing.Point(8, 30);
-            this.lblBuildingNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblBuildingNo.Location = new System.Drawing.Point(6, 24);
             this.lblBuildingNo.Name = "lblBuildingNo";
-            this.lblBuildingNo.Size = new System.Drawing.Size(37, 15);
+            this.lblBuildingNo.Size = new System.Drawing.Size(29, 12);
             this.lblBuildingNo.TabIndex = 0;
             this.lblBuildingNo.Text = "楼号";
             // 
@@ -135,11 +134,10 @@
             this.txtBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBuildingNo.HasError = true;
             this.txtBuildingNo.IsMustInput = true;
-            this.txtBuildingNo.Location = new System.Drawing.Point(55, 25);
-            this.txtBuildingNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtBuildingNo.Location = new System.Drawing.Point(41, 20);
             this.txtBuildingNo.MaxLength = 10;
             this.txtBuildingNo.Name = "txtBuildingNo";
-            this.txtBuildingNo.Size = new System.Drawing.Size(132, 25);
+            this.txtBuildingNo.Size = new System.Drawing.Size(100, 21);
             this.txtBuildingNo.TabIndex = 1;
             this.txtBuildingNo.TextChanged += new System.EventHandler(this.txtBuildingNo_TextChanged);
             // 
@@ -150,10 +148,9 @@
             this.lblFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblFloorNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblFloorNo.IsMustInput = true;
-            this.lblFloorNo.Location = new System.Drawing.Point(196, 30);
-            this.lblFloorNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblFloorNo.Location = new System.Drawing.Point(147, 24);
             this.lblFloorNo.Name = "lblFloorNo";
-            this.lblFloorNo.Size = new System.Drawing.Size(37, 15);
+            this.lblFloorNo.Size = new System.Drawing.Size(29, 12);
             this.lblFloorNo.TabIndex = 2;
             this.lblFloorNo.Text = "楼层";
             // 
@@ -164,10 +161,9 @@
             this.lblGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineNo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineNo.IsMustInput = true;
-            this.lblGroutingLineNo.Location = new System.Drawing.Point(384, 30);
-            this.lblGroutingLineNo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGroutingLineNo.Location = new System.Drawing.Point(288, 24);
             this.lblGroutingLineNo.Name = "lblGroutingLineNo";
-            this.lblGroutingLineNo.Size = new System.Drawing.Size(37, 15);
+            this.lblGroutingLineNo.Size = new System.Drawing.Size(29, 12);
             this.lblGroutingLineNo.TabIndex = 4;
             this.lblGroutingLineNo.Text = "线号";
             // 
@@ -178,10 +174,9 @@
             this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineCode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineCode.IsMustInput = true;
-            this.lblGroutingLineCode.Location = new System.Drawing.Point(8, 64);
-            this.lblGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGroutingLineCode.Location = new System.Drawing.Point(6, 51);
             this.lblGroutingLineCode.Name = "lblGroutingLineCode";
-            this.lblGroutingLineCode.Size = new System.Drawing.Size(37, 15);
+            this.lblGroutingLineCode.Size = new System.Drawing.Size(29, 12);
             this.lblGroutingLineCode.TabIndex = 6;
             this.lblGroutingLineCode.Text = "编码";
             // 
@@ -194,12 +189,11 @@
             this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGroutingLineCode.HasError = true;
             this.txtGroutingLineCode.IsMustInput = true;
-            this.txtGroutingLineCode.Location = new System.Drawing.Point(55, 59);
-            this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(41, 47);
             this.txtGroutingLineCode.MaxLength = 30;
             this.txtGroutingLineCode.Name = "txtGroutingLineCode";
             this.txtGroutingLineCode.ReadOnly = true;
-            this.txtGroutingLineCode.Size = new System.Drawing.Size(132, 25);
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(100, 21);
             this.txtGroutingLineCode.TabIndex = 7;
             this.txtGroutingLineCode.TextChanged += new System.EventHandler(this.txtGroutingLineCode_TextChanged);
             // 
@@ -210,10 +204,9 @@
             this.lblGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGroutingLineName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGroutingLineName.IsMustInput = true;
-            this.lblGroutingLineName.Location = new System.Drawing.Point(196, 64);
-            this.lblGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGroutingLineName.Location = new System.Drawing.Point(147, 51);
             this.lblGroutingLineName.Name = "lblGroutingLineName";
-            this.lblGroutingLineName.Size = new System.Drawing.Size(37, 15);
+            this.lblGroutingLineName.Size = new System.Drawing.Size(29, 12);
             this.lblGroutingLineName.TabIndex = 8;
             this.lblGroutingLineName.Text = "名称";
             // 
@@ -225,11 +218,10 @@
             this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGroutingLineName.HasError = true;
             this.txtGroutingLineName.IsMustInput = true;
-            this.txtGroutingLineName.Location = new System.Drawing.Point(243, 59);
-            this.txtGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGroutingLineName.Location = new System.Drawing.Point(182, 47);
             this.txtGroutingLineName.MaxLength = 50;
             this.txtGroutingLineName.Name = "txtGroutingLineName";
-            this.txtGroutingLineName.Size = new System.Drawing.Size(132, 25);
+            this.txtGroutingLineName.Size = new System.Drawing.Size(100, 21);
             this.txtGroutingLineName.TabIndex = 9;
             // 
             // lblRemarks
@@ -238,10 +230,9 @@
             this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
             this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblRemarks.Location = new System.Drawing.Point(8, 96);
-            this.lblRemarks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemarks.Location = new System.Drawing.Point(6, 77);
             this.lblRemarks.Name = "lblRemarks";
-            this.lblRemarks.Size = new System.Drawing.Size(37, 15);
+            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
             this.lblRemarks.TabIndex = 12;
             this.lblRemarks.Text = "备注";
             // 
@@ -251,12 +242,11 @@
             this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
             this.txtRemarks.ErrorMessage = "";
             this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRemarks.Location = new System.Drawing.Point(55, 92);
-            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtRemarks.Location = new System.Drawing.Point(41, 74);
             this.txtRemarks.MaxLength = 500;
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemarks.Size = new System.Drawing.Size(696, 25);
+            this.txtRemarks.Size = new System.Drawing.Size(523, 21);
             this.txtRemarks.TabIndex = 13;
             // 
             // lblCount
@@ -265,10 +255,9 @@
             this.lblCount.BackColor = System.Drawing.Color.Transparent;
             this.lblCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblCount.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblCount.Location = new System.Drawing.Point(399, 11);
-            this.lblCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblCount.Location = new System.Drawing.Point(299, 9);
             this.lblCount.Name = "lblCount";
-            this.lblCount.Size = new System.Drawing.Size(67, 15);
+            this.lblCount.Size = new System.Drawing.Size(53, 12);
             this.lblCount.TabIndex = 3;
             this.lblCount.Text = "模具数量";
             // 
@@ -279,8 +268,7 @@
             this.txtCount.ErrorMessage = "";
             this.txtCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtCount.Location = new System.Drawing.Point(476, 6);
-            this.txtCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtCount.Location = new System.Drawing.Point(357, 5);
             this.txtCount.MaxLength = 3;
             this.txtCount.MaxValue = new decimal(new int[] {
             999,
@@ -293,7 +281,7 @@
             0,
             0});
             this.txtCount.Name = "txtCount";
-            this.txtCount.Size = new System.Drawing.Size(47, 25);
+            this.txtCount.Size = new System.Drawing.Size(36, 21);
             this.txtCount.TabIndex = 4;
             this.txtCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtCount.TextValue = "";
@@ -304,10 +292,9 @@
             this.btnAddMould.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAddMould.BackgroundImage")));
             this.btnAddMould.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAddMould.ForeColor = System.Drawing.Color.White;
-            this.btnAddMould.Location = new System.Drawing.Point(707, 0);
-            this.btnAddMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAddMould.Location = new System.Drawing.Point(530, 0);
             this.btnAddMould.Name = "btnAddMould";
-            this.btnAddMould.Size = new System.Drawing.Size(113, 38);
+            this.btnAddMould.Size = new System.Drawing.Size(85, 30);
             this.btnAddMould.TabIndex = 5;
             this.btnAddMould.Text = "添加模具(&A)";
             this.btnAddMould.UseVisualStyleBackColor = false;
@@ -319,8 +306,8 @@
             this.dgvDetail.AllowUserToDeleteRows = false;
             this.dgvDetail.AllowUserToModifyRows = true;
             this.dgvDetail.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
             this.dgvDetail.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvDetail.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvDetail.CellHeight = 23;
@@ -328,14 +315,14 @@
             this.dgvDetail.ChildNodeColumnText = null;
             this.dgvDetail.ColumnDeep = 1;
             this.dgvDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
             this.dgvDetail.ColumnHeadersHeight = 29;
             this.dgvDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -352,14 +339,14 @@
             this.Remarks});
             this.dgvDetail.ColumnTreeView = null;
             this.dgvDetail.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDetail.DefaultCellStyle = dataGridViewCellStyle16;
             this.dgvDetail.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvDetail.DynamicColumnName = "";
             this.dgvDetail.EnableHeadersVisualStyles = false;
@@ -372,8 +359,7 @@
             this.dgvDetail.IsOpenMergeCellFlag = false;
             this.dgvDetail.IsSubTotalFlag = false;
             this.dgvDetail.IsTopDeep = false;
-            this.dgvDetail.Location = new System.Drawing.Point(4, 85);
-            this.dgvDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvDetail.Location = new System.Drawing.Point(3, 68);
             this.dgvDetail.MergeColumnNames = null;
             this.dgvDetail.MergeDetailColumnNames = null;
             this.dgvDetail.MergeDetailOnlyColumn = null;
@@ -382,10 +368,10 @@
             this.dgvDetail.RefreshAtHscroll = false;
             this.dgvDetail.RowHeadersWidth = 50;
             this.dgvDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvDetail.RowsDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvDetail.RowTemplate.Height = 21;
-            this.dgvDetail.Size = new System.Drawing.Size(944, 298);
+            this.dgvDetail.Size = new System.Drawing.Size(706, 236);
             this.dgvDetail.SortOrderColumnName = null;
             this.dgvDetail.TabIndex = 5;
             this.dgvDetail.Tag = true;
@@ -469,8 +455,8 @@
             // GROUTINGCOUNT
             // 
             this.GROUTINGCOUNT.DataPropertyName = "GROUTINGCOUNT";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle13;
             this.GROUTINGCOUNT.HeaderText = "注浆次数";
             this.GROUTINGCOUNT.MaxValue = new decimal(new int[] {
             999999,
@@ -491,8 +477,8 @@
             // StandardGroutingCount
             // 
             this.StandardGroutingCount.DataPropertyName = "StandardGroutingCount";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle14;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
             this.StandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -523,8 +509,8 @@
             // Remarks
             // 
             this.Remarks.DataPropertyName = "Remarks";
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
-            this.Remarks.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
+            this.Remarks.DefaultCellStyle = dataGridViewCellStyle15;
             this.Remarks.HeaderText = "备注";
             this.Remarks.MinimumWidth = 6;
             this.Remarks.Name = "Remarks";
@@ -538,10 +524,9 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(741, 571);
-            this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSave.Location = new System.Drawing.Point(556, 457);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(113, 38);
+            this.btnSave.Size = new System.Drawing.Size(85, 30);
             this.btnSave.TabIndex = 14;
             this.btnSave.Text = "保存(&S)";
             this.btnSave.UseVisualStyleBackColor = false;
@@ -555,10 +540,9 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(863, 571);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnCancel.Location = new System.Drawing.Point(647, 457);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(113, 38);
+            this.btnCancel.Size = new System.Drawing.Size(85, 30);
             this.btnCancel.TabIndex = 15;
             this.btnCancel.Text = "关闭";
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -570,10 +554,9 @@
             this.btnDeleteSelected.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnDeleteSelected.BackgroundImage")));
             this.btnDeleteSelected.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnDeleteSelected.ForeColor = System.Drawing.Color.White;
-            this.btnDeleteSelected.Location = new System.Drawing.Point(683, 39);
-            this.btnDeleteSelected.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnDeleteSelected.Location = new System.Drawing.Point(512, 31);
             this.btnDeleteSelected.Name = "btnDeleteSelected";
-            this.btnDeleteSelected.Size = new System.Drawing.Size(113, 38);
+            this.btnDeleteSelected.Size = new System.Drawing.Size(85, 30);
             this.btnDeleteSelected.TabIndex = 4;
             this.btnDeleteSelected.Text = "删除模具(&D)";
             this.btnDeleteSelected.UseVisualStyleBackColor = false;
@@ -586,8 +569,7 @@
             this.txtFloorNo.ErrorMessage = "";
             this.txtFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtFloorNo.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtFloorNo.Location = new System.Drawing.Point(243, 25);
-            this.txtFloorNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtFloorNo.Location = new System.Drawing.Point(182, 20);
             this.txtFloorNo.MaxLength = 5;
             this.txtFloorNo.MaxValue = new decimal(new int[] {
             -1,
@@ -600,7 +582,7 @@
             -1,
             -2147483648});
             this.txtFloorNo.Name = "txtFloorNo";
-            this.txtFloorNo.Size = new System.Drawing.Size(132, 25);
+            this.txtFloorNo.Size = new System.Drawing.Size(100, 21);
             this.txtFloorNo.TabIndex = 3;
             this.txtFloorNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtFloorNo.TextValue = "";
@@ -633,28 +615,26 @@
             this.c_GroupBox1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_GroupBox1.ForeColor = System.Drawing.SystemColors.ControlText;
             this.c_GroupBox1.IsMustInput = false;
-            this.c_GroupBox1.Location = new System.Drawing.Point(16, 15);
-            this.c_GroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.c_GroupBox1.Location = new System.Drawing.Point(12, 12);
             this.c_GroupBox1.Name = "c_GroupBox1";
             this.c_GroupBox1.OpeningMark = "";
             this.c_GroupBox1.OriginalHeight = -1;
-            this.c_GroupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.c_GroupBox1.Size = new System.Drawing.Size(960, 125);
+            this.c_GroupBox1.Size = new System.Drawing.Size(720, 100);
             this.c_GroupBox1.TabIndex = 0;
             this.c_GroupBox1.TabStop = false;
-            this.c_GroupBox1.Text = "成型线信息         ";
+            this.c_GroupBox1.Text = "成型线信息          ";
             // 
-            // scbUser1
+            // HighPressureFlag
             // 
-            this.scbUser1.CheckedData = null;
-            this.scbUser1.IsWorker = false;
-            this.scbUser1.Location = new System.Drawing.Point(619, 59);
-            this.scbUser1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.scbUser1.Name = "scbUser1";
-            this.scbUser1.ShowBorderColor = false;
-            this.scbUser1.ShowMustInputAlert = false;
-            this.scbUser1.Size = new System.Drawing.Size(133, 26);
-            this.scbUser1.TabIndex = 20;
+            this.HighPressureFlag.AutoSize = true;
+            this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.HighPressureFlag.Location = new System.Drawing.Point(464, 21);
+            this.HighPressureFlag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.HighPressureFlag.Name = "HighPressureFlag";
+            this.HighPressureFlag.Size = new System.Drawing.Size(72, 16);
+            this.HighPressureFlag.TabIndex = 21;
+            this.HighPressureFlag.Text = "高压注浆";
+            this.HighPressureFlag.UseVisualStyleBackColor = true;
             // 
             // lblGMouldType
             // 
@@ -663,24 +643,12 @@
             this.lblGMouldType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGMouldType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGMouldType.IsMustInput = true;
-            this.lblGMouldType.Location = new System.Drawing.Point(384, 64);
-            this.lblGMouldType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGMouldType.Location = new System.Drawing.Point(288, 51);
             this.lblGMouldType.Name = "lblGMouldType";
-            this.lblGMouldType.Size = new System.Drawing.Size(37, 15);
+            this.lblGMouldType.Size = new System.Drawing.Size(29, 12);
             this.lblGMouldType.TabIndex = 19;
             this.lblGMouldType.Text = "类型";
             // 
-            // scbGMouldType
-            // 
-            this.scbGMouldType.CheckedData = null;
-            this.scbGMouldType.Location = new System.Drawing.Point(431, 59);
-            this.scbGMouldType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.scbGMouldType.Name = "scbGMouldType";
-            this.scbGMouldType.ShowBorderColor = false;
-            this.scbGMouldType.ShowMustInputAlert = false;
-            this.scbGMouldType.Size = new System.Drawing.Size(133, 26);
-            this.scbGMouldType.TabIndex = 18;
-            // 
             // txtGroutingLineNo
             // 
             this.txtGroutingLineNo.BackColor = System.Drawing.SystemColors.Window;
@@ -688,11 +656,10 @@
             this.txtGroutingLineNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
             this.txtGroutingLineNo.ErrorMessage = "";
             this.txtGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingLineNo.Location = new System.Drawing.Point(431, 25);
-            this.txtGroutingLineNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGroutingLineNo.Location = new System.Drawing.Point(323, 20);
             this.txtGroutingLineNo.MaxLength = 10;
             this.txtGroutingLineNo.Name = "txtGroutingLineNo";
-            this.txtGroutingLineNo.Size = new System.Drawing.Size(132, 25);
+            this.txtGroutingLineNo.Size = new System.Drawing.Size(100, 21);
             this.txtGroutingLineNo.TabIndex = 5;
             this.txtGroutingLineNo.TextValue = "";
             this.txtGroutingLineNo.TextChanged += new System.EventHandler(this.txtGroutingLineNo_TextChanged);
@@ -703,10 +670,9 @@
             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(572, 64);
-            this.c_Label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label3.Location = new System.Drawing.Point(429, 51);
             this.c_Label3.Name = "c_Label3";
-            this.c_Label3.Size = new System.Drawing.Size(37, 15);
+            this.c_Label3.Size = new System.Drawing.Size(29, 12);
             this.c_Label3.TabIndex = 12;
             this.c_Label3.Text = "班长";
             // 
@@ -717,22 +683,20 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(16, 148);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabControl1.Location = new System.Drawing.Point(12, 118);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(960, 416);
+            this.tabControl1.Size = new System.Drawing.Size(720, 333);
             this.tabControl1.TabIndex = 8;
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.dgvUser);
-            this.tabPage1.Location = new System.Drawing.Point(4, 25);
-            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage1.Size = new System.Drawing.Size(952, 387);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Size = new System.Drawing.Size(712, 307);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "成型工号";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -740,8 +704,8 @@
             // dgvUser
             // 
             this.dgvUser.AllowUserToModifyRows = true;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18;
             this.dgvUser.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvUser.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvUser.CellHeight = 23;
@@ -749,14 +713,14 @@
             this.dgvUser.ChildNodeColumnText = null;
             this.dgvUser.ColumnDeep = 1;
             this.dgvUser.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
             this.dgvUser.ColumnHeadersHeight = 29;
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -780,8 +744,7 @@
             this.dgvUser.IsOpenMergeCellFlag = false;
             this.dgvUser.IsSubTotalFlag = false;
             this.dgvUser.IsTopDeep = false;
-            this.dgvUser.Location = new System.Drawing.Point(4, 4);
-            this.dgvUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvUser.Location = new System.Drawing.Point(3, 3);
             this.dgvUser.MergeColumnNames = null;
             this.dgvUser.MergeDetailColumnNames = null;
             this.dgvUser.MergeDetailOnlyColumn = null;
@@ -790,10 +753,10 @@
             this.dgvUser.RefreshAtHscroll = false;
             this.dgvUser.RowHeadersWidth = 50;
             this.dgvUser.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvUser.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvUser.RowTemplate.Height = 21;
-            this.dgvUser.Size = new System.Drawing.Size(944, 379);
+            this.dgvUser.Size = new System.Drawing.Size(706, 301);
             this.dgvUser.SortOrderColumnName = null;
             this.dgvUser.TabIndex = 55;
             this.dgvUser.Tag = true;
@@ -863,11 +826,10 @@
             this.tabPage2.BackColor = System.Drawing.SystemColors.Control;
             this.tabPage2.Controls.Add(this.dgvDetail);
             this.tabPage2.Controls.Add(this.panel1);
-            this.tabPage2.Location = new System.Drawing.Point(4, 25);
-            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage2.Size = new System.Drawing.Size(952, 387);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Size = new System.Drawing.Size(712, 307);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "模具产品";
             // 
@@ -879,20 +841,18 @@
             this.panel1.Controls.Add(this.pnlAuto);
             this.panel1.Controls.Add(this.rabBinding);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(4, 4);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Location = new System.Drawing.Point(3, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(944, 81);
+            this.panel1.Size = new System.Drawing.Size(706, 65);
             this.panel1.TabIndex = 0;
             // 
             // rabAuto
             // 
             this.rabAuto.AutoSize = true;
             this.rabAuto.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabAuto.Location = new System.Drawing.Point(9, 9);
-            this.rabAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rabAuto.Location = new System.Drawing.Point(7, 7);
             this.rabAuto.Name = "rabAuto";
-            this.rabAuto.Size = new System.Drawing.Size(88, 19);
+            this.rabAuto.Size = new System.Drawing.Size(71, 16);
             this.rabAuto.TabIndex = 0;
             this.rabAuto.Text = "自动模具";
             this.rabAuto.UseVisualStyleBackColor = true;
@@ -905,27 +865,24 @@
             this.pnlBinding.Controls.Add(this.txtBarcode);
             this.pnlBinding.Controls.Add(this.txtGMouldCode);
             this.pnlBinding.Controls.Add(this.c_Label1);
-            this.pnlBinding.Location = new System.Drawing.Point(112, 39);
-            this.pnlBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pnlBinding.Location = new System.Drawing.Point(84, 31);
             this.pnlBinding.Name = "pnlBinding";
-            this.pnlBinding.Size = new System.Drawing.Size(569, 38);
+            this.pnlBinding.Size = new System.Drawing.Size(427, 30);
             this.pnlBinding.TabIndex = 3;
             // 
             // lblLabel1
             // 
-            this.lblLabel1.Location = new System.Drawing.Point(159, 11);
-            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel1.Location = new System.Drawing.Point(119, 9);
             this.lblLabel1.Name = "lblLabel1";
-            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
             this.lblLabel1.TabIndex = 2;
             this.lblLabel1.Text = "模具条码";
             // 
             // btnAddMouldBarcode
             // 
-            this.btnAddMouldBarcode.Location = new System.Drawing.Point(401, 0);
-            this.btnAddMouldBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAddMouldBarcode.Location = new System.Drawing.Point(301, 0);
             this.btnAddMouldBarcode.Name = "btnAddMouldBarcode";
-            this.btnAddMouldBarcode.Size = new System.Drawing.Size(160, 38);
+            this.btnAddMouldBarcode.Size = new System.Drawing.Size(120, 30);
             this.btnAddMouldBarcode.TabIndex = 4;
             this.btnAddMouldBarcode.Text = "添加模具(条码)(&M)";
             this.btnAddMouldBarcode.UseVisualStyleBackColor = true;
@@ -933,11 +890,10 @@
             // 
             // txtBarcode
             // 
-            this.txtBarcode.Location = new System.Drawing.Point(237, 6);
-            this.txtBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtBarcode.Location = new System.Drawing.Point(178, 5);
             this.txtBarcode.MaxLength = 50;
             this.txtBarcode.Name = "txtBarcode";
-            this.txtBarcode.Size = new System.Drawing.Size(159, 25);
+            this.txtBarcode.Size = new System.Drawing.Size(120, 21);
             this.txtBarcode.TabIndex = 3;
             this.txtBarcode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarcode_KeyDown);
             // 
@@ -948,8 +904,7 @@
             this.txtGMouldCode.ErrorMessage = "";
             this.txtGMouldCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGMouldCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtGMouldCode.Location = new System.Drawing.Point(79, 6);
-            this.txtGMouldCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtGMouldCode.Location = new System.Drawing.Point(59, 5);
             this.txtGMouldCode.MaxLength = 3;
             this.txtGMouldCode.MaxValue = new decimal(new int[] {
             999,
@@ -962,7 +917,7 @@
             0,
             0});
             this.txtGMouldCode.Name = "txtGMouldCode";
-            this.txtGMouldCode.Size = new System.Drawing.Size(72, 25);
+            this.txtGMouldCode.Size = new System.Drawing.Size(55, 21);
             this.txtGMouldCode.TabIndex = 1;
             this.txtGMouldCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtGMouldCode.TextValue = "";
@@ -974,10 +929,9 @@
             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(17, 11);
-            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label1.Location = new System.Drawing.Point(13, 9);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(52, 15);
+            this.c_Label1.Size = new System.Drawing.Size(41, 12);
             this.c_Label1.TabIndex = 0;
             this.c_Label1.Text = "模具号";
             // 
@@ -993,32 +947,20 @@
             this.pnlAuto.Controls.Add(this.txtBeginNum);
             this.pnlAuto.Controls.Add(this.btnAddMould);
             this.pnlAuto.Enabled = false;
-            this.pnlAuto.Location = new System.Drawing.Point(112, 0);
-            this.pnlAuto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pnlAuto.Location = new System.Drawing.Point(84, 0);
             this.pnlAuto.Name = "pnlAuto";
-            this.pnlAuto.Size = new System.Drawing.Size(829, 38);
+            this.pnlAuto.Size = new System.Drawing.Size(622, 30);
             this.pnlAuto.TabIndex = 1;
             // 
-            // scbGoods
-            // 
-            this.scbGoods.CheckedData = null;
-            this.scbGoods.DisplayMember = "GoodsCode";
-            this.scbGoods.Location = new System.Drawing.Point(92, 6);
-            this.scbGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(148, 26);
-            this.scbGoods.TabIndex = 39;
-            // 
             // lblGoods
             // 
             this.lblGoods.AutoSize = true;
             this.lblGoods.BackColor = System.Drawing.Color.Transparent;
             this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoods.Location = new System.Drawing.Point(13, 11);
-            this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoods.Location = new System.Drawing.Point(10, 9);
             this.lblGoods.Name = "lblGoods";
-            this.lblGoods.Size = new System.Drawing.Size(67, 15);
+            this.lblGoods.Size = new System.Drawing.Size(53, 12);
             this.lblGoods.TabIndex = 38;
             this.lblGoods.Text = "产品编码";
             // 
@@ -1030,8 +972,7 @@
             this.txtStandardGroutingCount.ErrorMessage = "";
             this.txtStandardGroutingCount.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtStandardGroutingCount.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtStandardGroutingCount.Location = new System.Drawing.Point(643, 6);
-            this.txtStandardGroutingCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtStandardGroutingCount.Location = new System.Drawing.Point(482, 5);
             this.txtStandardGroutingCount.MaxLength = 0;
             this.txtStandardGroutingCount.MaxValue = new decimal(new int[] {
             999999,
@@ -1044,7 +985,7 @@
             0,
             0});
             this.txtStandardGroutingCount.Name = "txtStandardGroutingCount";
-            this.txtStandardGroutingCount.Size = new System.Drawing.Size(47, 25);
+            this.txtStandardGroutingCount.Size = new System.Drawing.Size(36, 21);
             this.txtStandardGroutingCount.TabIndex = 11;
             this.txtStandardGroutingCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtStandardGroutingCount.TextValue = "";
@@ -1055,10 +996,9 @@
             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(532, 11);
-            this.c_Label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label2.Location = new System.Drawing.Point(399, 9);
             this.c_Label2.Name = "c_Label2";
-            this.c_Label2.Size = new System.Drawing.Size(97, 15);
+            this.c_Label2.Size = new System.Drawing.Size(77, 12);
             this.c_Label2.TabIndex = 10;
             this.c_Label2.Text = "标准注浆次数";
             // 
@@ -1068,10 +1008,9 @@
             this.lblstart.BackColor = System.Drawing.Color.Transparent;
             this.lblstart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblstart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblstart.Location = new System.Drawing.Point(248, 10);
-            this.lblstart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblstart.Location = new System.Drawing.Point(186, 8);
             this.lblstart.Name = "lblstart";
-            this.lblstart.Size = new System.Drawing.Size(82, 15);
+            this.lblstart.Size = new System.Drawing.Size(65, 12);
             this.lblstart.TabIndex = 1;
             this.lblstart.Text = "起始模具号";
             // 
@@ -1082,8 +1021,7 @@
             this.txtBeginNum.ErrorMessage = "";
             this.txtBeginNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBeginNum.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtBeginNum.Location = new System.Drawing.Point(343, 6);
-            this.txtBeginNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtBeginNum.Location = new System.Drawing.Point(257, 5);
             this.txtBeginNum.MaxLength = 3;
             this.txtBeginNum.MaxValue = new decimal(new int[] {
             999,
@@ -1096,7 +1034,7 @@
             0,
             0});
             this.txtBeginNum.Name = "txtBeginNum";
-            this.txtBeginNum.Size = new System.Drawing.Size(47, 25);
+            this.txtBeginNum.Size = new System.Drawing.Size(36, 21);
             this.txtBeginNum.TabIndex = 2;
             this.txtBeginNum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.txtBeginNum.TextValue = "";
@@ -1106,10 +1044,9 @@
             this.rabBinding.AutoSize = true;
             this.rabBinding.Checked = true;
             this.rabBinding.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rabBinding.Location = new System.Drawing.Point(9, 48);
-            this.rabBinding.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rabBinding.Location = new System.Drawing.Point(7, 38);
             this.rabBinding.Name = "rabBinding";
-            this.rabBinding.Size = new System.Drawing.Size(88, 19);
+            this.rabBinding.Size = new System.Drawing.Size(71, 16);
             this.rabBinding.TabIndex = 2;
             this.rabBinding.TabStop = true;
             this.rabBinding.Text = "条码模具";
@@ -1123,32 +1060,50 @@
             this.btnAdaptive.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnAdaptive.BackgroundImage")));
             this.btnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAdaptive.ForeColor = System.Drawing.Color.White;
-            this.btnAdaptive.Location = new System.Drawing.Point(16, 571);
-            this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAdaptive.Location = new System.Drawing.Point(12, 457);
             this.btnAdaptive.Name = "btnAdaptive";
-            this.btnAdaptive.Size = new System.Drawing.Size(113, 38);
+            this.btnAdaptive.Size = new System.Drawing.Size(85, 30);
             this.btnAdaptive.TabIndex = 10;
             this.btnAdaptive.Text = "自适应列宽";
             this.btnAdaptive.UseVisualStyleBackColor = false;
             this.btnAdaptive.Click += new System.EventHandler(this.btnAdaptive_Click);
             // 
-            // HighPressureFlag
+            // scbUser1
             // 
-            this.HighPressureFlag.AutoSize = true;
-            this.HighPressureFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.HighPressureFlag.Location = new System.Drawing.Point(619, 26);
-            this.HighPressureFlag.Name = "HighPressureFlag";
-            this.HighPressureFlag.Size = new System.Drawing.Size(89, 19);
-            this.HighPressureFlag.TabIndex = 21;
-            this.HighPressureFlag.Text = "高压注浆";
-            this.HighPressureFlag.UseVisualStyleBackColor = true;
+            this.scbUser1.CheckedData = null;
+            this.scbUser1.IsWorker = false;
+            this.scbUser1.Location = new System.Drawing.Point(464, 47);
+            this.scbUser1.Name = "scbUser1";
+            this.scbUser1.ShowBorderColor = false;
+            this.scbUser1.ShowMustInputAlert = false;
+            this.scbUser1.Size = new System.Drawing.Size(100, 21);
+            this.scbUser1.TabIndex = 20;
+            // 
+            // scbGMouldType
+            // 
+            this.scbGMouldType.CheckedData = null;
+            this.scbGMouldType.Location = new System.Drawing.Point(323, 47);
+            this.scbGMouldType.Name = "scbGMouldType";
+            this.scbGMouldType.ShowBorderColor = false;
+            this.scbGMouldType.ShowMustInputAlert = false;
+            this.scbGMouldType.Size = new System.Drawing.Size(100, 21);
+            this.scbGMouldType.TabIndex = 18;
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.DisplayMember = "GoodsCode";
+            this.scbGoods.Location = new System.Drawing.Point(69, 5);
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(111, 21);
+            this.scbGoods.TabIndex = 39;
             // 
             // F_PC_0102_1_1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(992, 640);
+            this.ClientSize = new System.Drawing.Size(744, 512);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.c_GroupBox1);
             this.Controls.Add(this.btnCancel);
@@ -1156,7 +1111,7 @@
             this.Controls.Add(this.btnSave);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Name = "F_PC_0102_1_1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "新建成型线";
@@ -1243,12 +1198,12 @@
         private Basics.BaseControls.C_TXT_Digital txtStandardGroutingCount;
         private Basics.BaseControls.C_Label c_Label2;
         private System.Windows.Forms.Panel panel1;
-		private Controls.SearchBox.ScbGoods scbGoods;
 		private Basics.BaseControls.C_Label lblGoods;
 		private Basics.BaseControls.C_Label lblGMouldType;
-		private Controls.SearchBox.ScbGMouldType scbGMouldType;
-        private Controls.SearchBox.ScbUser scbUser1;
         private Basics.BaseControls.C_Label c_Label3;
         private Basics.BaseControls.C_CheckBox HighPressureFlag;
+        private Controls.SearchBox.ScbUser scbUser1;
+        private Controls.SearchBox.ScbGMouldType scbGMouldType;
+        private Controls.SearchBox.ScbGoods scbGoods;
     }
 }

DK.Client/PCModule/F_PC_0104_1.Designer.cs

@@ -756,7 +756,6 @@
             this.txtGroutingLineCode.Location = new System.Drawing.Point(77, 47);
             this.txtGroutingLineCode.MaxLength = 30;
             this.txtGroutingLineCode.Name = "txtGroutingLineCode";
-            this.txtGroutingLineCode.RejectCharsPattern = "[^a-zA-Z0-9]";
             this.txtGroutingLineCode.Size = new System.Drawing.Size(120, 21);
             this.txtGroutingLineCode.TabIndex = 11;
             this.txtGroutingLineCode.TextValue = "";
@@ -987,7 +986,6 @@
             this.txtGroutingUserCode.Location = new System.Drawing.Point(657, 74);
             this.txtGroutingUserCode.MaxLength = 20;
             this.txtGroutingUserCode.Name = "txtGroutingUserCode";
-            this.txtGroutingUserCode.RejectCharsPattern = "[^a-zA-Z0-9]";
             this.txtGroutingUserCode.Size = new System.Drawing.Size(120, 21);
             this.txtGroutingUserCode.TabIndex = 24;
             this.txtGroutingUserCode.TextValue = "";

DK.Client/PCModule/F_PC_0108.Designer.cs

@@ -685,7 +685,6 @@
 			this.txtGroutingLineCode.Location = new System.Drawing.Point(77, 47);
 			this.txtGroutingLineCode.MaxLength = 30;
 			this.txtGroutingLineCode.Name = "txtGroutingLineCode";
-			this.txtGroutingLineCode.RejectCharsPattern = "[^a-zA-Z0-9]";
 			this.txtGroutingLineCode.Size = new System.Drawing.Size(120, 21);
 			this.txtGroutingLineCode.TabIndex = 7;
 			this.txtGroutingLineCode.TextValue = "";
@@ -870,7 +869,6 @@
 			this.txtGroutingUserCode.Location = new System.Drawing.Point(657, 74);
 			this.txtGroutingUserCode.MaxLength = 20;
 			this.txtGroutingUserCode.Name = "txtGroutingUserCode";
-			this.txtGroutingUserCode.RejectCharsPattern = "[^a-zA-Z0-9]";
 			this.txtGroutingUserCode.Size = new System.Drawing.Size(120, 21);
 			this.txtGroutingUserCode.TabIndex = 15;
 			this.txtGroutingUserCode.TextValue = "";

DK.Client/PCModule/F_PC_0206.cs

@@ -635,7 +635,6 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtProcedureCode.MaxLength = 20;
             this.txtProcedureCode.Name = "txtProcedureCode";
-            this.txtProcedureCode.RejectCharsPattern = "[^a-zA-Z0-9]";
             this.txtProcedureCode.Size = new System.Drawing.Size(143, 25);
             this.txtProcedureCode.TabIndex = 1;
             // 

DK.Client/PCModule/F_PC_0207.cs

@@ -328,7 +328,6 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             this.txtProcedureCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtProcedureCode.MaxLength = 20;
             this.txtProcedureCode.Name = "txtProcedureCode";
-            this.txtProcedureCode.RejectCharsPattern = "[^a-zA-Z0-9]";
             this.txtProcedureCode.Size = new System.Drawing.Size(143, 25);
             this.txtProcedureCode.TabIndex = 1;
             // 

DK.Client/PCModule/F_PC_0401.Designer.cs

@@ -270,7 +270,6 @@
             this.txtUserCode.Location = new System.Drawing.Point(72, 20);
             this.txtUserCode.MaxLength = 20;
             this.txtUserCode.Name = "txtUserCode";
-            this.txtUserCode.RejectCharsPattern = "[^a-zA-Z0-9]";
             this.txtUserCode.Size = new System.Drawing.Size(163, 21);
             this.txtUserCode.TabIndex = 1;
             this.txtUserCode.TextValue = "";

DK.Client/PCModule/F_PC_0501.Designer.cs

@@ -223,7 +223,6 @@
 			this.txtGroutingLineCode.Location = new System.Drawing.Point(77, 47);
 			this.txtGroutingLineCode.MaxLength = 30;
 			this.txtGroutingLineCode.Name = "txtGroutingLineCode";
-			this.txtGroutingLineCode.RejectCharsPattern = "[^a-zA-Z0-9]";
 			this.txtGroutingLineCode.Size = new System.Drawing.Size(120, 21);
 			this.txtGroutingLineCode.TabIndex = 8;
 			this.txtGroutingLineCode.TextValue = "";
@@ -237,7 +236,6 @@
 			this.txtFloorNo.Location = new System.Drawing.Point(298, 20);
 			this.txtFloorNo.MaxLength = 5;
 			this.txtFloorNo.Name = "txtFloorNo";
-			this.txtFloorNo.RejectCharsPattern = "[^a-zA-Z0-9]";
 			this.txtFloorNo.Size = new System.Drawing.Size(120, 21);
 			this.txtFloorNo.TabIndex = 3;
 			this.txtFloorNo.TextValue = "";

DK.Client/ReportModule/R01/M01/F_RPT_010101_1.Designer.cs

@@ -40,6 +40,10 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgvRptGroutingDaily = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.chkGCTime = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpGCTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dtpGCTimeBegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.lblGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.scbGroutingLine = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGroutingLine();
             this.lblGMouldType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -79,10 +83,6 @@
             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.chkGCTime = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpGCTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.dtpGCTimeBegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.GroutingLineCode0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GmouldtypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -105,6 +105,8 @@
             this.SCRAPTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.交坯标识 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CreateUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.CreateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.gctime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -164,6 +166,8 @@
             this.SCRAPTIME,
             this.交坯标识,
             this.DeliverTime,
+            this.MONITORCODE,
+            this.MONITORName,
             this.CreateUserCode,
             this.CreateUserName,
             this.gctime});
@@ -259,6 +263,54 @@
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
             // 
+            // chkGCTime
+            // 
+            this.chkGCTime.AutoSize = true;
+            this.chkGCTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkGCTime.Location = new System.Drawing.Point(864, 22);
+            this.chkGCTime.Name = "chkGCTime";
+            this.chkGCTime.Size = new System.Drawing.Size(96, 16);
+            this.chkGCTime.TabIndex = 40;
+            this.chkGCTime.Text = "注浆操作时间";
+            this.chkGCTime.UseVisualStyleBackColor = true;
+            this.chkGCTime.CheckedChanged += new System.EventHandler(this.chkGCTime_CheckedChanged);
+            // 
+            // c_Label5
+            // 
+            this.c_Label5.AutoSize = true;
+            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label5.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label5.Location = new System.Drawing.Point(943, 51);
+            this.c_Label5.Name = "c_Label5";
+            this.c_Label5.Size = new System.Drawing.Size(17, 12);
+            this.c_Label5.TabIndex = 42;
+            this.c_Label5.Text = "至";
+            // 
+            // dtpGCTimeEnd
+            // 
+            this.dtpGCTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.dtpGCTimeEnd.Enabled = false;
+            this.dtpGCTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpGCTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpGCTimeEnd.Location = new System.Drawing.Point(966, 47);
+            this.dtpGCTimeEnd.Name = "dtpGCTimeEnd";
+            this.dtpGCTimeEnd.ShowUpDown = true;
+            this.dtpGCTimeEnd.Size = new System.Drawing.Size(142, 21);
+            this.dtpGCTimeEnd.TabIndex = 43;
+            // 
+            // dtpGCTimeBegin
+            // 
+            this.dtpGCTimeBegin.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.dtpGCTimeBegin.Enabled = false;
+            this.dtpGCTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpGCTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpGCTimeBegin.Location = new System.Drawing.Point(966, 20);
+            this.dtpGCTimeBegin.Name = "dtpGCTimeBegin";
+            this.dtpGCTimeBegin.ShowUpDown = true;
+            this.dtpGCTimeBegin.Size = new System.Drawing.Size(142, 21);
+            this.dtpGCTimeBegin.TabIndex = 41;
+            // 
             // lblGroutingLine
             // 
             this.lblGroutingLine.AutoSize = true;
@@ -753,54 +805,6 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
-            // chkGCTime
-            // 
-            this.chkGCTime.AutoSize = true;
-            this.chkGCTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkGCTime.Location = new System.Drawing.Point(864, 22);
-            this.chkGCTime.Name = "chkGCTime";
-            this.chkGCTime.Size = new System.Drawing.Size(96, 16);
-            this.chkGCTime.TabIndex = 40;
-            this.chkGCTime.Text = "注浆操作时间";
-            this.chkGCTime.UseVisualStyleBackColor = true;
-            this.chkGCTime.CheckedChanged += new System.EventHandler(this.chkGCTime_CheckedChanged);
-            // 
-            // c_Label5
-            // 
-            this.c_Label5.AutoSize = true;
-            this.c_Label5.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label5.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label5.Location = new System.Drawing.Point(943, 51);
-            this.c_Label5.Name = "c_Label5";
-            this.c_Label5.Size = new System.Drawing.Size(17, 12);
-            this.c_Label5.TabIndex = 42;
-            this.c_Label5.Text = "至";
-            // 
-            // dtpGCTimeEnd
-            // 
-            this.dtpGCTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-            this.dtpGCTimeEnd.Enabled = false;
-            this.dtpGCTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpGCTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpGCTimeEnd.Location = new System.Drawing.Point(966, 47);
-            this.dtpGCTimeEnd.Name = "dtpGCTimeEnd";
-            this.dtpGCTimeEnd.ShowUpDown = true;
-            this.dtpGCTimeEnd.Size = new System.Drawing.Size(142, 21);
-            this.dtpGCTimeEnd.TabIndex = 43;
-            // 
-            // dtpGCTimeBegin
-            // 
-            this.dtpGCTimeBegin.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-            this.dtpGCTimeBegin.Enabled = false;
-            this.dtpGCTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpGCTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpGCTimeBegin.Location = new System.Drawing.Point(966, 20);
-            this.dtpGCTimeBegin.Name = "dtpGCTimeBegin";
-            this.dtpGCTimeBegin.ShowUpDown = true;
-            this.dtpGCTimeBegin.Size = new System.Drawing.Size(142, 21);
-            this.dtpGCTimeBegin.TabIndex = 41;
-            // 
             // GroutingLineCode0
             // 
             this.GroutingLineCode0.DataPropertyName = "GroutingLineCode";
@@ -980,17 +984,31 @@
             this.DeliverTime.Name = "DeliverTime";
             this.DeliverTime.ReadOnly = true;
             // 
+            // MONITORCODE
+            // 
+            this.MONITORCODE.DataPropertyName = "MONITORCODE";
+            this.MONITORCODE.HeaderText = "成型班长";
+            this.MONITORCODE.Name = "MONITORCODE";
+            this.MONITORCODE.ReadOnly = true;
+            // 
+            // MONITORName
+            // 
+            this.MONITORName.DataPropertyName = "MONITORName";
+            this.MONITORName.HeaderText = "班长名称";
+            this.MONITORName.Name = "MONITORName";
+            this.MONITORName.ReadOnly = true;
+            // 
             // CreateUserCode
             // 
             this.CreateUserCode.DataPropertyName = "CreateUserCode";
-            this.CreateUserCode.HeaderText = "班长工号";
+            this.CreateUserCode.HeaderText = "操作工号";
             this.CreateUserCode.Name = "CreateUserCode";
             this.CreateUserCode.ReadOnly = true;
             // 
             // CreateUserName
             // 
             this.CreateUserName.DataPropertyName = "CreateUserName";
-            this.CreateUserName.HeaderText = "成型班长";
+            this.CreateUserName.HeaderText = "操作用户";
             this.CreateUserName.Name = "CreateUserName";
             this.CreateUserName.ReadOnly = true;
             // 
@@ -1093,6 +1111,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn SCRAPTIME;
         private System.Windows.Forms.DataGridViewCheckBoxColumn 交坯标识;
         private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
         private System.Windows.Forms.DataGridViewTextBoxColumn CreateUserCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn CreateUserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn gctime;

DK.Client/ReportModule/R01/M01/F_RPT_010101_1.resx

@@ -183,6 +183,12 @@
   <metadata name="DeliverTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MONITORCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="CreateUserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R01/M01/F_RPT_010104.Designer.cs

@@ -28,87 +28,87 @@
         /// </summary>
         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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010104));
-			this.dgvGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DETAILGMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.txtRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtGroutingLineName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblGroutingLineName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtGroutingLineNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblGroutingLineNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.lblBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-			this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.txtGroutingUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.lblGroutingUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			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.lblGMouldType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.scbGMouldType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGMouldType();
-			((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).BeginInit();
-			this.gbxCondition.SuspendLayout();
-			this.tsrOperate.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// dgvGroutingLine
-			// 
-			this.dgvGroutingLine.AllowUserToAddRows = false;
-			this.dgvGroutingLine.AllowUserToDeleteRows = false;
-			this.dgvGroutingLine.AllowUserToModifyRows = true;
-			this.dgvGroutingLine.AllowUserToOrderColumns = true;
-			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvGroutingLine.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-			this.dgvGroutingLine.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010104));
+            this.dgvGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DETAILGMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BuildingNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FloorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GroutingLineNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MouldQuantity = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GMOULDSTATUSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.txtRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtGroutingLineName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblGroutingLineName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtGroutingLineNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblGroutingLineNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblFloorNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblBuildingNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.lblGMouldType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGMouldType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGMouldType();
+            this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.txtGroutingUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblGroutingUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).BeginInit();
+            this.gbxCondition.SuspendLayout();
+            this.tsrOperate.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // dgvGroutingLine
+            // 
+            this.dgvGroutingLine.AllowUserToAddRows = false;
+            this.dgvGroutingLine.AllowUserToDeleteRows = false;
+            this.dgvGroutingLine.AllowUserToModifyRows = true;
+            this.dgvGroutingLine.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGroutingLine.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvGroutingLine.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.dgvGroutingLine.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-			this.dgvGroutingLine.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-			this.dgvGroutingLine.CellHeight = 23;
-			this.dgvGroutingLine.ChildNodeColumnName = null;
-			this.dgvGroutingLine.ChildNodeColumnText = null;
-			this.dgvGroutingLine.ColumnDeep = 1;
-			this.dgvGroutingLine.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvGroutingLine.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-			this.dgvGroutingLine.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-			this.dgvGroutingLine.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dgvGroutingLine.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvGroutingLine.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvGroutingLine.CellHeight = 23;
+            this.dgvGroutingLine.ChildNodeColumnName = null;
+            this.dgvGroutingLine.ChildNodeColumnText = null;
+            this.dgvGroutingLine.ColumnDeep = 1;
+            this.dgvGroutingLine.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvGroutingLine.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvGroutingLine.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvGroutingLine.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GroutingLineID,
             this.GroutingLineCode,
             this.GroutingLineName,
@@ -126,528 +126,525 @@
             this.UserCode,
             this.GMOULDSTATUSNAME,
             this.Remarks});
-			this.dgvGroutingLine.ColumnTreeView = null;
-			this.dgvGroutingLine.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-			dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
-			dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
-			dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-			this.dgvGroutingLine.DefaultCellStyle = dataGridViewCellStyle4;
-			this.dgvGroutingLine.DynamicColumnName = "";
-			this.dgvGroutingLine.EnableHeadersVisualStyles = false;
-			this.dgvGroutingLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.dgvGroutingLine.FormatQuantityColumns = null;
-			this.dgvGroutingLine.HorizontalMergeColumn = null;
-			this.dgvGroutingLine.IsAutoCountSum = true;
-			this.dgvGroutingLine.IsAutoResizeColumns = false;
-			this.dgvGroutingLine.IsClickF12 = false;
-			this.dgvGroutingLine.IsOpenMergeCellFlag = false;
-			this.dgvGroutingLine.IsSubTotalFlag = false;
-			this.dgvGroutingLine.IsTopDeep = false;
-			this.dgvGroutingLine.Location = new System.Drawing.Point(0, 154);
-			this.dgvGroutingLine.MergeColumnNames = null;
-			this.dgvGroutingLine.MergeDetailColumnNames = null;
-			this.dgvGroutingLine.MergeDetailOnlyColumn = null;
-			this.dgvGroutingLine.MergeOnlyColumn = null;
-			this.dgvGroutingLine.MultiSelect = false;
-			this.dgvGroutingLine.Name = "dgvGroutingLine";
-			this.dgvGroutingLine.ReadOnly = true;
-			this.dgvGroutingLine.RefreshAtHscroll = false;
-			this.dgvGroutingLine.RowHeadersWidth = 50;
-			this.dgvGroutingLine.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle5;
-			this.dgvGroutingLine.RowTemplate.Height = 21;
-			this.dgvGroutingLine.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvGroutingLine.ShowEditingIcon = false;
-			this.dgvGroutingLine.Size = new System.Drawing.Size(1004, 331);
-			this.dgvGroutingLine.SortOrderColumnName = null;
-			this.dgvGroutingLine.TabIndex = 0;
-			this.dgvGroutingLine.Tag = true;
-			this.dgvGroutingLine.TotalSumColumns = null;
-			this.dgvGroutingLine.ViewRowFilter = "";
-			this.dgvGroutingLine.VirtualMode = true;
-			// 
-			// GroutingLineID
-			// 
-			this.GroutingLineID.DataPropertyName = "GroutingLineID";
-			this.GroutingLineID.HeaderText = "成型生产线ID";
-			this.GroutingLineID.Name = "GroutingLineID";
-			this.GroutingLineID.ReadOnly = true;
-			this.GroutingLineID.Visible = false;
-			// 
-			// GroutingLineCode
-			// 
-			this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
-			this.GroutingLineCode.HeaderText = "成型线编码";
-			this.GroutingLineCode.Name = "GroutingLineCode";
-			this.GroutingLineCode.ReadOnly = true;
-			// 
-			// GroutingLineName
-			// 
-			this.GroutingLineName.DataPropertyName = "GroutingLineName";
-			this.GroutingLineName.HeaderText = "成型线名称";
-			this.GroutingLineName.Name = "GroutingLineName";
-			this.GroutingLineName.ReadOnly = true;
-			// 
-			// GroutingMouldCode
-			// 
-			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-			this.GroutingMouldCode.HeaderText = "模具编号";
-			this.GroutingMouldCode.Name = "GroutingMouldCode";
-			this.GroutingMouldCode.ReadOnly = true;
-			// 
-			// GOODSCODE
-			// 
-			this.GOODSCODE.DataPropertyName = "GOODSCODE";
-			this.GOODSCODE.HeaderText = "产品编码";
-			this.GOODSCODE.Name = "GOODSCODE";
-			this.GOODSCODE.ReadOnly = true;
-			// 
-			// GoodsName
-			// 
-			this.GoodsName.DataPropertyName = "GoodsName";
-			this.GoodsName.HeaderText = "产品名称";
-			this.GoodsName.Name = "GoodsName";
-			this.GoodsName.ReadOnly = true;
-			// 
-			// GoodsSpecification
-			// 
-			this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
-			this.GoodsSpecification.HeaderText = "产品规格";
-			this.GoodsSpecification.Name = "GoodsSpecification";
-			this.GoodsSpecification.ReadOnly = true;
-			// 
-			// GroutingCount
-			// 
-			this.GroutingCount.DataPropertyName = "GroutingCount";
-			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
-			this.GroutingCount.HeaderText = "注浆次数";
-			this.GroutingCount.Name = "GroutingCount";
-			this.GroutingCount.ReadOnly = true;
-			// 
-			// DETAILGMOULDSTATUSNAME
-			// 
-			this.DETAILGMOULDSTATUSNAME.DataPropertyName = "DETAILGMOULDSTATUSNAME";
-			this.DETAILGMOULDSTATUSNAME.HeaderText = "模具状态";
-			this.DETAILGMOULDSTATUSNAME.Name = "DETAILGMOULDSTATUSNAME";
-			this.DETAILGMOULDSTATUSNAME.ReadOnly = true;
-			// 
-			// BuildingNo
-			// 
-			this.BuildingNo.DataPropertyName = "BuildingNo";
-			this.BuildingNo.HeaderText = "楼号";
-			this.BuildingNo.Name = "BuildingNo";
-			this.BuildingNo.ReadOnly = true;
-			// 
-			// FloorNo
-			// 
-			this.FloorNo.DataPropertyName = "FloorNo";
-			this.FloorNo.HeaderText = "楼层";
-			this.FloorNo.Name = "FloorNo";
-			this.FloorNo.ReadOnly = true;
-			// 
-			// GroutingLineNo
-			// 
-			this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
-			this.GroutingLineNo.HeaderText = "线号";
-			this.GroutingLineNo.Name = "GroutingLineNo";
-			this.GroutingLineNo.ReadOnly = true;
-			// 
-			// MouldQuantity
-			// 
-			this.MouldQuantity.DataPropertyName = "MouldQuantity";
-			this.MouldQuantity.HeaderText = "模具个数";
-			this.MouldQuantity.Name = "MouldQuantity";
-			this.MouldQuantity.ReadOnly = true;
-			// 
-			// GMouldTypeName
-			// 
-			this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
-			this.GMouldTypeName.HeaderText = "成型线类别";
-			this.GMouldTypeName.Name = "GMouldTypeName";
-			this.GMouldTypeName.ReadOnly = true;
-			// 
-			// UserCode
-			// 
-			this.UserCode.DataPropertyName = "UserCode";
-			this.UserCode.HeaderText = "成型工号";
-			this.UserCode.Name = "UserCode";
-			this.UserCode.ReadOnly = true;
-			// 
-			// GMOULDSTATUSNAME
-			// 
-			this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
-			this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
-			this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
-			this.GMOULDSTATUSNAME.ReadOnly = true;
-			this.GMOULDSTATUSNAME.Width = 120;
-			// 
-			// Remarks
-			// 
-			this.Remarks.DataPropertyName = "Remarks";
-			this.Remarks.HeaderText = "备注";
-			this.Remarks.Name = "Remarks";
-			this.Remarks.ReadOnly = true;
-			// 
-			// btnClearCondition
-			// 
-			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnClearCondition.BackColor = System.Drawing.Color.Gray;
-			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(913, 77);
-			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.btnClearCondition.Name = "btnClearCondition";
-			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
-			this.btnClearCondition.TabIndex = 25;
-			this.btnClearCondition.Text = "清空条件(&C)";
-			this.btnClearCondition.UseVisualStyleBackColor = false;
-			this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
-			// 
-			// btnSearch
-			// 
-			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.btnSearch.BackColor = System.Drawing.Color.Gray;
-			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(822, 77);
-			this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-			this.btnSearch.Name = "btnSearch";
-			this.btnSearch.Size = new System.Drawing.Size(85, 30);
-			this.btnSearch.TabIndex = 24;
-			this.btnSearch.Text = "查询(&Q)";
-			this.btnSearch.UseVisualStyleBackColor = false;
-			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-			// 
-			// txtRemarks
-			// 
-			this.txtRemarks.BackColor = System.Drawing.SystemColors.Window;
-			this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtRemarks.ErrorMessage = "";
-			this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtRemarks.Location = new System.Drawing.Point(619, 74);
-			this.txtRemarks.MaxLength = 500;
-			this.txtRemarks.Name = "txtRemarks";
-			this.txtRemarks.Size = new System.Drawing.Size(197, 21);
-			this.txtRemarks.TabIndex = 21;
-			// 
-			// lblRemarks
-			// 
-			this.lblRemarks.AutoSize = true;
-			this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
-			this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblRemarks.Location = new System.Drawing.Point(584, 78);
-			this.lblRemarks.Name = "lblRemarks";
-			this.lblRemarks.Size = new System.Drawing.Size(29, 12);
-			this.lblRemarks.TabIndex = 20;
-			this.lblRemarks.Text = "备注";
-			// 
-			// txtGroutingLineName
-			// 
-			this.txtGroutingLineName.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineName.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineName.ErrorMessage = "";
-			this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGroutingLineName.Location = new System.Drawing.Point(360, 47);
-			this.txtGroutingLineName.MaxLength = 50;
-			this.txtGroutingLineName.Name = "txtGroutingLineName";
-			this.txtGroutingLineName.Size = new System.Drawing.Size(179, 21);
-			this.txtGroutingLineName.TabIndex = 13;
-			// 
-			// lblGroutingLineName
-			// 
-			this.lblGroutingLineName.AutoSize = true;
-			this.lblGroutingLineName.BackColor = System.Drawing.Color.Transparent;
-			this.lblGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGroutingLineName.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGroutingLineName.Location = new System.Drawing.Point(289, 50);
-			this.lblGroutingLineName.Name = "lblGroutingLineName";
-			this.lblGroutingLineName.Size = new System.Drawing.Size(65, 12);
-			this.lblGroutingLineName.TabIndex = 12;
-			this.lblGroutingLineName.Text = "成型线名称";
-			// 
-			// txtGroutingLineCode
-			// 
-			this.txtGroutingLineCode.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineCode.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGroutingLineCode.ErrorMessage = "";
-			this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGroutingLineCode.Location = new System.Drawing.Point(77, 47);
-			this.txtGroutingLineCode.MaxLength = 30;
-			this.txtGroutingLineCode.Name = "txtGroutingLineCode";
-			this.txtGroutingLineCode.RejectCharsPattern = "[^a-zA-Z0-9]";
-			this.txtGroutingLineCode.Size = new System.Drawing.Size(184, 21);
-			this.txtGroutingLineCode.TabIndex = 11;
-			this.txtGroutingLineCode.TextValue = "";
-			// 
-			// lblGroutingLineCode
-			// 
-			this.lblGroutingLineCode.AutoSize = true;
-			this.lblGroutingLineCode.BackColor = System.Drawing.Color.Transparent;
-			this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGroutingLineCode.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGroutingLineCode.Location = new System.Drawing.Point(6, 50);
-			this.lblGroutingLineCode.Name = "lblGroutingLineCode";
-			this.lblGroutingLineCode.Size = new System.Drawing.Size(65, 12);
-			this.lblGroutingLineCode.TabIndex = 10;
-			this.lblGroutingLineCode.Text = "成型线编码";
-			// 
-			// txtGroutingLineNo
-			// 
-			this.txtGroutingLineNo.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineNo.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingLineNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGroutingLineNo.ErrorMessage = "";
-			this.txtGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGroutingLineNo.Location = new System.Drawing.Point(619, 20);
-			this.txtGroutingLineNo.MaxLength = 10;
-			this.txtGroutingLineNo.Name = "txtGroutingLineNo";
-			this.txtGroutingLineNo.Size = new System.Drawing.Size(197, 21);
-			this.txtGroutingLineNo.TabIndex = 5;
-			// 
-			// lblGroutingLineNo
-			// 
-			this.lblGroutingLineNo.AutoSize = true;
-			this.lblGroutingLineNo.BackColor = System.Drawing.Color.Transparent;
-			this.lblGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGroutingLineNo.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGroutingLineNo.Location = new System.Drawing.Point(584, 23);
-			this.lblGroutingLineNo.Name = "lblGroutingLineNo";
-			this.lblGroutingLineNo.Size = new System.Drawing.Size(29, 12);
-			this.lblGroutingLineNo.TabIndex = 4;
-			this.lblGroutingLineNo.Text = "线号";
-			// 
-			// txtFloorNo
-			// 
-			this.txtFloorNo.BackColor = System.Drawing.SystemColors.Window;
-			this.txtFloorNo.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtFloorNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtFloorNo.ErrorMessage = "";
-			this.txtFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtFloorNo.Location = new System.Drawing.Point(360, 20);
-			this.txtFloorNo.MaxLength = 5;
-			this.txtFloorNo.Name = "txtFloorNo";
-			this.txtFloorNo.RejectCharsPattern = "[^a-zA-Z0-9]";
-			this.txtFloorNo.Size = new System.Drawing.Size(179, 21);
-			this.txtFloorNo.TabIndex = 3;
-			this.txtFloorNo.TextValue = "";
-			// 
-			// lblFloorNo
-			// 
-			this.lblFloorNo.AutoSize = true;
-			this.lblFloorNo.BackColor = System.Drawing.Color.Transparent;
-			this.lblFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblFloorNo.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblFloorNo.Location = new System.Drawing.Point(325, 23);
-			this.lblFloorNo.Name = "lblFloorNo";
-			this.lblFloorNo.Size = new System.Drawing.Size(29, 12);
-			this.lblFloorNo.TabIndex = 2;
-			this.lblFloorNo.Text = "楼层";
-			// 
-			// txtBuildingNo
-			// 
-			this.txtBuildingNo.BackColor = System.Drawing.SystemColors.Window;
-			this.txtBuildingNo.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtBuildingNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtBuildingNo.ErrorMessage = "";
-			this.txtBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtBuildingNo.Location = new System.Drawing.Point(77, 20);
-			this.txtBuildingNo.MaxLength = 10;
-			this.txtBuildingNo.Name = "txtBuildingNo";
-			this.txtBuildingNo.Size = new System.Drawing.Size(184, 21);
-			this.txtBuildingNo.TabIndex = 1;
-			// 
-			// lblBuildingNo
-			// 
-			this.lblBuildingNo.AutoSize = true;
-			this.lblBuildingNo.BackColor = System.Drawing.Color.Transparent;
-			this.lblBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblBuildingNo.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblBuildingNo.Location = new System.Drawing.Point(42, 23);
-			this.lblBuildingNo.Name = "lblBuildingNo";
-			this.lblBuildingNo.Size = new System.Drawing.Size(29, 12);
-			this.lblBuildingNo.TabIndex = 0;
-			this.lblBuildingNo.Text = "楼号";
-			// 
-			// gbxCondition
-			// 
-			this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.dgvGroutingLine.ColumnTreeView = null;
+            this.dgvGroutingLine.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGroutingLine.DefaultCellStyle = dataGridViewCellStyle4;
+            this.dgvGroutingLine.DynamicColumnName = "";
+            this.dgvGroutingLine.EnableHeadersVisualStyles = false;
+            this.dgvGroutingLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvGroutingLine.FormatQuantityColumns = null;
+            this.dgvGroutingLine.HorizontalMergeColumn = null;
+            this.dgvGroutingLine.IsAutoCountSum = true;
+            this.dgvGroutingLine.IsAutoResizeColumns = false;
+            this.dgvGroutingLine.IsClickF12 = false;
+            this.dgvGroutingLine.IsOpenMergeCellFlag = false;
+            this.dgvGroutingLine.IsSubTotalFlag = false;
+            this.dgvGroutingLine.IsTopDeep = false;
+            this.dgvGroutingLine.Location = new System.Drawing.Point(0, 154);
+            this.dgvGroutingLine.MergeColumnNames = null;
+            this.dgvGroutingLine.MergeDetailColumnNames = null;
+            this.dgvGroutingLine.MergeDetailOnlyColumn = null;
+            this.dgvGroutingLine.MergeOnlyColumn = null;
+            this.dgvGroutingLine.MultiSelect = false;
+            this.dgvGroutingLine.Name = "dgvGroutingLine";
+            this.dgvGroutingLine.ReadOnly = true;
+            this.dgvGroutingLine.RefreshAtHscroll = false;
+            this.dgvGroutingLine.RowHeadersWidth = 50;
+            this.dgvGroutingLine.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            this.dgvGroutingLine.RowTemplate.Height = 21;
+            this.dgvGroutingLine.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvGroutingLine.ShowEditingIcon = false;
+            this.dgvGroutingLine.Size = new System.Drawing.Size(1004, 331);
+            this.dgvGroutingLine.SortOrderColumnName = null;
+            this.dgvGroutingLine.TabIndex = 0;
+            this.dgvGroutingLine.Tag = true;
+            this.dgvGroutingLine.TotalSumColumns = null;
+            this.dgvGroutingLine.ViewRowFilter = "";
+            this.dgvGroutingLine.VirtualMode = true;
+            // 
+            // GroutingLineID
+            // 
+            this.GroutingLineID.DataPropertyName = "GroutingLineID";
+            this.GroutingLineID.HeaderText = "成型生产线ID";
+            this.GroutingLineID.Name = "GroutingLineID";
+            this.GroutingLineID.ReadOnly = true;
+            this.GroutingLineID.Visible = false;
+            // 
+            // GroutingLineCode
+            // 
+            this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
+            this.GroutingLineCode.HeaderText = "成型线编码";
+            this.GroutingLineCode.Name = "GroutingLineCode";
+            this.GroutingLineCode.ReadOnly = true;
+            // 
+            // GroutingLineName
+            // 
+            this.GroutingLineName.DataPropertyName = "GroutingLineName";
+            this.GroutingLineName.HeaderText = "成型线名称";
+            this.GroutingLineName.Name = "GroutingLineName";
+            this.GroutingLineName.ReadOnly = true;
+            // 
+            // GroutingMouldCode
+            // 
+            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+            this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.Name = "GroutingMouldCode";
+            this.GroutingMouldCode.ReadOnly = true;
+            // 
+            // GOODSCODE
+            // 
+            this.GOODSCODE.DataPropertyName = "GOODSCODE";
+            this.GOODSCODE.HeaderText = "产品编码";
+            this.GOODSCODE.Name = "GOODSCODE";
+            this.GOODSCODE.ReadOnly = true;
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
+            // 
+            // GoodsSpecification
+            // 
+            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
+            this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.Name = "GoodsSpecification";
+            this.GoodsSpecification.ReadOnly = true;
+            // 
+            // GroutingCount
+            // 
+            this.GroutingCount.DataPropertyName = "GroutingCount";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
+            this.GroutingCount.HeaderText = "注浆次数";
+            this.GroutingCount.Name = "GroutingCount";
+            this.GroutingCount.ReadOnly = true;
+            // 
+            // DETAILGMOULDSTATUSNAME
+            // 
+            this.DETAILGMOULDSTATUSNAME.DataPropertyName = "DETAILGMOULDSTATUSNAME";
+            this.DETAILGMOULDSTATUSNAME.HeaderText = "模具状态";
+            this.DETAILGMOULDSTATUSNAME.Name = "DETAILGMOULDSTATUSNAME";
+            this.DETAILGMOULDSTATUSNAME.ReadOnly = true;
+            // 
+            // BuildingNo
+            // 
+            this.BuildingNo.DataPropertyName = "BuildingNo";
+            this.BuildingNo.HeaderText = "楼号";
+            this.BuildingNo.Name = "BuildingNo";
+            this.BuildingNo.ReadOnly = true;
+            // 
+            // FloorNo
+            // 
+            this.FloorNo.DataPropertyName = "FloorNo";
+            this.FloorNo.HeaderText = "楼层";
+            this.FloorNo.Name = "FloorNo";
+            this.FloorNo.ReadOnly = true;
+            // 
+            // GroutingLineNo
+            // 
+            this.GroutingLineNo.DataPropertyName = "GroutingLineNo";
+            this.GroutingLineNo.HeaderText = "线号";
+            this.GroutingLineNo.Name = "GroutingLineNo";
+            this.GroutingLineNo.ReadOnly = true;
+            // 
+            // MouldQuantity
+            // 
+            this.MouldQuantity.DataPropertyName = "MouldQuantity";
+            this.MouldQuantity.HeaderText = "模具个数";
+            this.MouldQuantity.Name = "MouldQuantity";
+            this.MouldQuantity.ReadOnly = true;
+            // 
+            // GMouldTypeName
+            // 
+            this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
+            this.GMouldTypeName.HeaderText = "成型线类别";
+            this.GMouldTypeName.Name = "GMouldTypeName";
+            this.GMouldTypeName.ReadOnly = true;
+            // 
+            // UserCode
+            // 
+            this.UserCode.DataPropertyName = "UserCode";
+            this.UserCode.HeaderText = "成型工号";
+            this.UserCode.Name = "UserCode";
+            this.UserCode.ReadOnly = true;
+            // 
+            // GMOULDSTATUSNAME
+            // 
+            this.GMOULDSTATUSNAME.DataPropertyName = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
+            this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
+            this.GMOULDSTATUSNAME.ReadOnly = true;
+            this.GMOULDSTATUSNAME.Width = 120;
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.Name = "Remarks";
+            this.Remarks.ReadOnly = true;
+            // 
+            // btnClearCondition
+            // 
+            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClearCondition.BackColor = System.Drawing.Color.Gray;
+            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(913, 77);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnClearCondition.Name = "btnClearCondition";
+            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.TabIndex = 25;
+            this.btnClearCondition.Text = "清空条件(&C)";
+            this.btnClearCondition.UseVisualStyleBackColor = false;
+            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.Gray;
+            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(822, 77);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.TabIndex = 24;
+            this.btnSearch.Text = "查询(&Q)";
+            this.btnSearch.UseVisualStyleBackColor = false;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // txtRemarks
+            // 
+            this.txtRemarks.BackColor = System.Drawing.SystemColors.Window;
+            this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtRemarks.ErrorMessage = "";
+            this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtRemarks.Location = new System.Drawing.Point(619, 74);
+            this.txtRemarks.MaxLength = 500;
+            this.txtRemarks.Name = "txtRemarks";
+            this.txtRemarks.Size = new System.Drawing.Size(197, 21);
+            this.txtRemarks.TabIndex = 21;
+            // 
+            // lblRemarks
+            // 
+            this.lblRemarks.AutoSize = true;
+            this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
+            this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblRemarks.Location = new System.Drawing.Point(584, 78);
+            this.lblRemarks.Name = "lblRemarks";
+            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
+            this.lblRemarks.TabIndex = 20;
+            this.lblRemarks.Text = "备注";
+            // 
+            // txtGroutingLineName
+            // 
+            this.txtGroutingLineName.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineName.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineName.ErrorMessage = "";
+            this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingLineName.Location = new System.Drawing.Point(360, 47);
+            this.txtGroutingLineName.MaxLength = 50;
+            this.txtGroutingLineName.Name = "txtGroutingLineName";
+            this.txtGroutingLineName.Size = new System.Drawing.Size(179, 21);
+            this.txtGroutingLineName.TabIndex = 13;
+            // 
+            // lblGroutingLineName
+            // 
+            this.lblGroutingLineName.AutoSize = true;
+            this.lblGroutingLineName.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingLineName.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingLineName.Location = new System.Drawing.Point(289, 50);
+            this.lblGroutingLineName.Name = "lblGroutingLineName";
+            this.lblGroutingLineName.Size = new System.Drawing.Size(65, 12);
+            this.lblGroutingLineName.TabIndex = 12;
+            this.lblGroutingLineName.Text = "成型线名称";
+            // 
+            // txtGroutingLineCode
+            // 
+            this.txtGroutingLineCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGroutingLineCode.ErrorMessage = "";
+            this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(77, 47);
+            this.txtGroutingLineCode.MaxLength = 30;
+            this.txtGroutingLineCode.Name = "txtGroutingLineCode";
+            this.txtGroutingLineCode.RejectCharsPattern = "";
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(184, 21);
+            this.txtGroutingLineCode.TabIndex = 11;
+            this.txtGroutingLineCode.TextValue = "";
+            // 
+            // lblGroutingLineCode
+            // 
+            this.lblGroutingLineCode.AutoSize = true;
+            this.lblGroutingLineCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingLineCode.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingLineCode.Location = new System.Drawing.Point(6, 50);
+            this.lblGroutingLineCode.Name = "lblGroutingLineCode";
+            this.lblGroutingLineCode.Size = new System.Drawing.Size(65, 12);
+            this.lblGroutingLineCode.TabIndex = 10;
+            this.lblGroutingLineCode.Text = "成型线编码";
+            // 
+            // txtGroutingLineNo
+            // 
+            this.txtGroutingLineNo.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineNo.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGroutingLineNo.ErrorMessage = "";
+            this.txtGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingLineNo.Location = new System.Drawing.Point(619, 20);
+            this.txtGroutingLineNo.MaxLength = 10;
+            this.txtGroutingLineNo.Name = "txtGroutingLineNo";
+            this.txtGroutingLineNo.Size = new System.Drawing.Size(197, 21);
+            this.txtGroutingLineNo.TabIndex = 5;
+            // 
+            // lblGroutingLineNo
+            // 
+            this.lblGroutingLineNo.AutoSize = true;
+            this.lblGroutingLineNo.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingLineNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingLineNo.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingLineNo.Location = new System.Drawing.Point(584, 23);
+            this.lblGroutingLineNo.Name = "lblGroutingLineNo";
+            this.lblGroutingLineNo.Size = new System.Drawing.Size(29, 12);
+            this.lblGroutingLineNo.TabIndex = 4;
+            this.lblGroutingLineNo.Text = "线号";
+            // 
+            // txtFloorNo
+            // 
+            this.txtFloorNo.BackColor = System.Drawing.SystemColors.Window;
+            this.txtFloorNo.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtFloorNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtFloorNo.ErrorMessage = "";
+            this.txtFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtFloorNo.Location = new System.Drawing.Point(360, 20);
+            this.txtFloorNo.MaxLength = 5;
+            this.txtFloorNo.Name = "txtFloorNo";
+            this.txtFloorNo.Size = new System.Drawing.Size(179, 21);
+            this.txtFloorNo.TabIndex = 3;
+            this.txtFloorNo.TextValue = "";
+            // 
+            // lblFloorNo
+            // 
+            this.lblFloorNo.AutoSize = true;
+            this.lblFloorNo.BackColor = System.Drawing.Color.Transparent;
+            this.lblFloorNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblFloorNo.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblFloorNo.Location = new System.Drawing.Point(325, 23);
+            this.lblFloorNo.Name = "lblFloorNo";
+            this.lblFloorNo.Size = new System.Drawing.Size(29, 12);
+            this.lblFloorNo.TabIndex = 2;
+            this.lblFloorNo.Text = "楼层";
+            // 
+            // txtBuildingNo
+            // 
+            this.txtBuildingNo.BackColor = System.Drawing.SystemColors.Window;
+            this.txtBuildingNo.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtBuildingNo.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtBuildingNo.ErrorMessage = "";
+            this.txtBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtBuildingNo.Location = new System.Drawing.Point(77, 20);
+            this.txtBuildingNo.MaxLength = 10;
+            this.txtBuildingNo.Name = "txtBuildingNo";
+            this.txtBuildingNo.Size = new System.Drawing.Size(184, 21);
+            this.txtBuildingNo.TabIndex = 1;
+            // 
+            // lblBuildingNo
+            // 
+            this.lblBuildingNo.AutoSize = true;
+            this.lblBuildingNo.BackColor = System.Drawing.Color.Transparent;
+            this.lblBuildingNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblBuildingNo.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblBuildingNo.Location = new System.Drawing.Point(42, 23);
+            this.lblBuildingNo.Name = "lblBuildingNo";
+            this.lblBuildingNo.Size = new System.Drawing.Size(29, 12);
+            this.lblBuildingNo.TabIndex = 0;
+            this.lblBuildingNo.Text = "楼号";
+            // 
+            // gbxCondition
+            // 
+            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | 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.lblGMouldType);
-			this.gbxCondition.Controls.Add(this.scbGMouldType);
-			this.gbxCondition.Controls.Add(this.lblBuildingNo);
-			this.gbxCondition.Controls.Add(this.lblGroutingLineCode);
-			this.gbxCondition.Controls.Add(this.btnClearCondition);
-			this.gbxCondition.Controls.Add(this.btnSearch);
-			this.gbxCondition.Controls.Add(this.txtBuildingNo);
-			this.gbxCondition.Controls.Add(this.txtGoodsCode);
-			this.gbxCondition.Controls.Add(this.txtGroutingUserCode);
-			this.gbxCondition.Controls.Add(this.txtGroutingLineCode);
-			this.gbxCondition.Controls.Add(this.txtFloorNo);
-			this.gbxCondition.Controls.Add(this.lblFloorNo);
-			this.gbxCondition.Controls.Add(this.c_Label1);
-			this.gbxCondition.Controls.Add(this.lblGroutingUserCode);
-			this.gbxCondition.Controls.Add(this.lblGroutingLineNo);
-			this.gbxCondition.Controls.Add(this.txtGroutingLineNo);
-			this.gbxCondition.Controls.Add(this.txtRemarks);
-			this.gbxCondition.Controls.Add(this.lblRemarks);
-			this.gbxCondition.Controls.Add(this.lblGroutingLineName);
-			this.gbxCondition.Controls.Add(this.txtGroutingLineName);
-			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.gbxCondition.IsMustInput = false;
-			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
-			this.gbxCondition.Name = "gbxCondition";
-			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(1004, 112);
-			this.gbxCondition.TabIndex = 1;
-			this.gbxCondition.TabStop = false;
-			this.gbxCondition.Text = "查询条件 ▼";
-			// 
-			// txtGoodsCode
-			// 
-			this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGoodsCode.ErrorMessage = "";
-			this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGoodsCode.Location = new System.Drawing.Point(360, 74);
-			this.txtGoodsCode.MaxLength = 20;
-			this.txtGoodsCode.Name = "txtGoodsCode";
-			this.txtGoodsCode.RejectCharsPattern = "[^a-zA-Z0-9]";
-			this.txtGoodsCode.Size = new System.Drawing.Size(179, 21);
-			this.txtGoodsCode.TabIndex = 11;
-			this.txtGoodsCode.TextValue = "";
-			// 
-			// txtGroutingUserCode
-			// 
-			this.txtGroutingUserCode.BackColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtGroutingUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtGroutingUserCode.ErrorMessage = "";
-			this.txtGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtGroutingUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGroutingUserCode.Location = new System.Drawing.Point(77, 74);
-			this.txtGroutingUserCode.MaxLength = 20;
-			this.txtGroutingUserCode.Name = "txtGroutingUserCode";
-			this.txtGroutingUserCode.RejectCharsPattern = "[^a-zA-Z0-9]";
-			this.txtGroutingUserCode.Size = new System.Drawing.Size(184, 21);
-			this.txtGroutingUserCode.TabIndex = 11;
-			this.txtGroutingUserCode.TextValue = "";
-			// 
-			// c_Label1
-			// 
-			this.c_Label1.AutoSize = true;
-			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(301, 78);
-			this.c_Label1.Name = "c_Label1";
-			this.c_Label1.Size = new System.Drawing.Size(53, 12);
-			this.c_Label1.TabIndex = 4;
-			this.c_Label1.Text = "产品编码";
-			// 
-			// lblGroutingUserCode
-			// 
-			this.lblGroutingUserCode.AutoSize = true;
-			this.lblGroutingUserCode.BackColor = System.Drawing.Color.Transparent;
-			this.lblGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGroutingUserCode.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGroutingUserCode.Location = new System.Drawing.Point(18, 78);
-			this.lblGroutingUserCode.Name = "lblGroutingUserCode";
-			this.lblGroutingUserCode.Size = new System.Drawing.Size(53, 12);
-			this.lblGroutingUserCode.TabIndex = 4;
-			this.lblGroutingUserCode.Text = "成型工号";
-			// 
-			// tsrOperate
-			// 
-			this.tsrOperate.AutoSize = false;
-			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+            this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+            this.gbxCondition.Controls.Add(this.lblGMouldType);
+            this.gbxCondition.Controls.Add(this.scbGMouldType);
+            this.gbxCondition.Controls.Add(this.lblBuildingNo);
+            this.gbxCondition.Controls.Add(this.lblGroutingLineCode);
+            this.gbxCondition.Controls.Add(this.btnClearCondition);
+            this.gbxCondition.Controls.Add(this.btnSearch);
+            this.gbxCondition.Controls.Add(this.txtBuildingNo);
+            this.gbxCondition.Controls.Add(this.txtGoodsCode);
+            this.gbxCondition.Controls.Add(this.txtGroutingUserCode);
+            this.gbxCondition.Controls.Add(this.txtGroutingLineCode);
+            this.gbxCondition.Controls.Add(this.txtFloorNo);
+            this.gbxCondition.Controls.Add(this.lblFloorNo);
+            this.gbxCondition.Controls.Add(this.c_Label1);
+            this.gbxCondition.Controls.Add(this.lblGroutingUserCode);
+            this.gbxCondition.Controls.Add(this.lblGroutingLineNo);
+            this.gbxCondition.Controls.Add(this.txtGroutingLineNo);
+            this.gbxCondition.Controls.Add(this.txtRemarks);
+            this.gbxCondition.Controls.Add(this.lblRemarks);
+            this.gbxCondition.Controls.Add(this.lblGroutingLineName);
+            this.gbxCondition.Controls.Add(this.txtGroutingLineName);
+            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.gbxCondition.IsMustInput = false;
+            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Size = new System.Drawing.Size(1004, 112);
+            this.gbxCondition.TabIndex = 1;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // lblGMouldType
+            // 
+            this.lblGMouldType.AutoSize = true;
+            this.lblGMouldType.BackColor = System.Drawing.Color.Transparent;
+            this.lblGMouldType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGMouldType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGMouldType.Location = new System.Drawing.Point(548, 50);
+            this.lblGMouldType.Name = "lblGMouldType";
+            this.lblGMouldType.Size = new System.Drawing.Size(65, 12);
+            this.lblGMouldType.TabIndex = 39;
+            this.lblGMouldType.Text = "成型线类型";
+            // 
+            // scbGMouldType
+            // 
+            this.scbGMouldType.CheckedData = null;
+            this.scbGMouldType.Location = new System.Drawing.Point(619, 47);
+            this.scbGMouldType.Name = "scbGMouldType";
+            this.scbGMouldType.Size = new System.Drawing.Size(197, 21);
+            this.scbGMouldType.TabIndex = 38;
+            // 
+            // txtGoodsCode
+            // 
+            this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGoodsCode.ErrorMessage = "";
+            this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGoodsCode.Location = new System.Drawing.Point(360, 74);
+            this.txtGoodsCode.MaxLength = 20;
+            this.txtGoodsCode.Name = "txtGoodsCode";
+            this.txtGoodsCode.Size = new System.Drawing.Size(179, 21);
+            this.txtGoodsCode.TabIndex = 11;
+            this.txtGoodsCode.TextValue = "";
+            // 
+            // txtGroutingUserCode
+            // 
+            this.txtGroutingUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingUserCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGroutingUserCode.ErrorMessage = "";
+            this.txtGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingUserCode.Location = new System.Drawing.Point(77, 74);
+            this.txtGroutingUserCode.MaxLength = 20;
+            this.txtGroutingUserCode.Name = "txtGroutingUserCode";
+            this.txtGroutingUserCode.Size = new System.Drawing.Size(184, 21);
+            this.txtGroutingUserCode.TabIndex = 11;
+            this.txtGroutingUserCode.TextValue = "";
+            // 
+            // c_Label1
+            // 
+            this.c_Label1.AutoSize = true;
+            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(301, 78);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.TabIndex = 4;
+            this.c_Label1.Text = "产品编码";
+            // 
+            // lblGroutingUserCode
+            // 
+            this.lblGroutingUserCode.AutoSize = true;
+            this.lblGroutingUserCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingUserCode.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingUserCode.Location = new System.Drawing.Point(18, 78);
+            this.lblGroutingUserCode.Name = "lblGroutingUserCode";
+            this.lblGroutingUserCode.Size = new System.Drawing.Size(53, 12);
+            this.lblGroutingUserCode.TabIndex = 4;
+            this.lblGroutingUserCode.Text = "成型工号";
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnAdaptive,
             this.tsbtnClose});
-			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-			this.tsrOperate.Name = "tsrOperate";
-			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-			this.tsrOperate.ShowItemToolTips = false;
-			this.tsrOperate.Size = new System.Drawing.Size(1016, 35);
-			this.tsrOperate.TabIndex = 106;
-			this.tsrOperate.Text = "toolStrip1";
-			// 
-			// tsbtnAdaptive
-			// 
-			this.tsbtnAdaptive.AutoSize = false;
-			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-			// 
-			// tsbtnClose
-			// 
-			this.tsbtnClose.AutoSize = false;
-			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnClose.Name = "tsbtnClose";
-			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnClose.Text = "关闭(&X)";
-			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-			// 
-			// lblGMouldType
-			// 
-			this.lblGMouldType.AutoSize = true;
-			this.lblGMouldType.BackColor = System.Drawing.Color.Transparent;
-			this.lblGMouldType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGMouldType.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGMouldType.Location = new System.Drawing.Point(548, 50);
-			this.lblGMouldType.Name = "lblGMouldType";
-			this.lblGMouldType.Size = new System.Drawing.Size(65, 12);
-			this.lblGMouldType.TabIndex = 39;
-			this.lblGMouldType.Text = "成型线类型";
-			// 
-			// scbGMouldType
-			// 
-			this.scbGMouldType.CheckedData = null;
-			this.scbGMouldType.Location = new System.Drawing.Point(619, 47);
-			this.scbGMouldType.Name = "scbGMouldType";
-			this.scbGMouldType.Size = new System.Drawing.Size(197, 21);
-			this.scbGMouldType.TabIndex = 38;
-			// 
-			// F_RPT_010104
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1016, 486);
-			this.Controls.Add(this.dgvGroutingLine);
-			this.Controls.Add(this.tsrOperate);
-			this.Controls.Add(this.gbxCondition);
-			this.Name = "F_RPT_010104";
-			this.Text = "F_RPT_010104";
-			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010104_FormClosed);
-			this.Load += new System.EventHandler(this.F_RPT_010104_Load);
-			((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).EndInit();
-			this.gbxCondition.ResumeLayout(false);
-			this.gbxCondition.PerformLayout();
-			this.tsrOperate.ResumeLayout(false);
-			this.tsrOperate.PerformLayout();
-			this.ResumeLayout(false);
+            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+            this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+            this.tsrOperate.ShowItemToolTips = false;
+            this.tsrOperate.Size = new System.Drawing.Size(1016, 35);
+            this.tsrOperate.TabIndex = 106;
+            this.tsrOperate.Text = "toolStrip1";
+            // 
+            // tsbtnAdaptive
+            // 
+            this.tsbtnAdaptive.AutoSize = false;
+            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+            // 
+            // tsbtnClose
+            // 
+            this.tsbtnClose.AutoSize = false;
+            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClose.Name = "tsbtnClose";
+            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClose.Text = "关闭(&X)";
+            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+            // 
+            // F_RPT_010104
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1016, 486);
+            this.Controls.Add(this.dgvGroutingLine);
+            this.Controls.Add(this.tsrOperate);
+            this.Controls.Add(this.gbxCondition);
+            this.Name = "F_RPT_010104";
+            this.Text = "F_RPT_010104";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010104_FormClosed);
+            this.Load += new System.EventHandler(this.F_RPT_010104_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLine)).EndInit();
+            this.gbxCondition.ResumeLayout(false);
+            this.gbxCondition.PerformLayout();
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            this.ResumeLayout(false);
 
         }
 

DK.Client/ReportModule/R03/M01/F_RPT_030105.Designer.cs

@@ -32,7 +32,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -40,6 +39,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
@@ -53,15 +53,6 @@
             this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
             this.dkproductionLineSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkproductionLineSearchBox();
             this.dgvReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.productionlinename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.InCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ProcedureId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colgoodsid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.coluserid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tblReportModule = new System.Windows.Forms.TabControl();
             this.tapReportModule = new System.Windows.Forms.TabPage();
             this.tapReportModuleDetail = new System.Windows.Forms.TabPage();
@@ -107,6 +98,17 @@
             this.UpdateUserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UpdateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.productionlinename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Usercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGoodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.InCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGoodsTypeID2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGoodsTypeCode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colgoodsid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.coluserid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).BeginInit();
@@ -328,10 +330,12 @@
             this.productionlinename,
             this.procedurename,
             this.Usercode,
-            this.Goodstypename,
+            this.colGoodstypename2,
             this.Goodscode,
             this.InCount,
             this.ProcedureId,
+            this.colGoodsTypeID2,
+            this.colGoodsTypeCode2,
             this.colgoodsid,
             this.coluserid});
             this.dgvReportModule.ColumnTreeView = null;
@@ -372,80 +376,6 @@
             this.dgvReportModule.ViewRowFilter = "";
             this.dgvReportModule.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvReportModule_CellDoubleClick);
             // 
-            // productionlinename
-            // 
-            this.productionlinename.DataPropertyName = "productionlinename";
-            this.productionlinename.HeaderText = "生产线";
-            this.productionlinename.Name = "productionlinename";
-            this.productionlinename.ReadOnly = true;
-            this.productionlinename.Width = 150;
-            // 
-            // procedurename
-            // 
-            this.procedurename.DataPropertyName = "procedurename";
-            this.procedurename.HeaderText = "完成工序";
-            this.procedurename.Name = "procedurename";
-            this.procedurename.ReadOnly = true;
-            this.procedurename.Width = 120;
-            // 
-            // Usercode
-            // 
-            this.Usercode.DataPropertyName = "Usercode";
-            this.Usercode.HeaderText = "生产工号";
-            this.Usercode.Name = "Usercode";
-            this.Usercode.ReadOnly = true;
-            this.Usercode.Width = 120;
-            // 
-            // Goodstypename
-            // 
-            this.Goodstypename.DataPropertyName = "Goodstypename";
-            this.Goodstypename.HeaderText = "产品类别";
-            this.Goodstypename.Name = "Goodstypename";
-            this.Goodstypename.ReadOnly = true;
-            this.Goodstypename.Width = 120;
-            // 
-            // Goodscode
-            // 
-            this.Goodscode.DataPropertyName = "Goodscode";
-            this.Goodscode.HeaderText = "产品编码";
-            this.Goodscode.Name = "Goodscode";
-            this.Goodscode.ReadOnly = true;
-            this.Goodscode.Width = 120;
-            // 
-            // InCount
-            // 
-            this.InCount.DataPropertyName = "InCount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.InCount.DefaultCellStyle = dataGridViewCellStyle3;
-            this.InCount.HeaderText = "产量";
-            this.InCount.Name = "InCount";
-            this.InCount.ReadOnly = true;
-            this.InCount.Width = 120;
-            // 
-            // ProcedureId
-            // 
-            this.ProcedureId.DataPropertyName = "ProcedureId";
-            this.ProcedureId.HeaderText = "ProcedureId";
-            this.ProcedureId.Name = "ProcedureId";
-            this.ProcedureId.ReadOnly = true;
-            this.ProcedureId.Visible = false;
-            // 
-            // colgoodsid
-            // 
-            this.colgoodsid.DataPropertyName = "goodsid";
-            this.colgoodsid.HeaderText = "goodsid";
-            this.colgoodsid.Name = "colgoodsid";
-            this.colgoodsid.ReadOnly = true;
-            this.colgoodsid.Visible = false;
-            // 
-            // coluserid
-            // 
-            this.coluserid.DataPropertyName = "userid";
-            this.coluserid.HeaderText = "userid";
-            this.coluserid.Name = "coluserid";
-            this.coluserid.ReadOnly = true;
-            this.coluserid.Visible = false;
-            // 
             // tblReportModule
             // 
             this.tblReportModule.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -919,6 +849,97 @@
             this.Remarks.ReadOnly = true;
             this.Remarks.Visible = false;
             // 
+            // productionlinename
+            // 
+            this.productionlinename.DataPropertyName = "productionlinename";
+            this.productionlinename.HeaderText = "生产线";
+            this.productionlinename.Name = "productionlinename";
+            this.productionlinename.ReadOnly = true;
+            this.productionlinename.Width = 150;
+            // 
+            // procedurename
+            // 
+            this.procedurename.DataPropertyName = "procedurename";
+            this.procedurename.HeaderText = "完成工序";
+            this.procedurename.Name = "procedurename";
+            this.procedurename.ReadOnly = true;
+            this.procedurename.Width = 120;
+            // 
+            // Usercode
+            // 
+            this.Usercode.DataPropertyName = "Usercode";
+            this.Usercode.HeaderText = "生产工号";
+            this.Usercode.Name = "Usercode";
+            this.Usercode.ReadOnly = true;
+            this.Usercode.Visible = false;
+            this.Usercode.Width = 120;
+            // 
+            // colGoodstypename2
+            // 
+            this.colGoodstypename2.DataPropertyName = "Goodstypename2";
+            this.colGoodstypename2.HeaderText = "产品类别";
+            this.colGoodstypename2.Name = "colGoodstypename2";
+            this.colGoodstypename2.ReadOnly = true;
+            this.colGoodstypename2.Width = 120;
+            // 
+            // Goodscode
+            // 
+            this.Goodscode.DataPropertyName = "Goodscode";
+            this.Goodscode.HeaderText = "产品编码";
+            this.Goodscode.Name = "Goodscode";
+            this.Goodscode.ReadOnly = true;
+            this.Goodscode.Width = 120;
+            // 
+            // InCount
+            // 
+            this.InCount.DataPropertyName = "InCount";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.InCount.DefaultCellStyle = dataGridViewCellStyle3;
+            this.InCount.HeaderText = "产量";
+            this.InCount.Name = "InCount";
+            this.InCount.ReadOnly = true;
+            this.InCount.Width = 120;
+            // 
+            // ProcedureId
+            // 
+            this.ProcedureId.DataPropertyName = "ProcedureId";
+            this.ProcedureId.HeaderText = "ProcedureId";
+            this.ProcedureId.Name = "ProcedureId";
+            this.ProcedureId.ReadOnly = true;
+            this.ProcedureId.Visible = false;
+            // 
+            // colGoodsTypeID2
+            // 
+            this.colGoodsTypeID2.DataPropertyName = "GoodsTypeID2";
+            this.colGoodsTypeID2.HeaderText = "GoodsTypeID2";
+            this.colGoodsTypeID2.Name = "colGoodsTypeID2";
+            this.colGoodsTypeID2.ReadOnly = true;
+            this.colGoodsTypeID2.Visible = false;
+            // 
+            // colGoodsTypeCode2
+            // 
+            this.colGoodsTypeCode2.DataPropertyName = "GoodsTypeCode2";
+            this.colGoodsTypeCode2.HeaderText = "GoodsTypeCode2";
+            this.colGoodsTypeCode2.Name = "colGoodsTypeCode2";
+            this.colGoodsTypeCode2.ReadOnly = true;
+            this.colGoodsTypeCode2.Visible = false;
+            // 
+            // colgoodsid
+            // 
+            this.colgoodsid.DataPropertyName = "goodsid";
+            this.colgoodsid.HeaderText = "goodsid";
+            this.colgoodsid.Name = "colgoodsid";
+            this.colgoodsid.ReadOnly = true;
+            this.colgoodsid.Visible = false;
+            // 
+            // coluserid
+            // 
+            this.coluserid.DataPropertyName = "userid";
+            this.coluserid.HeaderText = "userid";
+            this.coluserid.Name = "coluserid";
+            this.coluserid.ReadOnly = true;
+            this.coluserid.Visible = false;
+            // 
             // F_RPT_030105
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1002,16 +1023,18 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserID;
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+		private Basics.BaseControls.C_Label lblGoodsType;
+		private Controls.SearchBox.ScbGoodsType scbGoodsType;
         private System.Windows.Forms.DataGridViewTextBoxColumn productionlinename;
         private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
         private System.Windows.Forms.DataGridViewTextBoxColumn Usercode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Goodstypename;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGoodstypename2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Goodscode;
         private System.Windows.Forms.DataGridViewTextBoxColumn InCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeID2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeCode2;
         private System.Windows.Forms.DataGridViewTextBoxColumn colgoodsid;
         private System.Windows.Forms.DataGridViewTextBoxColumn coluserid;
-		private Basics.BaseControls.C_Label lblGoodsType;
-		private Controls.SearchBox.ScbGoodsType scbGoodsType;
-	}
+    }
 }

DK.Client/ReportModule/R03/M01/F_RPT_030105.cs

@@ -208,12 +208,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				}
 				//获取数据信息
 				DataGridViewRow dgvr = dgvReportModule.CurrentRow;
-				string goodsCode = dgvr.Cells["GoodsCode"].Value.ToString();
-				string procedureId = dgvr.Cells["ProcedureId"].Value.ToString();
-				string goodsid = dgvr.Cells["colgoodsid"].Value.ToString();
-				string userid = dgvr.Cells["coluserid"].Value.ToString();
+				//string goodsCode = dgvr.Cells["GoodsCode"].Value.ToString();
+				string procedureId = dgvr.Cells["ProcedureId"].Value + "";
+                string GoodsTypeIDS = dgvr.Cells["colGoodsTypeCode2"].Value + "";
+                string goodsid = dgvr.Cells["colgoodsid"].Value + "";
+				string userid = dgvr.Cells["coluserid"].Value + "";
 				//判断是否选择统计行
-				if (!goodsCode.Equals("--"))
+				//if (!goodsCode.Equals("--"))
 				{
 					this.tblReportModule.SelectTab(1);
 
@@ -229,9 +230,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 					if (!string.IsNullOrEmpty(userid))
 					{
 						rptse.UserID = Convert.ToInt32(userid);
-					}
+                    }
+                    rptse.GoodsTypeIDS = GoodsTypeIDS;
 
-					this.dgvDetailReportModule.DataSource = null;
+                    this.dgvDetailReportModule.DataSource = null;
 					this.dgvDetailReportModule.DataSource = GetSearchDetailIData();
 				}
 			}

DK.Client/ReportModule/R03/M01/F_RPT_030105.resx

@@ -203,7 +203,7 @@
   <metadata name="Usercode.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">
+  <metadata name="colGoodstypename2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="Goodscode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -215,6 +215,12 @@
   <metadata name="ProcedureId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colGoodsTypeID2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colGoodsTypeCode2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colgoodsid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/SystemModule/F_MST_0501.Designer.cs

@@ -33,10 +33,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = 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();
@@ -53,6 +49,10 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
@@ -74,21 +74,6 @@
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.dgvGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.lblGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.chkCeaseFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
-            this.chkValueFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
-            this.lblRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-            this.ddlGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.dgvGoodsSap = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.logoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lmaterialcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lmaterialremark = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lWaterLabelCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -126,6 +111,21 @@
             this.colLogoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AccountID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.valueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.lblGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.chkCeaseFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
+            this.chkValueFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
+            this.lblRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtRemarks = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.ddlGlazeTypeID = new Dongke.IBOSS.PRD.Basics.BaseControls.DKListBoxComboBox();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.dgvGoodsSap = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.logoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lmaterialcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lmaterialremark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lWaterLabelCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGoods)).BeginInit();
             this.gbxCondition.SuspendLayout();
@@ -269,7 +269,7 @@
             this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
             this.txtGoodsCode.Location = new System.Drawing.Point(75, 20);
-            this.txtGoodsCode.MaxLength = 10;
+            this.txtGoodsCode.MaxLength = 50;
             this.txtGoodsCode.Name = "txtGoodsCode";
             this.txtGoodsCode.Size = new System.Drawing.Size(120, 21);
             this.txtGoodsCode.TabIndex = 1;
@@ -486,378 +486,116 @@
             this.dgvGoods.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvGoods_CellDoubleClick);
             this.dgvGoods.SelectionChanged += new System.EventHandler(this.dgvGoods_SelectionChanged);
             // 
-            // lblGlazeTypeID
+            // GoodsID
             // 
-            this.lblGlazeTypeID.AutoSize = true;
-            this.lblGlazeTypeID.BackColor = System.Drawing.SystemColors.Control;
-            this.lblGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblGlazeTypeID.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGlazeTypeID.Location = new System.Drawing.Point(16, 51);
-            this.lblGlazeTypeID.Name = "lblGlazeTypeID";
-            this.lblGlazeTypeID.Size = new System.Drawing.Size(53, 12);
-            this.lblGlazeTypeID.TabIndex = 15;
-            this.lblGlazeTypeID.Text = "釉料类别";
+            this.GoodsID.DataPropertyName = "GoodsID";
+            this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.Name = "GoodsID";
+            this.GoodsID.ReadOnly = true;
+            this.GoodsID.Visible = false;
             // 
-            // chkCeaseFlag
+            // GoodsCode
             // 
-            this.chkCeaseFlag.BackColor = System.Drawing.SystemColors.Control;
-            this.chkCeaseFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkCeaseFlag.BackgroundImage")));
-            this.chkCeaseFlag.FalseText = "否";
-            this.chkCeaseFlag.Location = new System.Drawing.Point(570, 51);
-            this.chkCeaseFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
-            this.chkCeaseFlag.Name = "chkCeaseFlag";
-            this.chkCeaseFlag.Size = new System.Drawing.Size(136, 20);
-            this.chkCeaseFlag.TabIndex = 7;
-            this.chkCeaseFlag.Title = "在产";
-            this.chkCeaseFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.chkCeaseFlag.TrueText = "是";
+            this.GoodsCode.DataPropertyName = "GoodsCode";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.Name = "GoodsCode";
+            this.GoodsCode.ReadOnly = true;
             // 
-            // chkValueFlag
+            // GoodsName
             // 
-            this.chkValueFlag.BackColor = System.Drawing.SystemColors.Control;
-            this.chkValueFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkValueFlag.BackgroundImage")));
-            this.chkValueFlag.FalseText = "否";
-            this.chkValueFlag.Location = new System.Drawing.Point(684, 51);
-            this.chkValueFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
-            this.chkValueFlag.Name = "chkValueFlag";
-            this.chkValueFlag.Size = new System.Drawing.Size(136, 20);
-            this.chkValueFlag.TabIndex = 8;
-            this.chkValueFlag.Title = "有效";
-            this.chkValueFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.chkValueFlag.TrueText = "是";
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
             // 
-            // lblRemarks
+            // GoodsSpecification
             // 
-            this.lblRemarks.AutoSize = true;
-            this.lblRemarks.BackColor = System.Drawing.SystemColors.Control;
-            this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblRemarks.Location = new System.Drawing.Point(222, 51);
-            this.lblRemarks.Name = "lblRemarks";
-            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
-            this.lblRemarks.TabIndex = 19;
-            this.lblRemarks.Text = "备注";
+            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
+            this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.Name = "GoodsSpecification";
+            this.GoodsSpecification.ReadOnly = true;
             // 
-            // txtRemarks
+            // GoodsModel
             // 
-            this.txtRemarks.BackColor = System.Drawing.SystemColors.Window;
-            this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtRemarks.ErrorMessage = "";
-            this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRemarks.Location = new System.Drawing.Point(256, 47);
-            this.txtRemarks.MaxLength = 500;
-            this.txtRemarks.Name = "txtRemarks";
-            this.txtRemarks.Size = new System.Drawing.Size(120, 21);
-            this.txtRemarks.TabIndex = 6;
+            this.GoodsModel.DataPropertyName = "GoodsModel";
+            this.GoodsModel.HeaderText = "产品型号";
+            this.GoodsModel.Name = "GoodsModel";
+            this.GoodsModel.ReadOnly = true;
             // 
-            // gbxCondition
+            // GoodsTypeName
             // 
-            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | 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.lblGoodsType);
-            this.gbxCondition.Controls.Add(this.scbGoodsType);
-            this.gbxCondition.Controls.Add(this.ddlGlazeTypeID);
-            this.gbxCondition.Controls.Add(this.btnClearCondition);
-            this.gbxCondition.Controls.Add(this.btnSearch);
-            this.gbxCondition.Controls.Add(this.lblGoodsCode);
-            this.gbxCondition.Controls.Add(this.txtRemarks);
-            this.gbxCondition.Controls.Add(this.txtGoodsCode);
-            this.gbxCondition.Controls.Add(this.lblRemarks);
-            this.gbxCondition.Controls.Add(this.lblGoodsName);
-            this.gbxCondition.Controls.Add(this.chkValueFlag);
-            this.gbxCondition.Controls.Add(this.txtGoodsName);
-            this.gbxCondition.Controls.Add(this.chkCeaseFlag);
-            this.gbxCondition.Controls.Add(this.lblGoodsSpecification);
-            this.gbxCondition.Controls.Add(this.lblGlazeTypeID);
-            this.gbxCondition.Controls.Add(this.txtGoodsSpecification);
-            this.gbxCondition.Controls.Add(this.lblGoodsModel);
-            this.gbxCondition.Controls.Add(this.txtGoodsModel);
-            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.gbxCondition.IsMustInput = false;
-            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
-            this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1025, 82);
-            this.gbxCondition.TabIndex = 23;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
+            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
+            this.GoodsTypeName.HeaderText = "产品类别";
+            this.GoodsTypeName.Name = "GoodsTypeName";
+            this.GoodsTypeName.ReadOnly = true;
             // 
-            // lblGoodsType
+            // glazeTypeName
             // 
-            this.lblGoodsType.AutoSize = true;
-            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
-            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsType.Location = new System.Drawing.Point(384, 51);
-            this.lblGoodsType.Name = "lblGoodsType";
-            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
-            this.lblGoodsType.TabIndex = 21;
-            this.lblGoodsType.Text = "产品类别";
+            this.glazeTypeName.DataPropertyName = "glazeTypeName";
+            this.glazeTypeName.HeaderText = "釉料类别";
+            this.glazeTypeName.Name = "glazeTypeName";
+            this.glazeTypeName.ReadOnly = true;
             // 
-            // scbGoodsType
+            // MudWeight
             // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(441, 47);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
-            this.scbGoodsType.TabIndex = 20;
+            this.MudWeight.DataPropertyName = "MudWeight";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.Format = "N2";
+            this.MudWeight.DefaultCellStyle = dataGridViewCellStyle3;
+            this.MudWeight.HeaderText = "泥浆用量(KG)";
+            this.MudWeight.Name = "MudWeight";
+            this.MudWeight.ReadOnly = true;
             // 
-            // ddlGlazeTypeID
+            // GlazeWeight
             // 
-            this.ddlGlazeTypeID.BackColor = System.Drawing.SystemColors.Window;
-            this.ddlGlazeTypeID.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.ddlGlazeTypeID.DataSource = null;
-            this.ddlGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ddlGlazeTypeID.FormattingEnabled = true;
+            this.GlazeWeight.DataPropertyName = "GlazeWeight";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Format = "N2";
+            this.GlazeWeight.DefaultCellStyle = dataGridViewCellStyle4;
+            this.GlazeWeight.HeaderText = "釉浆用量(KG)";
+            this.GlazeWeight.Name = "GlazeWeight";
+            this.GlazeWeight.ReadOnly = true;
             // 
+            // LusterwareWeight
             // 
+            this.LusterwareWeight.DataPropertyName = "LusterwareWeight";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.Format = "N2";
+            this.LusterwareWeight.DefaultCellStyle = dataGridViewCellStyle5;
+            this.LusterwareWeight.HeaderText = "光瓷重量(KG)";
+            this.LusterwareWeight.Name = "LusterwareWeight";
+            this.LusterwareWeight.ReadOnly = true;
             // 
-            this.ddlGlazeTypeID.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ddlGlazeTypeID.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ddlGlazeTypeID.ListBox.Location = new System.Drawing.Point(0, 0);
-            this.ddlGlazeTypeID.ListBox.Name = "";
-            this.ddlGlazeTypeID.ListBox.Size = new System.Drawing.Size(118, 136);
-            this.ddlGlazeTypeID.ListBox.TabIndex = 0;
-            this.ddlGlazeTypeID.Location = new System.Drawing.Point(75, 47);
-            this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
-            this.ddlGlazeTypeID.Size = new System.Drawing.Size(120, 20);
-            this.ddlGlazeTypeID.TabIndex = 5;
+            // ProductionCycle
             // 
-            // splitContainer1
+            this.ProductionCycle.DataPropertyName = "ProductionCycle";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Format = "N0";
+            this.ProductionCycle.DefaultCellStyle = dataGridViewCellStyle6;
+            this.ProductionCycle.HeaderText = "生产周期(天)";
+            this.ProductionCycle.Name = "ProductionCycle";
+            this.ProductionCycle.ReadOnly = true;
             // 
-            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 126);
-            this.splitContainer1.Name = "splitContainer1";
+            // UnitPrice
             // 
-            // splitContainer1.Panel1
+            this.UnitPrice.DataPropertyName = "UnitPrice";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Format = "N4";
+            this.UnitPrice.DefaultCellStyle = dataGridViewCellStyle7;
+            this.UnitPrice.HeaderText = "单值";
+            this.UnitPrice.Name = "UnitPrice";
+            this.UnitPrice.ReadOnly = true;
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.dgvGoods);
+            // ScrapSumFlag
             // 
-            // splitContainer1.Panel2
+            this.ScrapSumFlag.DataPropertyName = "ScrapSumFlag";
+            this.ScrapSumFlag.FalseValue = "0";
+            this.ScrapSumFlag.HeaderText = "损失统计";
+            this.ScrapSumFlag.Name = "ScrapSumFlag";
+            this.ScrapSumFlag.ReadOnly = true;
+            this.ScrapSumFlag.TrueValue = "1";
             // 
-            this.splitContainer1.Panel2.Controls.Add(this.dgvGoodsSap);
-            this.splitContainer1.Size = new System.Drawing.Size(1025, 335);
-            this.splitContainer1.SplitterDistance = 659;
-            this.splitContainer1.TabIndex = 2;
-            // 
-            // dgvGoodsSap
-            // 
-            this.dgvGoodsSap.AllowUserToAddRows = false;
-            this.dgvGoodsSap.AllowUserToDeleteRows = false;
-            this.dgvGoodsSap.AllowUserToModifyRows = true;
-            this.dgvGoodsSap.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGoodsSap.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
-            this.dgvGoodsSap.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvGoodsSap.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvGoodsSap.CellHeight = 23;
-            this.dgvGoodsSap.ChildNodeColumnName = null;
-            this.dgvGoodsSap.ChildNodeColumnText = null;
-            this.dgvGoodsSap.ColumnDeep = 1;
-            this.dgvGoodsSap.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGoodsSap.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
-            this.dgvGoodsSap.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvGoodsSap.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.logoName,
-            this.lmaterialcode,
-            this.lmaterialremark,
-            this.lWaterLabelCode});
-            this.dgvGoodsSap.ColumnTreeView = null;
-            this.dgvGoodsSap.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGoodsSap.DefaultCellStyle = dataGridViewCellStyle23;
-            this.dgvGoodsSap.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvGoodsSap.DynamicColumnName = "";
-            this.dgvGoodsSap.EnableHeadersVisualStyles = false;
-            this.dgvGoodsSap.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvGoodsSap.FormatQuantityColumns = null;
-            this.dgvGoodsSap.HorizontalMergeColumn = null;
-            this.dgvGoodsSap.IsAutoCountSum = true;
-            this.dgvGoodsSap.IsAutoResizeColumns = false;
-            this.dgvGoodsSap.IsClickF12 = false;
-            this.dgvGoodsSap.IsOpenMergeCellFlag = false;
-            this.dgvGoodsSap.IsSubTotalFlag = false;
-            this.dgvGoodsSap.IsTopDeep = false;
-            this.dgvGoodsSap.Location = new System.Drawing.Point(0, 0);
-            this.dgvGoodsSap.MergeColumnNames = null;
-            this.dgvGoodsSap.MergeDetailColumnNames = null;
-            this.dgvGoodsSap.MergeDetailOnlyColumn = null;
-            this.dgvGoodsSap.MergeOnlyColumn = null;
-            this.dgvGoodsSap.Name = "dgvGoodsSap";
-            this.dgvGoodsSap.ReadOnly = true;
-            this.dgvGoodsSap.RefreshAtHscroll = false;
-            this.dgvGoodsSap.RowHeadersWidth = 50;
-            this.dgvGoodsSap.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGoodsSap.RowsDefaultCellStyle = dataGridViewCellStyle24;
-            this.dgvGoodsSap.RowTemplate.Height = 21;
-            this.dgvGoodsSap.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvGoodsSap.Size = new System.Drawing.Size(362, 335);
-            this.dgvGoodsSap.SortOrderColumnName = null;
-            this.dgvGoodsSap.TabIndex = 13;
-            this.dgvGoodsSap.Tag = true;
-            this.dgvGoodsSap.TotalSumColumns = null;
-            this.dgvGoodsSap.ViewRowFilter = "";
-            this.dgvGoodsSap.VirtualMode = true;
-            // 
-            // logoName
-            // 
-            this.logoName.DataPropertyName = "logoName";
-            this.logoName.HeaderText = "商标";
-            this.logoName.Name = "logoName";
-            this.logoName.ReadOnly = true;
-            // 
-            // lmaterialcode
-            // 
-            this.lmaterialcode.DataPropertyName = "materialcode";
-            this.lmaterialcode.HeaderText = "物料编码";
-            this.lmaterialcode.Name = "lmaterialcode";
-            this.lmaterialcode.ReadOnly = true;
-            // 
-            // lmaterialremark
-            // 
-            this.lmaterialremark.DataPropertyName = "materialremark";
-            this.lmaterialremark.HeaderText = "物料描述";
-            this.lmaterialremark.Name = "lmaterialremark";
-            this.lmaterialremark.ReadOnly = true;
-            // 
-            // lWaterLabelCode
-            // 
-            this.lWaterLabelCode.DataPropertyName = "WaterLabelCode";
-            this.lWaterLabelCode.HeaderText = "水效标识";
-            this.lWaterLabelCode.Name = "lWaterLabelCode";
-            this.lWaterLabelCode.ReadOnly = true;
-            // 
-            // GoodsID
-            // 
-            this.GoodsID.DataPropertyName = "GoodsID";
-            this.GoodsID.HeaderText = "产品ID";
-            this.GoodsID.Name = "GoodsID";
-            this.GoodsID.ReadOnly = true;
-            this.GoodsID.Visible = false;
-            // 
-            // GoodsCode
-            // 
-            this.GoodsCode.DataPropertyName = "GoodsCode";
-            this.GoodsCode.HeaderText = "产品编码";
-            this.GoodsCode.Name = "GoodsCode";
-            this.GoodsCode.ReadOnly = true;
-            // 
-            // GoodsName
-            // 
-            this.GoodsName.DataPropertyName = "GoodsName";
-            this.GoodsName.HeaderText = "产品名称";
-            this.GoodsName.Name = "GoodsName";
-            this.GoodsName.ReadOnly = true;
-            // 
-            // GoodsSpecification
-            // 
-            this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
-            this.GoodsSpecification.HeaderText = "产品规格";
-            this.GoodsSpecification.Name = "GoodsSpecification";
-            this.GoodsSpecification.ReadOnly = true;
-            // 
-            // GoodsModel
-            // 
-            this.GoodsModel.DataPropertyName = "GoodsModel";
-            this.GoodsModel.HeaderText = "产品型号";
-            this.GoodsModel.Name = "GoodsModel";
-            this.GoodsModel.ReadOnly = true;
-            // 
-            // GoodsTypeName
-            // 
-            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
-            this.GoodsTypeName.HeaderText = "产品类别";
-            this.GoodsTypeName.Name = "GoodsTypeName";
-            this.GoodsTypeName.ReadOnly = true;
-            // 
-            // glazeTypeName
-            // 
-            this.glazeTypeName.DataPropertyName = "glazeTypeName";
-            this.glazeTypeName.HeaderText = "釉料类别";
-            this.glazeTypeName.Name = "glazeTypeName";
-            this.glazeTypeName.ReadOnly = true;
-            // 
-            // MudWeight
-            // 
-            this.MudWeight.DataPropertyName = "MudWeight";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.Format = "N2";
-            this.MudWeight.DefaultCellStyle = dataGridViewCellStyle3;
-            this.MudWeight.HeaderText = "泥浆用量(KG)";
-            this.MudWeight.Name = "MudWeight";
-            this.MudWeight.ReadOnly = true;
-            // 
-            // GlazeWeight
-            // 
-            this.GlazeWeight.DataPropertyName = "GlazeWeight";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Format = "N2";
-            this.GlazeWeight.DefaultCellStyle = dataGridViewCellStyle4;
-            this.GlazeWeight.HeaderText = "釉浆用量(KG)";
-            this.GlazeWeight.Name = "GlazeWeight";
-            this.GlazeWeight.ReadOnly = true;
-            // 
-            // LusterwareWeight
-            // 
-            this.LusterwareWeight.DataPropertyName = "LusterwareWeight";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Format = "N2";
-            this.LusterwareWeight.DefaultCellStyle = dataGridViewCellStyle5;
-            this.LusterwareWeight.HeaderText = "光瓷重量(KG)";
-            this.LusterwareWeight.Name = "LusterwareWeight";
-            this.LusterwareWeight.ReadOnly = true;
-            // 
-            // ProductionCycle
-            // 
-            this.ProductionCycle.DataPropertyName = "ProductionCycle";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Format = "N0";
-            this.ProductionCycle.DefaultCellStyle = dataGridViewCellStyle6;
-            this.ProductionCycle.HeaderText = "生产周期(天)";
-            this.ProductionCycle.Name = "ProductionCycle";
-            this.ProductionCycle.ReadOnly = true;
-            // 
-            // UnitPrice
-            // 
-            this.UnitPrice.DataPropertyName = "UnitPrice";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle7.Format = "N4";
-            this.UnitPrice.DefaultCellStyle = dataGridViewCellStyle7;
-            this.UnitPrice.HeaderText = "单值";
-            this.UnitPrice.Name = "UnitPrice";
-            this.UnitPrice.ReadOnly = true;
-            // 
-            // ScrapSumFlag
-            // 
-            this.ScrapSumFlag.DataPropertyName = "ScrapSumFlag";
-            this.ScrapSumFlag.FalseValue = "0";
-            this.ScrapSumFlag.HeaderText = "损失统计";
-            this.ScrapSumFlag.Name = "ScrapSumFlag";
-            this.ScrapSumFlag.ReadOnly = true;
-            this.ScrapSumFlag.TrueValue = "1";
-            // 
-            // goods_line_type
+            // goods_line_type
             // 
             this.goods_line_type.DataPropertyName = "goods_line_type";
             this.goods_line_type.FalseValue = "0";
@@ -1073,6 +811,268 @@
             this.valueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.valueFlag.TrueValue = "1";
             // 
+            // lblGlazeTypeID
+            // 
+            this.lblGlazeTypeID.AutoSize = true;
+            this.lblGlazeTypeID.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGlazeTypeID.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGlazeTypeID.Location = new System.Drawing.Point(16, 51);
+            this.lblGlazeTypeID.Name = "lblGlazeTypeID";
+            this.lblGlazeTypeID.Size = new System.Drawing.Size(53, 12);
+            this.lblGlazeTypeID.TabIndex = 15;
+            this.lblGlazeTypeID.Text = "釉料类别";
+            // 
+            // chkCeaseFlag
+            // 
+            this.chkCeaseFlag.BackColor = System.Drawing.SystemColors.Control;
+            this.chkCeaseFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkCeaseFlag.BackgroundImage")));
+            this.chkCeaseFlag.FalseText = "否";
+            this.chkCeaseFlag.Location = new System.Drawing.Point(570, 51);
+            this.chkCeaseFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkCeaseFlag.Name = "chkCeaseFlag";
+            this.chkCeaseFlag.Size = new System.Drawing.Size(136, 20);
+            this.chkCeaseFlag.TabIndex = 7;
+            this.chkCeaseFlag.Title = "在产";
+            this.chkCeaseFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.chkCeaseFlag.TrueText = "是";
+            // 
+            // chkValueFlag
+            // 
+            this.chkValueFlag.BackColor = System.Drawing.SystemColors.Control;
+            this.chkValueFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkValueFlag.BackgroundImage")));
+            this.chkValueFlag.FalseText = "否";
+            this.chkValueFlag.Location = new System.Drawing.Point(684, 51);
+            this.chkValueFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkValueFlag.Name = "chkValueFlag";
+            this.chkValueFlag.Size = new System.Drawing.Size(136, 20);
+            this.chkValueFlag.TabIndex = 8;
+            this.chkValueFlag.Title = "有效";
+            this.chkValueFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.chkValueFlag.TrueText = "是";
+            // 
+            // lblRemarks
+            // 
+            this.lblRemarks.AutoSize = true;
+            this.lblRemarks.BackColor = System.Drawing.SystemColors.Control;
+            this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblRemarks.Location = new System.Drawing.Point(222, 51);
+            this.lblRemarks.Name = "lblRemarks";
+            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
+            this.lblRemarks.TabIndex = 19;
+            this.lblRemarks.Text = "备注";
+            // 
+            // txtRemarks
+            // 
+            this.txtRemarks.BackColor = System.Drawing.SystemColors.Window;
+            this.txtRemarks.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtRemarks.ErrorMessage = "";
+            this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtRemarks.Location = new System.Drawing.Point(256, 47);
+            this.txtRemarks.MaxLength = 500;
+            this.txtRemarks.Name = "txtRemarks";
+            this.txtRemarks.Size = new System.Drawing.Size(120, 21);
+            this.txtRemarks.TabIndex = 6;
+            // 
+            // gbxCondition
+            // 
+            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | 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.lblGoodsType);
+            this.gbxCondition.Controls.Add(this.scbGoodsType);
+            this.gbxCondition.Controls.Add(this.ddlGlazeTypeID);
+            this.gbxCondition.Controls.Add(this.btnClearCondition);
+            this.gbxCondition.Controls.Add(this.btnSearch);
+            this.gbxCondition.Controls.Add(this.lblGoodsCode);
+            this.gbxCondition.Controls.Add(this.txtRemarks);
+            this.gbxCondition.Controls.Add(this.txtGoodsCode);
+            this.gbxCondition.Controls.Add(this.lblRemarks);
+            this.gbxCondition.Controls.Add(this.lblGoodsName);
+            this.gbxCondition.Controls.Add(this.chkValueFlag);
+            this.gbxCondition.Controls.Add(this.txtGoodsName);
+            this.gbxCondition.Controls.Add(this.chkCeaseFlag);
+            this.gbxCondition.Controls.Add(this.lblGoodsSpecification);
+            this.gbxCondition.Controls.Add(this.lblGlazeTypeID);
+            this.gbxCondition.Controls.Add(this.txtGoodsSpecification);
+            this.gbxCondition.Controls.Add(this.lblGoodsModel);
+            this.gbxCondition.Controls.Add(this.txtGoodsModel);
+            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.gbxCondition.IsMustInput = false;
+            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Size = new System.Drawing.Size(1025, 82);
+            this.gbxCondition.TabIndex = 23;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // lblGoodsType
+            // 
+            this.lblGoodsType.AutoSize = true;
+            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoodsType.Location = new System.Drawing.Point(384, 51);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
+            this.lblGoodsType.TabIndex = 21;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(441, 47);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
+            this.scbGoodsType.TabIndex = 20;
+            // 
+            // ddlGlazeTypeID
+            // 
+            this.ddlGlazeTypeID.BackColor = System.Drawing.SystemColors.Window;
+            this.ddlGlazeTypeID.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.ddlGlazeTypeID.DataSource = null;
+            this.ddlGlazeTypeID.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ddlGlazeTypeID.FormattingEnabled = true;
+            // 
+            // 
+            // 
+            this.ddlGlazeTypeID.ListBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ddlGlazeTypeID.ListBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ddlGlazeTypeID.ListBox.Location = new System.Drawing.Point(0, 0);
+            this.ddlGlazeTypeID.ListBox.Name = "";
+            this.ddlGlazeTypeID.ListBox.Size = new System.Drawing.Size(118, 136);
+            this.ddlGlazeTypeID.ListBox.TabIndex = 0;
+            this.ddlGlazeTypeID.Location = new System.Drawing.Point(75, 47);
+            this.ddlGlazeTypeID.Name = "ddlGlazeTypeID";
+            this.ddlGlazeTypeID.Size = new System.Drawing.Size(120, 20);
+            this.ddlGlazeTypeID.TabIndex = 5;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 126);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.dgvGoods);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.dgvGoodsSap);
+            this.splitContainer1.Size = new System.Drawing.Size(1025, 335);
+            this.splitContainer1.SplitterDistance = 659;
+            this.splitContainer1.TabIndex = 2;
+            // 
+            // dgvGoodsSap
+            // 
+            this.dgvGoodsSap.AllowUserToAddRows = false;
+            this.dgvGoodsSap.AllowUserToDeleteRows = false;
+            this.dgvGoodsSap.AllowUserToModifyRows = true;
+            this.dgvGoodsSap.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGoodsSap.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
+            this.dgvGoodsSap.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvGoodsSap.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvGoodsSap.CellHeight = 23;
+            this.dgvGoodsSap.ChildNodeColumnName = null;
+            this.dgvGoodsSap.ChildNodeColumnText = null;
+            this.dgvGoodsSap.ColumnDeep = 1;
+            this.dgvGoodsSap.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvGoodsSap.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
+            this.dgvGoodsSap.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvGoodsSap.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.logoName,
+            this.lmaterialcode,
+            this.lmaterialremark,
+            this.lWaterLabelCode});
+            this.dgvGoodsSap.ColumnTreeView = null;
+            this.dgvGoodsSap.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGoodsSap.DefaultCellStyle = dataGridViewCellStyle23;
+            this.dgvGoodsSap.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvGoodsSap.DynamicColumnName = "";
+            this.dgvGoodsSap.EnableHeadersVisualStyles = false;
+            this.dgvGoodsSap.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvGoodsSap.FormatQuantityColumns = null;
+            this.dgvGoodsSap.HorizontalMergeColumn = null;
+            this.dgvGoodsSap.IsAutoCountSum = true;
+            this.dgvGoodsSap.IsAutoResizeColumns = false;
+            this.dgvGoodsSap.IsClickF12 = false;
+            this.dgvGoodsSap.IsOpenMergeCellFlag = false;
+            this.dgvGoodsSap.IsSubTotalFlag = false;
+            this.dgvGoodsSap.IsTopDeep = false;
+            this.dgvGoodsSap.Location = new System.Drawing.Point(0, 0);
+            this.dgvGoodsSap.MergeColumnNames = null;
+            this.dgvGoodsSap.MergeDetailColumnNames = null;
+            this.dgvGoodsSap.MergeDetailOnlyColumn = null;
+            this.dgvGoodsSap.MergeOnlyColumn = null;
+            this.dgvGoodsSap.Name = "dgvGoodsSap";
+            this.dgvGoodsSap.ReadOnly = true;
+            this.dgvGoodsSap.RefreshAtHscroll = false;
+            this.dgvGoodsSap.RowHeadersWidth = 50;
+            this.dgvGoodsSap.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGoodsSap.RowsDefaultCellStyle = dataGridViewCellStyle24;
+            this.dgvGoodsSap.RowTemplate.Height = 21;
+            this.dgvGoodsSap.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvGoodsSap.Size = new System.Drawing.Size(362, 335);
+            this.dgvGoodsSap.SortOrderColumnName = null;
+            this.dgvGoodsSap.TabIndex = 13;
+            this.dgvGoodsSap.Tag = true;
+            this.dgvGoodsSap.TotalSumColumns = null;
+            this.dgvGoodsSap.ViewRowFilter = "";
+            this.dgvGoodsSap.VirtualMode = true;
+            // 
+            // logoName
+            // 
+            this.logoName.DataPropertyName = "logoName";
+            this.logoName.HeaderText = "商标";
+            this.logoName.Name = "logoName";
+            this.logoName.ReadOnly = true;
+            // 
+            // lmaterialcode
+            // 
+            this.lmaterialcode.DataPropertyName = "materialcode";
+            this.lmaterialcode.HeaderText = "物料编码";
+            this.lmaterialcode.Name = "lmaterialcode";
+            this.lmaterialcode.ReadOnly = true;
+            // 
+            // lmaterialremark
+            // 
+            this.lmaterialremark.DataPropertyName = "materialremark";
+            this.lmaterialremark.HeaderText = "物料描述";
+            this.lmaterialremark.Name = "lmaterialremark";
+            this.lmaterialremark.ReadOnly = true;
+            // 
+            // lWaterLabelCode
+            // 
+            this.lWaterLabelCode.DataPropertyName = "WaterLabelCode";
+            this.lWaterLabelCode.HeaderText = "水效标识";
+            this.lWaterLabelCode.Name = "lWaterLabelCode";
+            this.lWaterLabelCode.ReadOnly = true;
+            // 
             // F_MST_0501
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

DK.Client/SystemModule/F_MST_0502.Designer.cs

@@ -368,7 +368,7 @@
             this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
             this.txtGoodsCode.IsMustInput = true;
             this.txtGoodsCode.Location = new System.Drawing.Point(64, 7);
-            this.txtGoodsCode.MaxLength = 10;
+            this.txtGoodsCode.MaxLength = 50;
             this.txtGoodsCode.Name = "txtGoodsCode";
             this.txtGoodsCode.Size = new System.Drawing.Size(100, 21);
             this.txtGoodsCode.TabIndex = 1;

DK.Client/SystemModule/F_MST_0801.Designer.cs

@@ -91,6 +91,7 @@
             this.dgvDataLogo.DynamicColumnName = "";
             this.dgvDataLogo.EnableHeadersVisualStyles = false;
             this.dgvDataLogo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDataLogo.FormatQuantityColumns = null;
             this.dgvDataLogo.HorizontalMergeColumn = null;
             this.dgvDataLogo.IsAutoCountSum = true;
             this.dgvDataLogo.IsAutoResizeColumns = false;
@@ -262,6 +263,7 @@
             this.TagCode.MaxInputLength = 10;
             this.TagCode.Name = "TagCode";
             this.TagCode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.TagCode.Visible = false;
             // 
             // F_MST_0801
             // 

DK.Client/SystemModule/F_MST_0801.resx

@@ -132,20 +132,18 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

DK.Service/PCModuleLogic/PCModuleLogicDALPartial.cs

@@ -6639,6 +6639,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                 sbSql.Append("MouldQuantity=:MouldQuantity,");
                 sbSql.Append("GMouldTypeID=:GMouldTypeID,");
                 sbSql.Append("UserID=:UserID,");
+                sbSql.Append("GROUTINGLINENAME=:GROUTINGLINENAME,");
                 sbSql.Append("MonitorID=:MonitorID,");
                 //xuwei add 2019-11-13 高压注浆
                 sbSql.Append("HighPressureFlag=:HighPressureFlag,");
@@ -6709,6 +6710,8 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleLogic
                         new OracleParameter(":UserID",OracleDbType.Int32,
                             //Convert.ToInt32(detailUserList.Rows[0]["userid"]),ParameterDirection.Input),
                             groutingLineEntity.USERID,ParameterDirection.Input),
+                        new OracleParameter(":GROUTINGLINENAME",OracleDbType.NVarchar2,
+                            groutingLineEntity.GROUTINGLINENAME,ParameterDirection.Input),
                         new OracleParameter(":MonitorID",OracleDbType.Int32,
                             groutingLineEntity.MonitorID,ParameterDirection.Input),
                         new OracleParameter(":Remarks",OracleDbType.NVarchar2,

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -364,9 +364,13 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 							"      b.dictionaryvalue AS NoGroutingRreason, " +
 							"      TP_PM_GroutingDailyDetail.SCRAPTIME, " +
                             "      TP_PM_GroutingDailyDetail.CreateTime GCTime, " +
+                            "      mu.usercode MONITORCODE, " +
+                            "      mu.username MONITORNAME, " +
                             "      replace((TP_MST_Logo.Logoname||'['||TP_MST_Logo.Logocode||']'),'[]','')  as LogoCodeName " +
 							"from TP_PM_GroutingDailyDetail " +
-							"inner join TP_PC_GroutingLine on TP_PC_GroutingLine.GroutingLineID=TP_PM_GroutingDailyDetail.GroutingLineID " +
+                            "inner join TP_PM_GroutingDaily gd on gd.GroutingDailyID = TP_PM_GroutingDailyDetail.GroutingDailyID " +
+                            "left  join tp_mst_user mu on mu.userid = gd.MONITORID " +
+                            "inner join TP_PC_GroutingLine on TP_PC_GroutingLine.GroutingLineID=TP_PM_GroutingDailyDetail.GroutingLineID " +
 							"inner join TP_MST_GMouldType on TP_MST_GMouldType.GMOULDTYPEID=TP_PC_GroutingLine.GMOULDTYPEID " +
 							"inner join TP_MST_Goods on TP_MST_Goods.Goodsid=TP_PM_GroutingDailyDetail.GoodsID " +
 							"inner join TP_MST_DataDictionary on TP_MST_DataDictionary.Dictionaryid=TP_MST_Goods.Glazetypeid " +
@@ -8755,136 +8759,210 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 			}
 		}
 
-		/// <summary>
-		/// 获取RPT030105画面（产品产量汇总表）的汇总信息查询sql
-		/// </summary>
-		/// <returns>sql</returns>
-		private static string GetRPT030105SQL(SUserInfo user, RPT030105_SE se, ref List<OracleParameter> parameters)
-		{
-			string selSql = "";
-			parameters.Add(new OracleParameter(":AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input));
+        /// <summary>
+        /// 获取RPT030105画面（产品产量汇总表）的汇总信息查询sql
+        /// </summary>
+        /// <returns>sql</returns>
+        private static string GetRPT030105SQL(SUserInfo user, RPT030105_SE se, ref List<OracleParameter> parameters)
+        {
+            parameters.Add(new OracleParameter(":AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input));
 
-			selSql = selSql +
-					 //"select " +
-					 //"      ProcedureID," +
-					 //"      procedurecode, " +
-					 //"      decode(Usercode, '小计', '--', procedurename) procedurename, " +
-					 //"      productionlineid, " +
-					 //"      productionlinecode, " +
-					 //"      decode(Usercode, '小计', '--', productionlinename) productionlinename, " +
-					 //"      decode(ProcedureID,'总计','总计',Usercode) Usercode, " +
-					 //"      subGoodsTypecode, " +
-					 //"      decode(usercode,'小计',decode(subGoodsTypecode,'001001','大件','小件'),Goodscode)Goodscode, " +
-					 //"      Goodstypename, " +
-					 //"      InCount " +
-
-					 "select " +
-					"      ProcedureID," +
-					"      procedurecode, " +
-					"      decode(productionlinename, '总计', '--', procedurename) procedurename, " +
-					"      productionlineid, " +
-					"      productionlinecode, " +
-					"      productionlinename, " +
-					"      decode(productionlinename, '--', '--', Usercode) Usercode, " +
-					"      decode(productionlinename, '--', null, UserID) UserID, " +
-					"      subGoodsTypecode, " +
-					"      Goodsid," +
-					"      Goodscode, " +
-					"      Goodstypename, " +
-					"      InCount  from (" +
-
-					 "select " +
-					"      ProcedureID," +
-					"      procedurecode, " +
-					"      decode(usercode,'合计','合计', decode(usercode,'小计','--',decode(usercode,'--','--',procedurename))) procedurename, " +
-					"      productionlineid, " +
-					"      productionlinecode, " +
-					"      decode(ProcedureID,'总计','总计',decode(usercode,'小计','--',productionlinename)) productionlinename, " +
-					"      decode(ProcedureID,'总计','--',Usercode) Usercode, " +
-					"      decode(ProcedureID,'总计',null,Userid) Userid, " +
-					"      subGoodsTypecode, " +
-					"      Goodsid," +
-					"      Goodscode, " +
-					"      decode(usercode,'小计','小计',Goodstypename)Goodstypename, " +
-					"      InCount " +
-					"from " +
-					"(" +
-					"      select " +
-					"      ProcedureID, " +
-					"      procedurecode, " +
-					"      procedurename, " +
-					"      productionlineid, " +
-					"      productionlinecode, " +
-					"      productionlinename, " +
-					"      decode(procedurecode,'--','合计',Usercode) Usercode, " +
-					"      decode(procedurecode,'--',null,Userid) Userid, " +
-					"      subGoodsTypecode," +
-					"      Goodsid," +
-					"      Goodscode," +
-					"      Goodstypename, " +
-					"      InCount " +
-					"      from  ( select " +
-					"      decode(grouping(tp_pc_procedure.ProcedureID),1,'总计',tp_pc_procedure.ProcedureID) ProcedureID," +
-					"      decode(grouping(tp_pc_procedure.procedurecode),1,'--',tp_pc_procedure.procedurecode) procedurecode, " +
-					"      decode(grouping(tp_pc_procedure.procedurename),1,'--',tp_pc_procedure.procedurename) procedurename, " +
-					"      decode(grouping(tp_pm_inproduction.productionlineid),1,'--',tp_pm_inproduction.productionlineid) productionlineid, " +
-					"      decode(grouping(tp_pm_inproduction.productionlinecode),1,'--',tp_pm_inproduction.productionlinecode) productionlinecode, " +
-					"      decode(grouping(tp_pm_inproduction.productionlinename),1,'--',tp_pm_inproduction.productionlinename) productionlinename, " +
-					"      decode(grouping(TP_MST_User.Usercode),1,'小计',TP_MST_User.Usercode) Usercode," +
-					"      decode(grouping(TP_MST_User.Userid),1,null,TP_MST_User.Userid) Userid," +
-					"      decode(grouping(substr(TP_MST_GoodsType.Goodstypecode,0,6)),1,'--',substr(TP_MST_GoodsType.Goodstypecode,0,6)) subGoodsTypecode," +
-					"      decode(grouping(TP_MST_Goods.Goodscode),1,'--',TP_MST_Goods.Goodscode) Goodscode," +
-					"      decode(grouping(TP_MST_Goods.Goodsid),1,'--',TP_MST_Goods.Goodsid) Goodsid," +
-					"      decode(grouping(TP_MST_GoodsType.Goodstypename),1,'--',TP_MST_GoodsType.Goodstypename) Goodstypename," +
-					"      count(barcode) as InCount " +
-					"      from tp_pm_inproduction " +
-					"      left join tp_pc_procedure" +
-					"      on tp_pm_inproduction.FlowProcedureID=tp_pc_procedure.ProcedureID" +
-					"      left join TP_MST_User on tp_pm_inproduction.userid=TP_MST_User.Userid left join TP_MST_Goods on tp_pm_inproduction.goodsid=TP_MST_Goods.Goodsid left join TP_MST_GoodsType on TP_MST_Goods.GoodsTypeID=TP_MST_GoodsType.GoodsTypeID" +
-					"  Where 1=1 " +
-					"  and tp_pm_inproduction.AccountID=:AccountID and tp_pm_inproduction.valueflag=1";
-			if (!string.IsNullOrEmpty(se.GoodsTypeIDS))
-			{
-				//selSql = selSql + " AND instr(','||:GoodsTypeIDS||',',','||TP_MST_GOODSTYPE.GOODSTYPECode||',')=1";
-				selSql = selSql + " AND instr(TP_MST_GOODSTYPE.GOODSTYPECode,:GoodsTypeIDS)=1";
-				parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
-			}
-			if (!string.IsNullOrEmpty(se.LineIDS))
-			{
-				selSql = selSql + " AND instr(','||:ProductionLineIDS||',',','||tp_pm_inproduction.ProductionLineId||',')>0 ";
-				parameters.Add(new OracleParameter(":ProductionLineIDS", OracleDbType.NVarchar2, se.LineIDS, ParameterDirection.Input));
-			}
-			if (!string.IsNullOrEmpty(se.ProcedureIDS))
-			{
-				selSql = selSql + " AND instr(','||:ProcedureIDS||',',','||tp_pm_inproduction.FlowProcedureId||',')>0 ";
-				parameters.Add(new OracleParameter(":ProcedureIDS", OracleDbType.NVarchar2, se.ProcedureIDS, ParameterDirection.Input));
-			}
-			if (!string.IsNullOrEmpty(se.GoodsCode))
-			{
-				selSql = selSql + " AND instr(','||:GoodsCode||',',','||tp_pm_inproduction.goodsCode||',')>0 ";
-				parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
-			}
-			selSql = selSql +
-					"group by " +
-					"     rollup(tp_pc_procedure.ProcedureID, " +
-					"            tp_pc_procedure.procedurecode, " +
-					"            tp_pc_procedure.procedurename, " +
-					"            tp_pm_inproduction.productionlineid, " +
-					"            tp_pm_inproduction.productionlinecode, " +
-					"            tp_pm_inproduction.productionlinename, " +
-					"            substr(TP_MST_GoodsType.Goodstypecode,0,6), " +
-					"            TP_MST_User.Usercode," +
-					"            TP_MST_Goods.Goodscode, " +
-					"            TP_MST_User.UserID," +
-					"            TP_MST_Goods.GoodsID, " +
-					"            TP_MST_GoodsType.Goodstypename)) temp ) temp2 " +
-					"where 1=1 " +
-					"and (Goodstypename!='--')" +
-					"or (Goodstypename='--' and UserCode='小计' and subGoodsTypecode!='--') " +
-					"or (Goodstypename='--' and UserCode='合计') " +
-					"or (Goodstypename='--' and UserCode='总计') )";
-			return selSql;
-		}
+            //"select " +
+            //"      ProcedureID," +
+            //"      procedurecode, " +
+            //"      decode(Usercode, '小计', '--', procedurename) procedurename, " +
+            //"      productionlineid, " +
+            //"      productionlinecode, " +
+            //"      decode(Usercode, '小计', '--', productionlinename) productionlinename, " +
+            //"      decode(ProcedureID,'总计','总计',Usercode) Usercode, " +
+            //"      subGoodsTypecode, " +
+            //"      decode(usercode,'小计',decode(subGoodsTypecode,'001001','大件','小件'),Goodscode)Goodscode, " +
+            //"      Goodstypename, " +
+            //"      InCount " +
+            #region 
+            /*
+            "select " +
+            "      ProcedureID," +
+            "      procedurecode, " +
+            "      decode(productionlinename, '总计', '--', procedurename) procedurename, " +
+            "      productionlineid, " +
+            "      productionlinecode, " +
+            "      productionlinename, " +
+            "      decode(productionlinename, '--', '--', Usercode) Usercode, " +
+            "      decode(productionlinename, '--', null, UserID) UserID, " +
+            "      subGoodsTypecode, " +
+            "      Goodsid," +
+            "      Goodscode, " +
+            "      Goodstypename, " +
+            "      InCount  from (" +
+
+            "select " +
+            "      ProcedureID," +
+            "      procedurecode, " +
+            "      decode(usercode,'合计','合计', decode(usercode,'小计','--',decode(usercode,'--','--',procedurename))) procedurename, " +
+            "      productionlineid, " +
+            "      productionlinecode, " +
+            "      decode(ProcedureID,'总计','总计',decode(usercode,'小计','--',productionlinename)) productionlinename, " +
+            "      decode(ProcedureID,'总计','--',Usercode) Usercode, " +
+            "      decode(ProcedureID,'总计',null,Userid) Userid, " +
+            "      subGoodsTypecode, " +
+            "      Goodsid," +
+            "      Goodscode, " +
+            "      decode(usercode,'小计','小计',Goodstypename)Goodstypename, " +
+            "      InCount " +
+            "from " +
+            "(" +
+            "      select " +
+            "      ProcedureID, " +
+            "      procedurecode, " +
+            "      procedurename, " +
+            "      productionlineid, " +
+            "      productionlinecode, " +
+            "      productionlinename, " +
+            "      decode(procedurecode,'--','合计',Usercode) Usercode, " +
+            "      decode(procedurecode,'--',null,Userid) Userid, " +
+            "      subGoodsTypecode," +
+            "      Goodsid," +
+            "      Goodscode," +
+            "      Goodstypename, " +
+            "      InCount " +
+            "      from  ( select " +
+            "      decode(grouping(tp_pc_procedure.ProcedureID),1,'总计',tp_pc_procedure.ProcedureID) ProcedureID," +
+            "      decode(grouping(tp_pc_procedure.procedurecode),1,'--',tp_pc_procedure.procedurecode) procedurecode, " +
+            "      decode(grouping(tp_pc_procedure.procedurename),1,'--',tp_pc_procedure.procedurename) procedurename, " +
+            "      decode(grouping(tp_pm_inproduction.productionlineid),1,'--',tp_pm_inproduction.productionlineid) productionlineid, " +
+            "      decode(grouping(tp_pm_inproduction.productionlinecode),1,'--',tp_pm_inproduction.productionlinecode) productionlinecode, " +
+            "      decode(grouping(tp_pm_inproduction.productionlinename),1,'--',tp_pm_inproduction.productionlinename) productionlinename, " +
+            "      decode(grouping(TP_MST_User.Usercode),1,'小计',TP_MST_User.Usercode) Usercode," +
+            "      decode(grouping(TP_MST_User.Userid),1,null,TP_MST_User.Userid) Userid," +
+            "      decode(grouping(substr(TP_MST_GoodsType.Goodstypecode,0,6)),1,'--',substr(TP_MST_GoodsType.Goodstypecode,0,6)) subGoodsTypecode," +
+            "      decode(grouping(TP_MST_Goods.Goodscode),1,'--',TP_MST_Goods.Goodscode) Goodscode," +
+            "      decode(grouping(TP_MST_Goods.Goodsid),1,'--',TP_MST_Goods.Goodsid) Goodsid," +
+            "      decode(grouping(TP_MST_GoodsType.Goodstypename),1,'--',TP_MST_GoodsType.Goodstypename) Goodstypename," +
+            "      count(barcode) as InCount " +
+            "      from tp_pm_inproduction " +
+            "      left join tp_pc_procedure" +
+            "      on tp_pm_inproduction.FlowProcedureID=tp_pc_procedure.ProcedureID" +
+            "      left join TP_MST_User on tp_pm_inproduction.userid=TP_MST_User.Userid left join TP_MST_Goods on tp_pm_inproduction.goodsid=TP_MST_Goods.Goodsid left join TP_MST_GoodsType on TP_MST_Goods.GoodsTypeID=TP_MST_GoodsType.GoodsTypeID" +
+            "  Where 1=1 " +
+            "  and tp_pm_inproduction.AccountID=:AccountID and tp_pm_inproduction.valueflag=1";
+            if (!string.IsNullOrEmpty(se.GoodsTypeIDS))
+            {
+            //selSql = selSql + " AND instr(','||:GoodsTypeIDS||',',','||TP_MST_GOODSTYPE.GOODSTYPECode||',')=1";
+            selSql = selSql + " AND instr(TP_MST_GOODSTYPE.GOODSTYPECode,:GoodsTypeIDS)=1";
+            parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.LineIDS))
+            {
+            selSql = selSql + " AND instr(','||:ProductionLineIDS||',',','||tp_pm_inproduction.ProductionLineId||',')>0 ";
+            parameters.Add(new OracleParameter(":ProductionLineIDS", OracleDbType.NVarchar2, se.LineIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.ProcedureIDS))
+            {
+            selSql = selSql + " AND instr(','||:ProcedureIDS||',',','||tp_pm_inproduction.FlowProcedureId||',')>0 ";
+            parameters.Add(new OracleParameter(":ProcedureIDS", OracleDbType.NVarchar2, se.ProcedureIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.GoodsCode))
+            {
+            selSql = selSql + " AND instr(','||:GoodsCode||',',','||tp_pm_inproduction.goodsCode||',')>0 ";
+            parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
+            }
+            selSql = selSql +
+            "group by " +
+            "     rollup(tp_pc_procedure.ProcedureID, " +
+            "            tp_pc_procedure.procedurecode, " +
+            "            tp_pc_procedure.procedurename, " +
+            "            tp_pm_inproduction.productionlineid, " +
+            "            tp_pm_inproduction.productionlinecode, " +
+            "            tp_pm_inproduction.productionlinename, " +
+            "            substr(TP_MST_GoodsType.Goodstypecode,0,6), " +
+            "            TP_MST_User.Usercode," +
+            "            TP_MST_Goods.Goodscode, " +
+            "            TP_MST_User.UserID," +
+            "            TP_MST_Goods.GoodsID, " +
+            "            TP_MST_GoodsType.Goodstypename)) temp ) temp2 " +
+            "where 1=1 " +
+            "and (Goodstypename!='--')" +
+            "or (Goodstypename='--' and UserCode='小计' and subGoodsTypecode!='--') " +
+            "or (Goodstypename='--' and UserCode='合计') " +
+            "or (Goodstypename='--' and UserCode='总计') )";
+            */
+            #endregion
+
+            string sqlString = "select t.productionlineid\n" +
+            "      ,t.productionlinecode\n" +
+            "      ,decode(gid\n" +
+            "             ,15\n" +
+            "             ,'总计【' || t.productionlinename || '】'\n" +
+            "             ,t.productionlinename) productionlinename\n" +
+            "      ,t.ProcedureID\n" +
+            "      ,t.procedurecode\n" +
+            "      ,decode(gid, 3, '合计【' || t.procedurename || '】', t.procedurename) procedurename\n" +
+            "      ,t.Goodstypeid2\n" +
+            "      ,t.Goodstypecode2\n" +
+            "      ,decode(gid, 1, '小计【' || t.Goodstypename2 || '】', t.Goodstypename2) Goodstypename2\n" +
+            "      ,t.Goodsid\n" +
+            "      ,t.Goodscode\n" +
+            "      ,t.InCount\n" +
+            "  from (select grouping_id(inp.productionlineid\n" +
+            "                          ,inp.ProcedureID\n" +
+            "                          ,gt2.Goodstypeid\n" +
+            "                          ,inp.Goodsid) gid\n" +
+            "              ,inp.productionlineid\n" +
+            "              ,pline.productionlinecode\n" +
+            "              ,pline.productionlinename\n" +
+            "              ,inp.ProcedureID\n" +
+            "              ,p.procedurecode\n" +
+            "              ,p.procedurename\n" +
+            "              ,gt2.GoodstypeID GoodstypeID2\n" +
+            "              ,gt2.Goodstypecode Goodstypecode2\n" +
+            "              ,gt2.Goodstypename Goodstypename2\n" +
+            "              ,inp.Goodsid\n" +
+            "              ,g.Goodscode\n" +
+            "              ,count(barcode) as InCount\n" +
+            "          from tp_pm_inproduction inp\n" +
+            "         inner join tp_pc_procedure p\n" +
+            "            on inp.ProcedureID = p.ProcedureID\n" +
+            "         inner join tp_pc_productionline pline\n" +
+            "            on pline.productionlineid = inp.productionlineid\n" +
+            "         inner join TP_MST_User u\n" +
+            "            on inp.userid = u.Userid\n" +
+            "         inner join TP_MST_Goods g\n" +
+            "            on inp.goodsid = g.Goodsid\n" +
+            "         inner join TP_MST_GoodsType gt\n" +
+            "            on g.GoodsTypeID = gt.GoodsTypeID\n" +
+            "         inner join TP_MST_GoodsType gt2\n" +
+            "            on gt.accountid = gt2.accountid\n" +
+            "           and substr(gt.Goodstypecode, 0, 6) = gt2.Goodstypecode\n" +
+            "         where inp.AccountID = 1\n" +
+            "           and inp.valueflag = '1'\n";
+
+            if (!string.IsNullOrEmpty(se.GoodsTypeIDS))
+            {
+                //selSql = selSql + " AND instr(','||:GoodsTypeIDS||',',','||TP_MST_GOODSTYPE.GOODSTYPECode||',')=1";
+                sqlString += " AND instr(gt.GOODSTYPECode,:GoodsTypeIDS)=1";
+                parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.LineIDS))
+            {
+                sqlString += " AND instr(','||:ProductionLineIDS||',',','||inp.ProductionLineId||',')>0 ";
+                parameters.Add(new OracleParameter(":ProductionLineIDS", OracleDbType.NVarchar2, se.LineIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.ProcedureIDS))
+            {
+                sqlString += " AND instr(','||:ProcedureIDS||',',','||inp.ProcedureId||',')>0 ";
+                parameters.Add(new OracleParameter(":ProcedureIDS", OracleDbType.NVarchar2, se.ProcedureIDS, ParameterDirection.Input));
+            }
+            if (!string.IsNullOrEmpty(se.GoodsCode))
+            {
+                sqlString += " AND instr(','||:GoodsCode||',',','||inp.goodsCode||',')>0 ";
+                parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
+            }
+
+            sqlString += "         group by grouping sets((inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename, inp.Goodsid, g.Goodscode),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename, gt2.Goodstypeid, gt2.Goodstypecode, gt2.Goodstypename),(inp.productionlineid, pline.productionlinecode, pline.productionlinename, inp.ProcedureID, p.procedurecode, p.procedurename),())) t";
+
+            return sqlString;
+        }
 
 
 		/// <summary>