产成品质量分析表&&出窑数量汇总表=>添加实验单相关查询

模具管理=>显示已经配置的商标，没有配置的为空&&商标配置=> 选中为默认商标时不更新&&商标的数据源查询产品档案配置的商标
首件检验=>增加删除按钮

DK.Client/PCModule/F_PC_0101_1_1.Designer.cs

@@ -28,14 +28,14 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PC_0101_1_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnDisable = new System.Windows.Forms.ToolStripButton();
             this.tsbtnStart = new System.Windows.Forms.ToolStripButton();
@@ -63,6 +63,15 @@
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.dgvGroutingLineDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.lblGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGroutingLine = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGroutingLine();
+            this.txtLineGMouldStatus = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.lblGMouldStatus = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.chkUserChoose = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+            this.txtSGC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.btnSetSGC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.GroutingLineDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Sel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.GroutingLineIDM = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -75,6 +84,7 @@
             this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GOODSNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsSpecification = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Logo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.StandardGroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldStatusM = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -84,15 +94,6 @@
             this.EndUsedDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.RecordRemarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.lblGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbGroutingLine = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGroutingLine();
-            this.txtLineGMouldStatus = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-            this.lblGMouldStatus = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.chkUserChoose = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.txtSGC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TXT_Digital();
-            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.btnSetSGC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.tsrOperate.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvGroutingLineDetail)).BeginInit();
             this.gbxCondition.SuspendLayout();
@@ -104,6 +105,7 @@
             this.tsrOperate.BackColor = System.Drawing.SystemColors.Control;
             this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.PCModule.Properties.Resources.functionbackground;
             this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnDisable,
             this.tsbtnStart,
@@ -130,9 +132,10 @@
             this.tsbtnClose});
             this.tsrOperate.Location = new System.Drawing.Point(0, 0);
             this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1315, 35);
+            this.tsrOperate.Size = new System.Drawing.Size(1972, 52);
             this.tsrOperate.TabIndex = 0;
             // 
             // tsbtnDisable
@@ -364,10 +367,10 @@
             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(1106, 15);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnSearch.Location = new System.Drawing.Point(1659, 22);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.Size = new System.Drawing.Size(128, 45);
             this.btnSearch.TabIndex = 3;
             this.btnSearch.Text = "查询(&Q)";
             this.btnSearch.UseVisualStyleBackColor = false;
@@ -380,10 +383,10 @@
             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(1197, 15);
-            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnClearCondition.Location = new System.Drawing.Point(1796, 22);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.Size = new System.Drawing.Size(128, 45);
             this.btnClearCondition.TabIndex = 4;
             this.btnClearCondition.Text = "清空条件(&C)";
             this.btnClearCondition.UseVisualStyleBackColor = false;
@@ -395,8 +398,8 @@
             this.dgvGroutingLineDetail.AllowUserToDeleteRows = false;
             this.dgvGroutingLineDetail.AllowUserToModifyRows = true;
             this.dgvGroutingLineDetail.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvGroutingLineDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvGroutingLineDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvGroutingLineDetail.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)));
@@ -407,14 +410,15 @@
             this.dgvGroutingLineDetail.ChildNodeColumnText = null;
             this.dgvGroutingLineDetail.ColumnDeep = 1;
             this.dgvGroutingLineDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvGroutingLineDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+            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.dgvGroutingLineDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvGroutingLineDetail.ColumnHeadersHeight = 34;
             this.dgvGroutingLineDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGroutingLineDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GroutingLineDetailID,
@@ -429,6 +433,7 @@
             this.GOODSCODE,
             this.GOODSNAME,
             this.GoodsSpecification,
+            this.Logo,
             this.StandardGroutingCount,
             this.GroutingCount,
             this.GMouldStatusM,
@@ -440,14 +445,14 @@
             this.RecordRemarks});
             this.dgvGroutingLineDetail.ColumnTreeView = null;
             this.dgvGroutingLineDetail.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)));
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvGroutingLineDetail.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvGroutingLineDetail.DefaultCellStyle = dataGridViewCellStyle7;
             this.dgvGroutingLineDetail.DynamicColumnName = "";
             this.dgvGroutingLineDetail.EnableHeadersVisualStyles = false;
             this.dgvGroutingLineDetail.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -460,7 +465,8 @@
             this.dgvGroutingLineDetail.IsOpenMergeCellFlag = false;
             this.dgvGroutingLineDetail.IsSubTotalFlag = false;
             this.dgvGroutingLineDetail.IsTopDeep = false;
-            this.dgvGroutingLineDetail.Location = new System.Drawing.Point(0, 124);
+            this.dgvGroutingLineDetail.Location = new System.Drawing.Point(0, 186);
+            this.dgvGroutingLineDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvGroutingLineDetail.MergeColumnNames = null;
             this.dgvGroutingLineDetail.MergeDetailColumnNames = null;
             this.dgvGroutingLineDetail.MergeDetailOnlyColumn = null;
@@ -470,11 +476,11 @@
             this.dgvGroutingLineDetail.RefreshAtHscroll = false;
             this.dgvGroutingLineDetail.RowHeadersWidth = 50;
             this.dgvGroutingLineDetail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvGroutingLineDetail.RowsDefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvGroutingLineDetail.RowsDefaultCellStyle = dataGridViewCellStyle8;
             this.dgvGroutingLineDetail.RowTemplate.Height = 21;
             this.dgvGroutingLineDetail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvGroutingLineDetail.Size = new System.Drawing.Size(1303, 402);
+            this.dgvGroutingLineDetail.Size = new System.Drawing.Size(1954, 603);
             this.dgvGroutingLineDetail.SortOrderColumnName = null;
             this.dgvGroutingLineDetail.TabIndex = 6;
             this.dgvGroutingLineDetail.Tag = true;
@@ -487,34 +493,186 @@
             this.dgvGroutingLineDetail.CurrentCellDirtyStateChanged += new System.EventHandler(this.dgvGroutingLineDetail_CurrentCellDirtyStateChanged);
             this.dgvGroutingLineDetail.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvGroutingLineDetail_RowPrePaint);
             // 
+            // 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.lblGroutingLine);
+            this.gbxCondition.Controls.Add(this.scbGroutingLine);
+            this.gbxCondition.Controls.Add(this.txtLineGMouldStatus);
+            this.gbxCondition.Controls.Add(this.lblGMouldStatus);
+            this.gbxCondition.Controls.Add(this.btnClearCondition);
+            this.gbxCondition.Controls.Add(this.btnSearch);
+            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, 58);
+            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbxCondition.Size = new System.Drawing.Size(1954, 75);
+            this.gbxCondition.TabIndex = 1;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // lblGroutingLine
+            // 
+            this.lblGroutingLine.AutoSize = true;
+            this.lblGroutingLine.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingLine.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingLine.Location = new System.Drawing.Point(18, 36);
+            this.lblGroutingLine.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGroutingLine.Name = "lblGroutingLine";
+            this.lblGroutingLine.Size = new System.Drawing.Size(62, 18);
+            this.lblGroutingLine.TabIndex = 41;
+            this.lblGroutingLine.Text = "成型线";
+            // 
+            // scbGroutingLine
+            // 
+            this.scbGroutingLine.CheckedData = null;
+            this.scbGroutingLine.DisplayMember = "GroutingLineCode";
+            this.scbGroutingLine.Location = new System.Drawing.Point(88, 30);
+            this.scbGroutingLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.scbGroutingLine.Name = "scbGroutingLine";
+            this.scbGroutingLine.Size = new System.Drawing.Size(200, 32);
+            this.scbGroutingLine.TabIndex = 40;
+            this.scbGroutingLine.SearchedItemChanged += new System.EventHandler(this.scbGroutingLine_SearchedItemChanged);
+            // 
+            // txtLineGMouldStatus
+            // 
+            this.txtLineGMouldStatus.BackColor = System.Drawing.SystemColors.Control;
+            this.txtLineGMouldStatus.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtLineGMouldStatus.ErrorMessage = "";
+            this.txtLineGMouldStatus.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtLineGMouldStatus.Location = new System.Drawing.Point(405, 32);
+            this.txtLineGMouldStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtLineGMouldStatus.Name = "txtLineGMouldStatus";
+            this.txtLineGMouldStatus.ReadOnly = true;
+            this.txtLineGMouldStatus.Size = new System.Drawing.Size(206, 28);
+            this.txtLineGMouldStatus.TabIndex = 2;
+            this.txtLineGMouldStatus.TextValue = "";
+            // 
+            // lblGMouldStatus
+            // 
+            this.lblGMouldStatus.AutoSize = true;
+            this.lblGMouldStatus.BackColor = System.Drawing.Color.Transparent;
+            this.lblGMouldStatus.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGMouldStatus.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGMouldStatus.Location = new System.Drawing.Point(297, 36);
+            this.lblGMouldStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGMouldStatus.Name = "lblGMouldStatus";
+            this.lblGMouldStatus.Size = new System.Drawing.Size(98, 18);
+            this.lblGMouldStatus.TabIndex = 1;
+            this.lblGMouldStatus.Text = "成型线状态";
+            // 
+            // chkUserChoose
+            // 
+            this.chkUserChoose.AutoSize = true;
+            this.chkUserChoose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkUserChoose.Location = new System.Drawing.Point(18, 147);
+            this.chkUserChoose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.chkUserChoose.Name = "chkUserChoose";
+            this.chkUserChoose.Size = new System.Drawing.Size(70, 22);
+            this.chkUserChoose.TabIndex = 2;
+            this.chkUserChoose.Text = "全选";
+            this.chkUserChoose.UseVisualStyleBackColor = true;
+            this.chkUserChoose.CheckedChanged += new System.EventHandler(this.chkUserChoose_CheckedChanged);
+            // 
+            // txtSGC
+            // 
+            this.txtSGC.AllowNegative = false;
+            this.txtSGC.BackColor = System.Drawing.SystemColors.Window;
+            this.txtSGC.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtSGC.ErrorMessage = "";
+            this.txtSGC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtSGC.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtSGC.Location = new System.Drawing.Point(231, 144);
+            this.txtSGC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtSGC.MaxValue = new decimal(new int[] {
+            999999,
+            0,
+            0,
+            0});
+            this.txtSGC.MinValue = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.txtSGC.Name = "txtSGC";
+            this.txtSGC.Size = new System.Drawing.Size(148, 28);
+            this.txtSGC.TabIndex = 4;
+            this.txtSGC.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+            this.txtSGC.TextValue = "";
+            this.txtSGC.Visible = false;
+            // 
+            // 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(106, 150);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.Size = new System.Drawing.Size(116, 18);
+            this.c_Label1.TabIndex = 3;
+            this.c_Label1.Text = "标准注浆次数";
+            this.c_Label1.Visible = false;
+            // 
+            // btnSetSGC
+            // 
+            this.btnSetSGC.BackColor = System.Drawing.Color.Gray;
+            this.btnSetSGC.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSetSGC.BackgroundImage")));
+            this.btnSetSGC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSetSGC.ForeColor = System.Drawing.Color.White;
+            this.btnSetSGC.Location = new System.Drawing.Point(390, 141);
+            this.btnSetSGC.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.btnSetSGC.Name = "btnSetSGC";
+            this.btnSetSGC.Size = new System.Drawing.Size(128, 38);
+            this.btnSetSGC.TabIndex = 5;
+            this.btnSetSGC.Text = "设置(&G)";
+            this.btnSetSGC.UseVisualStyleBackColor = false;
+            this.btnSetSGC.Visible = false;
+            // 
             // GroutingLineDetailID
             // 
             this.GroutingLineDetailID.DataPropertyName = "GroutingLineDetailID";
             this.GroutingLineDetailID.HeaderText = "成型生产线明细ID";
+            this.GroutingLineDetailID.MinimumWidth = 8;
             this.GroutingLineDetailID.Name = "GroutingLineDetailID";
             this.GroutingLineDetailID.ReadOnly = true;
             this.GroutingLineDetailID.Visible = false;
+            this.GroutingLineDetailID.Width = 150;
             // 
             // Sel
             // 
             this.Sel.DataPropertyName = "Sel";
             this.Sel.FalseValue = "0";
             this.Sel.HeaderText = "选择";
+            this.Sel.MinimumWidth = 8;
             this.Sel.Name = "Sel";
             this.Sel.TrueValue = "1";
+            this.Sel.Width = 150;
             // 
             // GroutingLineIDM
             // 
             this.GroutingLineIDM.DataPropertyName = "GroutingLineID";
             this.GroutingLineIDM.HeaderText = "成型生产线ID";
+            this.GroutingLineIDM.MinimumWidth = 8;
             this.GroutingLineIDM.Name = "GroutingLineIDM";
             this.GroutingLineIDM.ReadOnly = true;
             this.GroutingLineIDM.Visible = false;
+            this.GroutingLineIDM.Width = 150;
             // 
             // GroutingMouldCode
             // 
             this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
             this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.MinimumWidth = 8;
             this.GroutingMouldCode.Name = "GroutingMouldCode";
             this.GroutingMouldCode.ReadOnly = true;
             this.GroutingMouldCode.Width = 120;
@@ -523,85 +681,114 @@
             // 
             this.MouldID.DataPropertyName = "MouldID";
             this.MouldID.HeaderText = "MouldID";
+            this.MouldID.MinimumWidth = 8;
             this.MouldID.Name = "MouldID";
             this.MouldID.ReadOnly = true;
             this.MouldID.Visible = false;
+            this.MouldID.Width = 150;
             // 
             // MouldCode
             // 
             this.MouldCode.DataPropertyName = "MouldCode";
             this.MouldCode.HeaderText = "MouldCode";
+            this.MouldCode.MinimumWidth = 8;
             this.MouldCode.Name = "MouldCode";
             this.MouldCode.ReadOnly = true;
             this.MouldCode.Visible = false;
+            this.MouldCode.Width = 150;
             // 
             // MouldBarcode
             // 
             this.MouldBarcode.DataPropertyName = "MouldBarcode";
             this.MouldBarcode.HeaderText = "模具条码";
+            this.MouldBarcode.MinimumWidth = 8;
             this.MouldBarcode.Name = "MouldBarcode";
             this.MouldBarcode.ReadOnly = true;
+            this.MouldBarcode.Width = 150;
             // 
             // GMOULDSTATUSNAME
             // 
             this.GMOULDSTATUSNAME.DataPropertyName = "LineGMouldStatus";
             this.GMOULDSTATUSNAME.HeaderText = "成型线状态";
+            this.GMOULDSTATUSNAME.MinimumWidth = 8;
             this.GMOULDSTATUSNAME.Name = "GMOULDSTATUSNAME";
             this.GMOULDSTATUSNAME.ReadOnly = true;
             this.GMOULDSTATUSNAME.Visible = false;
+            this.GMOULDSTATUSNAME.Width = 150;
             // 
             // GoodsID
             // 
             this.GoodsID.DataPropertyName = "GoodsID";
             this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.MinimumWidth = 8;
             this.GoodsID.Name = "GoodsID";
             this.GoodsID.ReadOnly = true;
             this.GoodsID.Visible = false;
+            this.GoodsID.Width = 150;
             // 
             // GOODSCODE
             // 
             this.GOODSCODE.DataPropertyName = "GOODSCODE";
             this.GOODSCODE.HeaderText = "产品编码";
+            this.GOODSCODE.MinimumWidth = 8;
             this.GOODSCODE.Name = "GOODSCODE";
             this.GOODSCODE.ReadOnly = true;
+            this.GOODSCODE.Width = 150;
             // 
             // GOODSNAME
             // 
             this.GOODSNAME.DataPropertyName = "GOODSNAME";
             this.GOODSNAME.HeaderText = "产品名称";
+            this.GOODSNAME.MinimumWidth = 8;
             this.GOODSNAME.Name = "GOODSNAME";
             this.GOODSNAME.ReadOnly = true;
             this.GOODSNAME.Visible = false;
+            this.GOODSNAME.Width = 150;
             // 
             // GoodsSpecification
             // 
             this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
             this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.MinimumWidth = 8;
             this.GoodsSpecification.Name = "GoodsSpecification";
             this.GoodsSpecification.ReadOnly = true;
+            this.GoodsSpecification.Width = 150;
+            // 
+            // Logo
+            // 
+            this.Logo.DataPropertyName = "Logo";
+            this.Logo.HeaderText = "产品商标";
+            this.Logo.MinimumWidth = 8;
+            this.Logo.Name = "Logo";
+            this.Logo.Width = 150;
             // 
             // StandardGroutingCount
             // 
             this.StandardGroutingCount.DataPropertyName = "StandardGroutingCount";
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
+            this.StandardGroutingCount.MinimumWidth = 8;
             this.StandardGroutingCount.Name = "StandardGroutingCount";
             this.StandardGroutingCount.ReadOnly = true;
+            this.StandardGroutingCount.Width = 150;
             // 
             // GroutingCount
             // 
             this.GroutingCount.DataPropertyName = "GroutingCount";
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle4;
             this.GroutingCount.HeaderText = "注浆次数";
+            this.GroutingCount.MinimumWidth = 8;
             this.GroutingCount.Name = "GroutingCount";
             this.GroutingCount.ReadOnly = true;
+            this.GroutingCount.Width = 150;
             // 
             // GMouldStatusM
             // 
             this.GMouldStatusM.DataPropertyName = "GMOULDSTATUSNAME";
             this.GMouldStatusM.HeaderText = "模具状态";
+            this.GMouldStatusM.MinimumWidth = 8;
             this.GMouldStatusM.Name = "GMouldStatusM";
             this.GMouldStatusM.ReadOnly = true;
             this.GMouldStatusM.Width = 120;
@@ -611,24 +798,29 @@
             this.TESTMOULDFLAG.DataPropertyName = "TESTMOULDFLAG";
             this.TESTMOULDFLAG.FalseValue = "0";
             this.TESTMOULDFLAG.HeaderText = "试验标识";
+            this.TESTMOULDFLAG.MinimumWidth = 8;
             this.TESTMOULDFLAG.Name = "TESTMOULDFLAG";
             this.TESTMOULDFLAG.ReadOnly = true;
             this.TESTMOULDFLAG.TrueValue = "1";
+            this.TESTMOULDFLAG.Width = 150;
             // 
             // RreasonRemarks
             // 
             this.RreasonRemarks.DataPropertyName = "RreasonRemarks";
             this.RreasonRemarks.HeaderText = "备注";
+            this.RreasonRemarks.MinimumWidth = 8;
             this.RreasonRemarks.Name = "RreasonRemarks";
             this.RreasonRemarks.ReadOnly = true;
+            this.RreasonRemarks.Width = 150;
             // 
             // BeginUsedDateM
             // 
             this.BeginUsedDateM.DataPropertyName = "BeginUsedDate";
-            dataGridViewCellStyle13.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle13.NullValue = null;
-            this.BeginUsedDateM.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle5.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle5.NullValue = null;
+            this.BeginUsedDateM.DefaultCellStyle = dataGridViewCellStyle5;
             this.BeginUsedDateM.HeaderText = "开始使用日期";
+            this.BeginUsedDateM.MinimumWidth = 8;
             this.BeginUsedDateM.Name = "BeginUsedDateM";
             this.BeginUsedDateM.ReadOnly = true;
             this.BeginUsedDateM.Width = 120;
@@ -636,168 +828,38 @@
             // EndUsedDate
             // 
             this.EndUsedDate.DataPropertyName = "EndUsedDate";
-            dataGridViewCellStyle14.Format = "yyyy-MM-dd";
-            this.EndUsedDate.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle6.Format = "yyyy-MM-dd";
+            this.EndUsedDate.DefaultCellStyle = dataGridViewCellStyle6;
             this.EndUsedDate.HeaderText = "结束使用日期";
+            this.EndUsedDate.MinimumWidth = 8;
             this.EndUsedDate.Name = "EndUsedDate";
             this.EndUsedDate.ReadOnly = true;
+            this.EndUsedDate.Width = 150;
             // 
             // GMouldStatus
             // 
             this.GMouldStatus.DataPropertyName = "GMouldStatus";
             this.GMouldStatus.HeaderText = "GMouldStatus";
+            this.GMouldStatus.MinimumWidth = 8;
             this.GMouldStatus.Name = "GMouldStatus";
             this.GMouldStatus.ReadOnly = true;
             this.GMouldStatus.Visible = false;
+            this.GMouldStatus.Width = 150;
             // 
             // RecordRemarks
             // 
             this.RecordRemarks.DataPropertyName = "RecordRemarks";
             this.RecordRemarks.HeaderText = "操作备注";
+            this.RecordRemarks.MinimumWidth = 8;
             this.RecordRemarks.Name = "RecordRemarks";
             this.RecordRemarks.ReadOnly = true;
-            // 
-            // 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.lblGroutingLine);
-            this.gbxCondition.Controls.Add(this.scbGroutingLine);
-            this.gbxCondition.Controls.Add(this.txtLineGMouldStatus);
-            this.gbxCondition.Controls.Add(this.lblGMouldStatus);
-            this.gbxCondition.Controls.Add(this.btnClearCondition);
-            this.gbxCondition.Controls.Add(this.btnSearch);
-            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, 39);
-            this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1303, 50);
-            this.gbxCondition.TabIndex = 1;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
-            // 
-            // lblGroutingLine
-            // 
-            this.lblGroutingLine.AutoSize = true;
-            this.lblGroutingLine.BackColor = System.Drawing.Color.Transparent;
-            this.lblGroutingLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblGroutingLine.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGroutingLine.Location = new System.Drawing.Point(12, 24);
-            this.lblGroutingLine.Name = "lblGroutingLine";
-            this.lblGroutingLine.Size = new System.Drawing.Size(41, 12);
-            this.lblGroutingLine.TabIndex = 41;
-            this.lblGroutingLine.Text = "成型线";
-            // 
-            // scbGroutingLine
-            // 
-            this.scbGroutingLine.CheckedData = null;
-            this.scbGroutingLine.DisplayMember = "GroutingLineCode";
-            this.scbGroutingLine.Location = new System.Drawing.Point(59, 20);
-            this.scbGroutingLine.Name = "scbGroutingLine";
-            this.scbGroutingLine.Size = new System.Drawing.Size(133, 21);
-            this.scbGroutingLine.TabIndex = 40;
-            this.scbGroutingLine.SearchedItemChanged += new System.EventHandler(this.scbGroutingLine_SearchedItemChanged);
-            // 
-            // txtLineGMouldStatus
-            // 
-            this.txtLineGMouldStatus.BackColor = System.Drawing.SystemColors.Control;
-            this.txtLineGMouldStatus.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtLineGMouldStatus.ErrorMessage = "";
-            this.txtLineGMouldStatus.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtLineGMouldStatus.Location = new System.Drawing.Point(270, 21);
-            this.txtLineGMouldStatus.Name = "txtLineGMouldStatus";
-            this.txtLineGMouldStatus.ReadOnly = true;
-            this.txtLineGMouldStatus.Size = new System.Drawing.Size(139, 21);
-            this.txtLineGMouldStatus.TabIndex = 2;
-            this.txtLineGMouldStatus.TextValue = "";
-            // 
-            // lblGMouldStatus
-            // 
-            this.lblGMouldStatus.AutoSize = true;
-            this.lblGMouldStatus.BackColor = System.Drawing.Color.Transparent;
-            this.lblGMouldStatus.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblGMouldStatus.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGMouldStatus.Location = new System.Drawing.Point(198, 24);
-            this.lblGMouldStatus.Name = "lblGMouldStatus";
-            this.lblGMouldStatus.Size = new System.Drawing.Size(65, 12);
-            this.lblGMouldStatus.TabIndex = 1;
-            this.lblGMouldStatus.Text = "成型线状态";
-            // 
-            // chkUserChoose
-            // 
-            this.chkUserChoose.AutoSize = true;
-            this.chkUserChoose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkUserChoose.Location = new System.Drawing.Point(12, 98);
-            this.chkUserChoose.Name = "chkUserChoose";
-            this.chkUserChoose.Size = new System.Drawing.Size(48, 16);
-            this.chkUserChoose.TabIndex = 2;
-            this.chkUserChoose.Text = "全选";
-            this.chkUserChoose.UseVisualStyleBackColor = true;
-            this.chkUserChoose.CheckedChanged += new System.EventHandler(this.chkUserChoose_CheckedChanged);
-            // 
-            // txtSGC
-            // 
-            this.txtSGC.AllowNegative = false;
-            this.txtSGC.BackColor = System.Drawing.SystemColors.Window;
-            this.txtSGC.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtSGC.ErrorMessage = "";
-            this.txtSGC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtSGC.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtSGC.Location = new System.Drawing.Point(154, 96);
-            this.txtSGC.MaxValue = new decimal(new int[] {
-            999999,
-            0,
-            0,
-            0});
-            this.txtSGC.MinValue = new decimal(new int[] {
-            0,
-            0,
-            0,
-            0});
-            this.txtSGC.Name = "txtSGC";
-            this.txtSGC.Size = new System.Drawing.Size(100, 21);
-            this.txtSGC.TabIndex = 4;
-            this.txtSGC.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.txtSGC.TextValue = "";
-            this.txtSGC.Visible = false;
-            // 
-            // 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(71, 100);
-            this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(77, 12);
-            this.c_Label1.TabIndex = 3;
-            this.c_Label1.Text = "标准注浆次数";
-            this.c_Label1.Visible = false;
-            // 
-            // btnSetSGC
-            // 
-            this.btnSetSGC.BackColor = System.Drawing.Color.Gray;
-            this.btnSetSGC.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSetSGC.BackgroundImage")));
-            this.btnSetSGC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSetSGC.ForeColor = System.Drawing.Color.White;
-            this.btnSetSGC.Location = new System.Drawing.Point(260, 94);
-            this.btnSetSGC.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnSetSGC.Name = "btnSetSGC";
-            this.btnSetSGC.Size = new System.Drawing.Size(85, 25);
-            this.btnSetSGC.TabIndex = 5;
-            this.btnSetSGC.Text = "设置(&G)";
-            this.btnSetSGC.UseVisualStyleBackColor = false;
-            this.btnSetSGC.Visible = false;
+            this.RecordRemarks.Width = 150;
             // 
             // F_PC_0101_1_1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1315, 526);
+            this.ClientSize = new System.Drawing.Size(1972, 789);
             this.Controls.Add(this.btnSetSGC);
             this.Controls.Add(this.c_Label1);
             this.Controls.Add(this.txtSGC);
@@ -806,6 +868,7 @@
             this.Controls.Add(this.tsrOperate);
             this.Controls.Add(this.gbxCondition);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "F_PC_0101_1_1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "模具管理";
@@ -858,6 +921,8 @@
 		private Basics.BaseControls.C_Label lblGroutingLine;
 		private Controls.SearchBox.ScbGroutingLine scbGroutingLine;
         private System.Windows.Forms.ToolStripButton tsbtnTestFlag;
+        private System.Windows.Forms.ToolStripButton tsbtnTestFlagHistory;
+        private System.Windows.Forms.ToolStripButton ConfigureTrademark;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineDetailID;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Sel;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineIDM;
@@ -870,6 +935,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
         private System.Windows.Forms.DataGridViewTextBoxColumn GOODSNAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsSpecification;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Logo;
         private System.Windows.Forms.DataGridViewTextBoxColumn StandardGroutingCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatusM;
@@ -879,7 +945,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn EndUsedDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatus;
         private System.Windows.Forms.DataGridViewTextBoxColumn RecordRemarks;
-        private System.Windows.Forms.ToolStripButton tsbtnTestFlagHistory;
-        private System.Windows.Forms.ToolStripButton ConfigureTrademark;
     }
 }

DK.Client/PCModule/F_PC_0101_1_1.cs

@@ -1543,8 +1543,6 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
         {
             try
             {
-
-
                 if (this.dgvGroutingLineDetail.CurrentCell != null)
                 {
                     DataTable dt = this.dgvGroutingLineDetail.DataSource as DataTable;

DK.Client/PCModule/F_PC_0101_1_1.resx

@@ -124,17 +124,19 @@
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="Sel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -155,6 +157,9 @@
   <metadata name="GoodsSpecification.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Logo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="StandardGroutingCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -214,22 +219,23 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSetSGC.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Client/PCModule/F_PC_0101_1_8.Designer.cs

@@ -73,9 +73,10 @@
             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(727, 410);
+            this.btnSave.Location = new System.Drawing.Point(1090, 615);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.Size = new System.Drawing.Size(128, 45);
             this.btnSave.TabIndex = 8;
             this.btnSave.Text = "保存(&S)";
             this.btnSave.UseVisualStyleBackColor = false;
@@ -107,6 +108,7 @@
             dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvGroutingLineDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvGroutingLineDetail.ColumnHeadersHeight = 34;
             this.dgvGroutingLineDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvGroutingLineDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GroutingLineDetailID,
@@ -149,7 +151,8 @@
             this.dgvGroutingLineDetail.IsOpenMergeCellFlag = false;
             this.dgvGroutingLineDetail.IsSubTotalFlag = false;
             this.dgvGroutingLineDetail.IsTopDeep = false;
-            this.dgvGroutingLineDetail.Location = new System.Drawing.Point(12, 46);
+            this.dgvGroutingLineDetail.Location = new System.Drawing.Point(18, 69);
+            this.dgvGroutingLineDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvGroutingLineDetail.MergeColumnNames = null;
             this.dgvGroutingLineDetail.MergeDetailColumnNames = null;
             this.dgvGroutingLineDetail.MergeDetailOnlyColumn = null;
@@ -162,7 +165,7 @@
             dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvGroutingLineDetail.RowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvGroutingLineDetail.RowTemplate.Height = 21;
-            this.dgvGroutingLineDetail.Size = new System.Drawing.Size(888, 358);
+            this.dgvGroutingLineDetail.Size = new System.Drawing.Size(1332, 537);
             this.dgvGroutingLineDetail.SortOrderColumnName = null;
             this.dgvGroutingLineDetail.TabIndex = 5;
             this.dgvGroutingLineDetail.Tag = true;
@@ -179,9 +182,10 @@
             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(816, 410);
+            this.btnCancel.Location = new System.Drawing.Point(1224, 615);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.Size = new System.Drawing.Size(128, 45);
             this.btnCancel.TabIndex = 9;
             this.btnCancel.Text = "关闭";
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -193,11 +197,12 @@
             this.txtGroutingLineCode.BackgroundColor = System.Drawing.SystemColors.Window;
             this.txtGroutingLineCode.ErrorMessage = "";
             this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGroutingLineCode.Location = new System.Drawing.Point(81, 14);
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(122, 21);
+            this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingLineCode.MaxLength = 200;
             this.txtGroutingLineCode.Name = "txtGroutingLineCode";
             this.txtGroutingLineCode.ReadOnly = true;
-            this.txtGroutingLineCode.Size = new System.Drawing.Size(120, 21);
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(178, 28);
             this.txtGroutingLineCode.TabIndex = 1;
             this.txtGroutingLineCode.TextValue = "";
             // 
@@ -207,9 +212,10 @@
             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(12, 18);
+            this.c_Label1.Location = new System.Drawing.Point(18, 27);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(65, 12);
+            this.c_Label1.Size = new System.Drawing.Size(98, 18);
             this.c_Label1.TabIndex = 0;
             this.c_Label1.Text = "成型线编码";
             // 
@@ -219,9 +225,10 @@
             this.txtDateStart.Enabled = false;
             this.txtDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txtDateStart.Location = new System.Drawing.Point(266, 14);
+            this.txtDateStart.Location = new System.Drawing.Point(399, 21);
+            this.txtDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtDateStart.Name = "txtDateStart";
-            this.txtDateStart.Size = new System.Drawing.Size(100, 21);
+            this.txtDateStart.Size = new System.Drawing.Size(148, 28);
             this.txtDateStart.TabIndex = 3;
             // 
             // lblTimes
@@ -230,9 +237,10 @@
             this.lblTimes.BackColor = System.Drawing.Color.Transparent;
             this.lblTimes.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblTimes.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblTimes.Location = new System.Drawing.Point(207, 18);
+            this.lblTimes.Location = new System.Drawing.Point(310, 27);
+            this.lblTimes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblTimes.Name = "lblTimes";
-            this.lblTimes.Size = new System.Drawing.Size(53, 12);
+            this.lblTimes.Size = new System.Drawing.Size(80, 18);
             this.lblTimes.TabIndex = 2;
             this.lblTimes.Text = "操作时间";
             // 
@@ -243,9 +251,10 @@
             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(12, 410);
+            this.btnAdaptive.Location = new System.Drawing.Point(18, 615);
+            this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAdaptive.Name = "btnAdaptive";
-            this.btnAdaptive.Size = new System.Drawing.Size(85, 30);
+            this.btnAdaptive.Size = new System.Drawing.Size(128, 45);
             this.btnAdaptive.TabIndex = 6;
             this.btnAdaptive.Text = "自适应列宽";
             this.btnAdaptive.UseVisualStyleBackColor = false;
@@ -255,22 +264,27 @@
             // 
             this.GroutingLineDetailID.DataPropertyName = "GroutingLineDetailID";
             this.GroutingLineDetailID.HeaderText = "成型生产线明细ID";
+            this.GroutingLineDetailID.MinimumWidth = 8;
             this.GroutingLineDetailID.Name = "GroutingLineDetailID";
             this.GroutingLineDetailID.ReadOnly = true;
             this.GroutingLineDetailID.Visible = false;
+            this.GroutingLineDetailID.Width = 150;
             // 
             // GroutingLineIDM
             // 
             this.GroutingLineIDM.DataPropertyName = "GroutingLineID";
             this.GroutingLineIDM.HeaderText = "成型生产线ID";
+            this.GroutingLineIDM.MinimumWidth = 8;
             this.GroutingLineIDM.Name = "GroutingLineIDM";
             this.GroutingLineIDM.ReadOnly = true;
             this.GroutingLineIDM.Visible = false;
+            this.GroutingLineIDM.Width = 150;
             // 
             // GroutingMouldCode
             // 
             this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
             this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.MinimumWidth = 8;
             this.GroutingMouldCode.Name = "GroutingMouldCode";
             this.GroutingMouldCode.ReadOnly = true;
             this.GroutingMouldCode.Width = 120;
@@ -279,53 +293,67 @@
             // 
             this.MouldCode.DataPropertyName = "MouldCode";
             this.MouldCode.HeaderText = "MouldCode";
+            this.MouldCode.MinimumWidth = 8;
             this.MouldCode.Name = "MouldCode";
             this.MouldCode.ReadOnly = true;
             this.MouldCode.Visible = false;
+            this.MouldCode.Width = 150;
             // 
             // MouldID
             // 
             this.MouldID.HeaderText = "MouldID";
+            this.MouldID.MinimumWidth = 8;
             this.MouldID.Name = "MouldID";
             this.MouldID.ReadOnly = true;
             this.MouldID.Visible = false;
+            this.MouldID.Width = 150;
             // 
             // MouldBarcode
             // 
             this.MouldBarcode.DataPropertyName = "MouldBarcode";
             this.MouldBarcode.HeaderText = "模具条码";
+            this.MouldBarcode.MinimumWidth = 8;
             this.MouldBarcode.Name = "MouldBarcode";
             this.MouldBarcode.ReadOnly = true;
+            this.MouldBarcode.Width = 150;
             // 
             // GoodsID
             // 
             this.GoodsID.DataPropertyName = "GoodsID";
             this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.MinimumWidth = 8;
             this.GoodsID.Name = "GoodsID";
             this.GoodsID.ReadOnly = true;
             this.GoodsID.Visible = false;
+            this.GoodsID.Width = 150;
             // 
             // GOODSCODE
             // 
             this.GOODSCODE.DataPropertyName = "GOODSCODE";
             this.GOODSCODE.HeaderText = "产品编码";
+            this.GOODSCODE.MinimumWidth = 8;
             this.GOODSCODE.Name = "GOODSCODE";
             this.GOODSCODE.ReadOnly = true;
+            this.GOODSCODE.Width = 150;
             // 
             // GOODSNAME
             // 
             this.GOODSNAME.DataPropertyName = "GOODSNAME";
             this.GOODSNAME.HeaderText = "产品名称";
+            this.GOODSNAME.MinimumWidth = 8;
             this.GOODSNAME.Name = "GOODSNAME";
             this.GOODSNAME.ReadOnly = true;
             this.GOODSNAME.Visible = false;
+            this.GOODSNAME.Width = 150;
             // 
             // GoodsSpecification
             // 
             this.GoodsSpecification.DataPropertyName = "GoodsSpecification";
             this.GoodsSpecification.HeaderText = "产品规格";
+            this.GoodsSpecification.MinimumWidth = 8;
             this.GoodsSpecification.Name = "GoodsSpecification";
             this.GoodsSpecification.ReadOnly = true;
+            this.GoodsSpecification.Width = 150;
             // 
             // StandardGroutingCount
             // 
@@ -333,8 +361,10 @@
             dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
             this.StandardGroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
             this.StandardGroutingCount.HeaderText = "标准注浆次数";
+            this.StandardGroutingCount.MinimumWidth = 8;
             this.StandardGroutingCount.Name = "StandardGroutingCount";
             this.StandardGroutingCount.ReadOnly = true;
+            this.StandardGroutingCount.Width = 150;
             // 
             // GroutingCount
             // 
@@ -347,6 +377,7 @@
             0,
             0,
             0});
+            this.GroutingCount.MinimumWidth = 8;
             this.GroutingCount.MinValue = new decimal(new int[] {
             0,
             0,
@@ -357,11 +388,13 @@
             this.GroutingCount.ReadOnly = true;
             this.GroutingCount.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.GroutingCount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.GroutingCount.Width = 150;
             // 
             // GMouldStatusM
             // 
             this.GMouldStatusM.DataPropertyName = "GMOULDSTATUSNAME";
             this.GMouldStatusM.HeaderText = "模具状态";
+            this.GMouldStatusM.MinimumWidth = 8;
             this.GMouldStatusM.Name = "GMouldStatusM";
             this.GMouldStatusM.ReadOnly = true;
             this.GMouldStatusM.Width = 120;
@@ -370,8 +403,10 @@
             // 
             this.RreasonRemarks.DataPropertyName = "RreasonRemarks";
             this.RreasonRemarks.HeaderText = "备注";
+            this.RreasonRemarks.MinimumWidth = 8;
             this.RreasonRemarks.Name = "RreasonRemarks";
             this.RreasonRemarks.ReadOnly = true;
+            this.RreasonRemarks.Width = 150;
             // 
             // BeginUsedDateM
             // 
@@ -380,6 +415,7 @@
             dataGridViewCellStyle5.NullValue = null;
             this.BeginUsedDateM.DefaultCellStyle = dataGridViewCellStyle5;
             this.BeginUsedDateM.HeaderText = "开始使用日期";
+            this.BeginUsedDateM.MinimumWidth = 8;
             this.BeginUsedDateM.Name = "BeginUsedDateM";
             this.BeginUsedDateM.ReadOnly = true;
             this.BeginUsedDateM.Visible = false;
@@ -389,22 +425,27 @@
             // 
             this.EndUsedDate.DataPropertyName = "EndUsedDate";
             this.EndUsedDate.HeaderText = "结束使用日期";
+            this.EndUsedDate.MinimumWidth = 8;
             this.EndUsedDate.Name = "EndUsedDate";
             this.EndUsedDate.ReadOnly = true;
             this.EndUsedDate.Visible = false;
+            this.EndUsedDate.Width = 150;
             // 
             // GMouldStatus
             // 
             this.GMouldStatus.DataPropertyName = "GMouldStatus";
             this.GMouldStatus.HeaderText = "GMouldStatus";
+            this.GMouldStatus.MinimumWidth = 8;
             this.GMouldStatus.Name = "GMouldStatus";
             this.GMouldStatus.ReadOnly = true;
             this.GMouldStatus.Visible = false;
+            this.GMouldStatus.Width = 150;
             // 
             // Trademark
             // 
-            this.Trademark.DataPropertyName = "Trademark";
+            this.Trademark.DataPropertyName = "LOGOID";
             this.Trademark.HeaderText = "商标";
+            this.Trademark.MinimumWidth = 8;
             this.Trademark.Name = "Trademark";
             this.Trademark.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.Trademark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
@@ -412,10 +453,10 @@
             // 
             // F_PC_0101_1_8
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(912, 465);
+            this.ClientSize = new System.Drawing.Size(1368, 698);
             this.Controls.Add(this.btnAdaptive);
             this.Controls.Add(this.txtGroutingLineCode);
             this.Controls.Add(this.c_Label1);
@@ -425,6 +466,7 @@
             this.Controls.Add(this.dgvGroutingLineDetail);
             this.Controls.Add(this.btnSave);
             this.IsSaveFormSize = false;
+            this.Margin = new System.Windows.Forms.Padding(9, 9, 9, 9);
             this.Name = "F_PC_0101_1_8";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "配置商标";

DK.Client/PCModule/F_PC_0101_1_8.cs

@@ -15,7 +15,9 @@ using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.WCF.Proxys;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.WCF.DataModels;
-using Dongke.IBOSS.PRD.Client.Controls;  
+using Dongke.IBOSS.PRD.Client.Controls;
+using System.Linq;
+
 namespace Dongke.IBOSS.PRD.Client.PCModule
 {
     public partial class F_PC_0101_1_8 : DKFormBase
@@ -92,18 +94,14 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                     MessageBox.Show("没有选择任何数据", this.Text,
                      MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     return;
-                }
-                 //List<Dictionary<string, string>> respone = new List<Dictionary<string, string>>();
+                } 
                 string respone = "[";
                 for (int i = 0; i < dtName.Rows.Count; i++)
                 {
-                    //respone.Add(new Dictionary<string, string>()
-                    //{
-                    //  { "GROUTINGLINEDETAILID",dtName.Rows[i]["GROUTINGLINEDETAILID"].ToString()},
-                    //  { "LOGOID",dtName.Rows[i]["Trademark"].ToString()}
-                    //});
+                    
                     respone += $"{{\"GROUTINGLINEDETAILID\":\"{dtName.Rows[i]["GROUTINGLINEDETAILID"]}\"," +
-                                $"\"LOGOID\":\"{dtName.Rows[i]["Trademark"]}\"}}";
+                                $"\"LOGOID\":\"{dtName.Rows[i]["LOGOID"]}\"," +
+                                $"\"GOODSID\":\"{dtName.Rows[i]["GOODSID"]}\"}}";
 
                     // 如果不是最后一个元素，则添加逗号
                     if (i < dtName.Rows.Count - 1)
@@ -122,11 +120,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 });
                 if (sre.Status== Constant.ServiceResultStatus.Success)
                 {
-                    MessageBox.Show("商标变更成功", this.Text, MessageBoxButtons.OK);
+                    MessageBox.Show("商标配置成功", this.Text, MessageBoxButtons.OK);
                 }
                 else
                 {
-                    MessageBox.Show("商标变更失败", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    MessageBox.Show("商标配置失败", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
             }
             catch (Exception ex)
@@ -151,7 +149,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                 this.txtDateStart.Value = accountDate; 
                 this.Trademark.DataSource = ReadTrademark();
                 this.Trademark.ValueMember = "LOGOID";
-                this.Trademark.DisplayMember = "LOGONAME";
+                this.Trademark.DisplayMember = "LOGO";
                 _dtBindSource.Columns.Add("Trademark", typeof(decimal));
                 this.dgvGroutingLineDetail.DataSource = _dtBindSource;
                 // 设置可输入单元格的颜色
@@ -202,11 +200,17 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
             DataTable result = new DataTable();
             try
             {
+                DataTable dt = _dtBindSource;
+                var distinctGoodsIds = dt.AsEnumerable()
+                    .Select(row => row.Field<decimal>("GoodsID"))
+                    .Distinct()
+                    .Select(id => id.ToString());
                 ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
                 {
                     ClientRequestEntity cre = new ClientRequestEntity();
                     cre.NameSpace = "F_PC_0101_1_8";
-                    cre.Name = "ReadTrademark"; 
+                    cre.Name = "ReadTrademark";
+                    cre.Properties["goodsid"]= string.Join(",", distinctGoodsIds);
                     return SystemModuleProxy.Service.DoRequest(cre);
                 });
                 if (sre.Data.Tables[0].Rows.Count!=0)

DK.Client/PCModule/F_PC_0101_1_8.resx

@@ -121,9 +121,10 @@
   <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="MouldID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -150,17 +151,19 @@
   <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <data name="btnAdaptive.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@@ -116,6 +116,8 @@
             this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dropTestFormFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.txtTestFormFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.tapReportModuleDetail.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRptProcedureDetail)).BeginInit();
             this.tsrOperate.SuspendLayout();
@@ -128,10 +130,10 @@
             // tapReportModuleDetail
             // 
             this.tapReportModuleDetail.Controls.Add(this.dgvRptProcedureDetail);
-            this.tapReportModuleDetail.Location = new System.Drawing.Point(4, 22);
+            this.tapReportModuleDetail.Location = new System.Drawing.Point(4, 28);
             this.tapReportModuleDetail.Margin = new System.Windows.Forms.Padding(0);
             this.tapReportModuleDetail.Name = "tapReportModuleDetail";
-            this.tapReportModuleDetail.Size = new System.Drawing.Size(1299, 423);
+            this.tapReportModuleDetail.Size = new System.Drawing.Size(1900, 642);
             this.tapReportModuleDetail.TabIndex = 1;
             this.tapReportModuleDetail.Text = "出窑数量汇总明细";
             this.tapReportModuleDetail.UseVisualStyleBackColor = true;
@@ -160,6 +162,7 @@
             dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvRptProcedureDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvRptProcedureDetail.ColumnHeadersHeight = 34;
             this.dgvRptProcedureDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvRptProcedureDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colProcedureName,
@@ -188,6 +191,7 @@
             this.dgvRptProcedureDetail.EnableHeadersVisualStyles = false;
             this.dgvRptProcedureDetail.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvRptProcedureDetail.FormatQuantityColumns = null;
+            this.dgvRptProcedureDetail.HasNode = false;
             this.dgvRptProcedureDetail.HorizontalMergeColumn = null;
             this.dgvRptProcedureDetail.IsAutoCountSum = true;
             this.dgvRptProcedureDetail.IsAutoResizeColumns = false;
@@ -211,26 +215,31 @@
             this.dgvRptProcedureDetail.RowsDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvRptProcedureDetail.RowTemplate.Height = 21;
             this.dgvRptProcedureDetail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRptProcedureDetail.Size = new System.Drawing.Size(1299, 423);
+            this.dgvRptProcedureDetail.Size = new System.Drawing.Size(1900, 642);
             this.dgvRptProcedureDetail.SortOrderColumnName = null;
             this.dgvRptProcedureDetail.TabIndex = 30;
             this.dgvRptProcedureDetail.Tag = true;
             this.dgvRptProcedureDetail.TotalSumColumns = null;
             this.dgvRptProcedureDetail.ViewRowFilter = "";
+            this.dgvRptProcedureDetail.VirtualNodes = false;
             // 
             // colProcedureName
             // 
             this.colProcedureName.DataPropertyName = "ProcedureName";
             this.colProcedureName.HeaderText = "生产工序";
+            this.colProcedureName.MinimumWidth = 8;
             this.colProcedureName.Name = "colProcedureName";
             this.colProcedureName.ReadOnly = true;
+            this.colProcedureName.Width = 150;
             // 
             // UserCode
             // 
             this.UserCode.DataPropertyName = "UserCode";
             this.UserCode.HeaderText = "生产工号";
+            this.UserCode.MinimumWidth = 8;
             this.UserCode.Name = "UserCode";
             this.UserCode.ReadOnly = true;
+            this.UserCode.Width = 150;
             // 
             // OverDate
             // 
@@ -239,44 +248,56 @@
             dataGridViewCellStyle3.Format = "yyyy-MM-dd";
             this.OverDate.DefaultCellStyle = dataGridViewCellStyle3;
             this.OverDate.HeaderText = "生产日期";
+            this.OverDate.MinimumWidth = 8;
             this.OverDate.Name = "OverDate";
             this.OverDate.ReadOnly = true;
             this.OverDate.Visible = false;
+            this.OverDate.Width = 150;
             // 
             // colGoodsTypeName
             // 
             this.colGoodsTypeName.DataPropertyName = "GoodsTypeName";
             this.colGoodsTypeName.HeaderText = "产品类别";
+            this.colGoodsTypeName.MinimumWidth = 8;
             this.colGoodsTypeName.Name = "colGoodsTypeName";
             this.colGoodsTypeName.ReadOnly = true;
+            this.colGoodsTypeName.Width = 150;
             // 
             // GoodsCode1
             // 
             this.GoodsCode1.DataPropertyName = "GoodsCode";
             this.GoodsCode1.HeaderText = "产品编码";
+            this.GoodsCode1.MinimumWidth = 8;
             this.GoodsCode1.Name = "GoodsCode1";
             this.GoodsCode1.ReadOnly = true;
+            this.GoodsCode1.Width = 150;
             // 
             // BarCode
             // 
             this.BarCode.DataPropertyName = "BarCode";
             this.BarCode.HeaderText = "产品条码";
+            this.BarCode.MinimumWidth = 8;
             this.BarCode.Name = "BarCode";
             this.BarCode.ReadOnly = true;
+            this.BarCode.Width = 150;
             // 
             // colKilnCode0
             // 
             this.colKilnCode0.DataPropertyName = "KilnCode";
             this.colKilnCode0.HeaderText = "窑炉编码";
+            this.colKilnCode0.MinimumWidth = 8;
             this.colKilnCode0.Name = "colKilnCode0";
             this.colKilnCode0.ReadOnly = true;
+            this.colKilnCode0.Width = 150;
             // 
             // KilnCarCode
             // 
             this.KilnCarCode.DataPropertyName = "KilnCarCode";
             this.KilnCarCode.HeaderText = "窑车编码";
+            this.KilnCarCode.MinimumWidth = 8;
             this.KilnCarCode.Name = "KilnCarCode";
             this.KilnCarCode.ReadOnly = true;
+            this.KilnCarCode.Width = 150;
             // 
             // CreateTime
             // 
@@ -284,29 +305,37 @@
             dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
             this.CreateTime.DefaultCellStyle = dataGridViewCellStyle4;
             this.CreateTime.HeaderText = "出窑时间";
+            this.CreateTime.MinimumWidth = 8;
             this.CreateTime.Name = "CreateTime";
             this.CreateTime.ReadOnly = true;
+            this.CreateTime.Width = 150;
             // 
             // GroutingUserCode
             // 
             this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
             this.GroutingUserCode.HeaderText = "成型工号";
+            this.GroutingUserCode.MinimumWidth = 8;
             this.GroutingUserCode.Name = "GroutingUserCode";
             this.GroutingUserCode.ReadOnly = true;
+            this.GroutingUserCode.Width = 150;
             // 
             // GroutingLineCode
             // 
             this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
             this.GroutingLineCode.HeaderText = "成型线编码";
+            this.GroutingLineCode.MinimumWidth = 8;
             this.GroutingLineCode.Name = "GroutingLineCode";
             this.GroutingLineCode.ReadOnly = true;
+            this.GroutingLineCode.Width = 150;
             // 
             // GroutingMouldCode
             // 
             this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
             this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.MinimumWidth = 8;
             this.GroutingMouldCode.Name = "GroutingMouldCode";
             this.GroutingMouldCode.ReadOnly = true;
+            this.GroutingMouldCode.Width = 150;
             // 
             // GDate
             // 
@@ -315,8 +344,10 @@
             dataGridViewCellStyle5.Format = "yyyy-MM-dd";
             this.GDate.DefaultCellStyle = dataGridViewCellStyle5;
             this.GDate.HeaderText = "注浆日期";
+            this.GDate.MinimumWidth = 8;
             this.GDate.Name = "GDate";
             this.GDate.ReadOnly = true;
+            this.GDate.Width = 150;
             // 
             // DDate
             // 
@@ -325,36 +356,46 @@
             dataGridViewCellStyle6.Format = "yyyy-MM-dd";
             this.DDate.DefaultCellStyle = dataGridViewCellStyle6;
             this.DDate.HeaderText = "交坯日期";
+            this.DDate.MinimumWidth = 8;
             this.DDate.Name = "DDate";
             this.DDate.ReadOnly = true;
+            this.DDate.Width = 150;
             // 
             // LogoCodeName
             // 
             this.LogoCodeName.DataPropertyName = "LogoCodeName";
             this.LogoCodeName.HeaderText = "商标";
+            this.LogoCodeName.MinimumWidth = 8;
             this.LogoCodeName.Name = "LogoCodeName";
             this.LogoCodeName.ReadOnly = true;
+            this.LogoCodeName.Width = 150;
             // 
             // Cusercode
             // 
             this.Cusercode.DataPropertyName = "Cusercode";
             this.Cusercode.HeaderText = "操作工号";
+            this.Cusercode.MinimumWidth = 8;
             this.Cusercode.Name = "Cusercode";
             this.Cusercode.ReadOnly = true;
+            this.Cusercode.Width = 150;
             // 
             // Kcode
             // 
             this.Kcode.DataPropertyName = "Kcode";
             this.Kcode.HeaderText = "窑号";
+            this.Kcode.MinimumWidth = 8;
             this.Kcode.Name = "Kcode";
             this.Kcode.ReadOnly = true;
+            this.Kcode.Width = 150;
             // 
             // Fyear
             // 
             this.Fyear.DataPropertyName = "Fyear";
             this.Fyear.HeaderText = "财年";
+            this.Fyear.MinimumWidth = 8;
             this.Fyear.Name = "Fyear";
             this.Fyear.ReadOnly = true;
+            this.Fyear.Width = 150;
             // 
             // TestMouldFlag
             // 
@@ -362,9 +403,11 @@
             this.TestMouldFlag.FalseValue = "0";
             this.TestMouldFlag.HeaderText = "试验标识";
             this.TestMouldFlag.IndeterminateValue = "0";
+            this.TestMouldFlag.MinimumWidth = 8;
             this.TestMouldFlag.Name = "TestMouldFlag";
             this.TestMouldFlag.ReadOnly = true;
             this.TestMouldFlag.TrueValue = "1";
+            this.TestMouldFlag.Width = 150;
             // 
             // tsrOperate
             // 
@@ -377,9 +420,10 @@
             this.tsbtnClose});
             this.tsrOperate.Location = new System.Drawing.Point(0, 0);
             this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1284, 35);
+            this.tsrOperate.Size = new System.Drawing.Size(1660, 52);
             this.tsrOperate.TabIndex = 33;
             this.tsrOperate.Text = "toolStrip1";
             // 
@@ -411,6 +455,8 @@
             | 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.txtTestFormFlag);
+            this.gbxCondition.Controls.Add(this.dropTestFormFlag);
             this.gbxCondition.Controls.Add(this.chkTestMouldFlag);
             this.gbxCondition.Controls.Add(this.txtFyear);
             this.gbxCondition.Controls.Add(this.scbGoods);
@@ -452,10 +498,12 @@
             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.Location = new System.Drawing.Point(0, 57);
+            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1272, 130);
+            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbxCondition.Size = new System.Drawing.Size(1642, 195);
             this.gbxCondition.TabIndex = 0;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
@@ -465,10 +513,10 @@
             this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
             this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
             this.chkTestMouldFlag.FalseText = "否";
-            this.chkTestMouldFlag.Location = new System.Drawing.Point(874, 25);
-            this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.chkTestMouldFlag.Location = new System.Drawing.Point(1311, 38);
+            this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.chkTestMouldFlag.Name = "chkTestMouldFlag";
-            this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
+            this.chkTestMouldFlag.Size = new System.Drawing.Size(195, 24);
             this.chkTestMouldFlag.TabIndex = 46;
             this.chkTestMouldFlag.Title = "试验标识";
             this.chkTestMouldFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -482,20 +530,22 @@
             this.txtFyear.ErrorMessage = "";
             this.txtFyear.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtFyear.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtFyear.Location = new System.Drawing.Point(794, 49);
+            this.txtFyear.Location = new System.Drawing.Point(1191, 74);
+            this.txtFyear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtFyear.MaxLength = 20;
             this.txtFyear.Name = "txtFyear";
-            this.txtFyear.Size = new System.Drawing.Size(76, 21);
+            this.txtFyear.Size = new System.Drawing.Size(112, 28);
             this.txtFyear.TabIndex = 43;
             this.txtFyear.TextValue = "";
             // 
             // scbGoods
             // 
             this.scbGoods.CheckedData = null;
-            this.scbGoods.Location = new System.Drawing.Point(259, 74);
+            this.scbGoods.Location = new System.Drawing.Point(388, 111);
+            this.scbGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbGoods.MultiSelect = true;
             this.scbGoods.Name = "scbGoods";
-            this.scbGoods.Size = new System.Drawing.Size(120, 21);
+            this.scbGoods.Size = new System.Drawing.Size(180, 32);
             this.scbGoods.TabIndex = 34;
             // 
             // lblFyear
@@ -503,9 +553,10 @@
             this.lblFyear.AutoSize = true;
             this.lblFyear.BackColor = System.Drawing.Color.Transparent;
             this.lblFyear.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblFyear.Location = new System.Drawing.Point(759, 53);
+            this.lblFyear.Location = new System.Drawing.Point(1138, 80);
+            this.lblFyear.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblFyear.Name = "lblFyear";
-            this.lblFyear.Size = new System.Drawing.Size(29, 12);
+            this.lblFyear.Size = new System.Drawing.Size(44, 18);
             this.lblFyear.TabIndex = 42;
             this.lblFyear.Text = "财年";
             // 
@@ -515,9 +566,10 @@
             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(200, 77);
+            this.lblGoods.Location = new System.Drawing.Point(300, 116);
+            this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGoods.Name = "lblGoods";
-            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.Size = new System.Drawing.Size(80, 18);
             this.lblGoods.TabIndex = 33;
             this.lblGoods.Text = "产品名称";
             // 
@@ -529,10 +581,11 @@
             this.txtKcode.ErrorMessage = "";
             this.txtKcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtKcode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtKcode.Location = new System.Drawing.Point(794, 22);
+            this.txtKcode.Location = new System.Drawing.Point(1191, 33);
+            this.txtKcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtKcode.MaxLength = 20;
             this.txtKcode.Name = "txtKcode";
-            this.txtKcode.Size = new System.Drawing.Size(76, 21);
+            this.txtKcode.Size = new System.Drawing.Size(112, 28);
             this.txtKcode.TabIndex = 40;
             this.txtKcode.TextValue = "";
             this.txtKcode.TextChanged += new System.EventHandler(this.txtKcode_TextChanged);
@@ -542,9 +595,10 @@
             this.lblKcode.AutoSize = true;
             this.lblKcode.BackColor = System.Drawing.Color.Transparent;
             this.lblKcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblKcode.Location = new System.Drawing.Point(759, 26);
+            this.lblKcode.Location = new System.Drawing.Point(1138, 39);
+            this.lblKcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblKcode.Name = "lblKcode";
-            this.lblKcode.Size = new System.Drawing.Size(29, 12);
+            this.lblKcode.Size = new System.Drawing.Size(44, 18);
             this.lblKcode.TabIndex = 41;
             this.lblKcode.Text = "窑号";
             // 
@@ -554,9 +608,10 @@
             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(15, 78);
+            this.lblGoodsType.Location = new System.Drawing.Point(22, 117);
+            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGoodsType.Name = "lblGoodsType";
-            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
+            this.lblGoodsType.Size = new System.Drawing.Size(80, 18);
             this.lblGoodsType.TabIndex = 32;
             this.lblGoodsType.Text = "产品类别";
             // 
@@ -564,9 +619,10 @@
             // 
             this.scbGoodsType.CheckedData = null;
             this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(76, 74);
+            this.scbGoodsType.Location = new System.Drawing.Point(114, 111);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
+            this.scbGoodsType.Size = new System.Drawing.Size(180, 32);
             this.scbGoodsType.TabIndex = 31;
             // 
             // chkPUserCode
@@ -576,9 +632,10 @@
             this.chkPUserCode.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkPUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkPUserCode.ForeColor = System.Drawing.Color.Red;
-            this.chkPUserCode.Location = new System.Drawing.Point(761, 103);
+            this.chkPUserCode.Location = new System.Drawing.Point(1142, 154);
+            this.chkPUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkPUserCode.Name = "chkPUserCode";
-            this.chkPUserCode.Size = new System.Drawing.Size(96, 16);
+            this.chkPUserCode.Size = new System.Drawing.Size(142, 22);
             this.chkPUserCode.TabIndex = 30;
             this.chkPUserCode.Text = "区分生产工号";
             this.chkPUserCode.UseVisualStyleBackColor = true;
@@ -587,9 +644,10 @@
             // 
             this.chkGDate.AutoSize = true;
             this.chkGDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkGDate.Location = new System.Drawing.Point(384, 103);
+            this.chkGDate.Location = new System.Drawing.Point(576, 154);
+            this.chkGDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkGDate.Name = "chkGDate";
-            this.chkGDate.Size = new System.Drawing.Size(72, 16);
+            this.chkGDate.Size = new System.Drawing.Size(106, 22);
             this.chkGDate.TabIndex = 24;
             this.chkGDate.Text = "注浆时间";
             this.chkGDate.UseVisualStyleBackColor = true;
@@ -601,9 +659,10 @@
             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(595, 105);
+            this.c_Label2.Location = new System.Drawing.Point(892, 158);
+            this.c_Label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label2.Name = "c_Label2";
-            this.c_Label2.Size = new System.Drawing.Size(17, 12);
+            this.c_Label2.Size = new System.Drawing.Size(26, 18);
             this.c_Label2.TabIndex = 26;
             this.c_Label2.Text = "至";
             // 
@@ -613,9 +672,10 @@
             this.dtpGDateEnd.Enabled = false;
             this.dtpGDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpGDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpGDateEnd.Location = new System.Drawing.Point(616, 101);
+            this.dtpGDateEnd.Location = new System.Drawing.Point(924, 152);
+            this.dtpGDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpGDateEnd.Name = "dtpGDateEnd";
-            this.dtpGDateEnd.Size = new System.Drawing.Size(133, 21);
+            this.dtpGDateEnd.Size = new System.Drawing.Size(198, 28);
             this.dtpGDateEnd.TabIndex = 27;
             // 
             // dtpGDateStart
@@ -624,18 +684,20 @@
             this.dtpGDateStart.Enabled = false;
             this.dtpGDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpGDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpGDateStart.Location = new System.Drawing.Point(458, 101);
+            this.dtpGDateStart.Location = new System.Drawing.Point(687, 152);
+            this.dtpGDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpGDateStart.Name = "dtpGDateStart";
-            this.dtpGDateStart.Size = new System.Drawing.Size(133, 21);
+            this.dtpGDateStart.Size = new System.Drawing.Size(198, 28);
             this.dtpGDateStart.TabIndex = 25;
             // 
             // chkDDate
             // 
             this.chkDDate.AutoSize = true;
             this.chkDDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkDDate.Location = new System.Drawing.Point(384, 76);
+            this.chkDDate.Location = new System.Drawing.Point(576, 114);
+            this.chkDDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkDDate.Name = "chkDDate";
-            this.chkDDate.Size = new System.Drawing.Size(72, 16);
+            this.chkDDate.Size = new System.Drawing.Size(106, 22);
             this.chkDDate.TabIndex = 17;
             this.chkDDate.Text = "交坯时间";
             this.chkDDate.UseVisualStyleBackColor = true;
@@ -647,9 +709,10 @@
             this.chkOut.Checked = true;
             this.chkOut.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkOut.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkOut.Location = new System.Drawing.Point(384, 49);
+            this.chkOut.Location = new System.Drawing.Point(576, 74);
+            this.chkOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkOut.Name = "chkOut";
-            this.chkOut.Size = new System.Drawing.Size(72, 16);
+            this.chkOut.Size = new System.Drawing.Size(106, 22);
             this.chkOut.TabIndex = 11;
             this.chkOut.Text = "出窑时间";
             this.chkOut.UseVisualStyleBackColor = true;
@@ -659,9 +722,10 @@
             // 
             this.chkOver.AutoSize = true;
             this.chkOver.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkOver.Location = new System.Drawing.Point(384, 22);
+            this.chkOver.Location = new System.Drawing.Point(576, 33);
+            this.chkOver.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkOver.Name = "chkOver";
-            this.chkOver.Size = new System.Drawing.Size(72, 16);
+            this.chkOver.Size = new System.Drawing.Size(106, 22);
             this.chkOver.TabIndex = 4;
             this.chkOver.Text = "生产时间";
             this.chkOver.UseVisualStyleBackColor = true;
@@ -673,9 +737,10 @@
             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(595, 78);
+            this.c_Label5.Location = new System.Drawing.Point(892, 117);
+            this.c_Label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label5.Name = "c_Label5";
-            this.c_Label5.Size = new System.Drawing.Size(17, 12);
+            this.c_Label5.Size = new System.Drawing.Size(26, 18);
             this.c_Label5.TabIndex = 19;
             this.c_Label5.Text = "至";
             // 
@@ -685,9 +750,10 @@
             this.dtpDDateEnd.Enabled = false;
             this.dtpDDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpDDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpDDateEnd.Location = new System.Drawing.Point(616, 74);
+            this.dtpDDateEnd.Location = new System.Drawing.Point(924, 111);
+            this.dtpDDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpDDateEnd.Name = "dtpDDateEnd";
-            this.dtpDDateEnd.Size = new System.Drawing.Size(133, 21);
+            this.dtpDDateEnd.Size = new System.Drawing.Size(198, 28);
             this.dtpDDateEnd.TabIndex = 20;
             // 
             // dtpDDateStart
@@ -696,9 +762,10 @@
             this.dtpDDateStart.Enabled = false;
             this.dtpDDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpDDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpDDateStart.Location = new System.Drawing.Point(458, 74);
+            this.dtpDDateStart.Location = new System.Drawing.Point(687, 111);
+            this.dtpDDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpDDateStart.Name = "dtpDDateStart";
-            this.dtpDDateStart.Size = new System.Drawing.Size(133, 21);
+            this.dtpDDateStart.Size = new System.Drawing.Size(198, 28);
             this.dtpDDateStart.TabIndex = 18;
             // 
             // c_Label3
@@ -707,9 +774,10 @@
             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(595, 51);
+            this.c_Label3.Location = new System.Drawing.Point(892, 76);
+            this.c_Label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label3.Name = "c_Label3";
-            this.c_Label3.Size = new System.Drawing.Size(17, 12);
+            this.c_Label3.Size = new System.Drawing.Size(26, 18);
             this.c_Label3.TabIndex = 13;
             this.c_Label3.Text = "至";
             // 
@@ -718,9 +786,10 @@
             this.dtpOutDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpOutDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpOutDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpOutDateEnd.Location = new System.Drawing.Point(616, 47);
+            this.dtpOutDateEnd.Location = new System.Drawing.Point(924, 70);
+            this.dtpOutDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpOutDateEnd.Name = "dtpOutDateEnd";
-            this.dtpOutDateEnd.Size = new System.Drawing.Size(133, 21);
+            this.dtpOutDateEnd.Size = new System.Drawing.Size(198, 28);
             this.dtpOutDateEnd.TabIndex = 14;
             // 
             // dtpOutDateStart
@@ -728,9 +797,10 @@
             this.dtpOutDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpOutDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpOutDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpOutDateStart.Location = new System.Drawing.Point(458, 47);
+            this.dtpOutDateStart.Location = new System.Drawing.Point(687, 70);
+            this.dtpOutDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpOutDateStart.Name = "dtpOutDateStart";
-            this.dtpOutDateStart.Size = new System.Drawing.Size(133, 21);
+            this.dtpOutDateStart.Size = new System.Drawing.Size(198, 28);
             this.dtpOutDateStart.TabIndex = 12;
             // 
             // txtGroutingUserCode
@@ -741,9 +811,10 @@
             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(259, 101);
+            this.txtGroutingUserCode.Location = new System.Drawing.Point(388, 152);
+            this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtGroutingUserCode.Name = "txtGroutingUserCode";
-            this.txtGroutingUserCode.Size = new System.Drawing.Size(120, 21);
+            this.txtGroutingUserCode.Size = new System.Drawing.Size(178, 28);
             this.txtGroutingUserCode.TabIndex = 23;
             this.txtGroutingUserCode.TextValue = "";
             this.txtGroutingUserCode.TextChanged += new System.EventHandler(this.txtGroutingUserCode_TextChanged);
@@ -753,9 +824,10 @@
             this.chkspecialrepairflag.AutoSize = true;
             this.chkspecialrepairflag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkspecialrepairflag.ForeColor = System.Drawing.Color.Red;
-            this.chkspecialrepairflag.Location = new System.Drawing.Point(761, 77);
+            this.chkspecialrepairflag.Location = new System.Drawing.Point(1142, 116);
+            this.chkspecialrepairflag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkspecialrepairflag.Name = "chkspecialrepairflag";
-            this.chkspecialrepairflag.Size = new System.Drawing.Size(204, 16);
+            this.chkspecialrepairflag.Size = new System.Drawing.Size(304, 22);
             this.chkspecialrepairflag.TabIndex = 8;
             this.chkspecialrepairflag.Text = "干补过的坯体不算作成型的产量。";
             this.chkspecialrepairflag.UseVisualStyleBackColor = true;
@@ -767,9 +839,10 @@
             this.dropKilnCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.dropKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dropKilnCode.FormattingEnabled = true;
-            this.dropKilnCode.Location = new System.Drawing.Point(258, 20);
+            this.dropKilnCode.Location = new System.Drawing.Point(387, 30);
+            this.dropKilnCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dropKilnCode.Name = "dropKilnCode";
-            this.dropKilnCode.Size = new System.Drawing.Size(120, 20);
+            this.dropKilnCode.Size = new System.Drawing.Size(178, 26);
             this.dropKilnCode.TabIndex = 3;
             // 
             // lblKilnCode
@@ -778,9 +851,10 @@
             this.lblKilnCode.BackColor = System.Drawing.SystemColors.Control;
             this.lblKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblKilnCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblKilnCode.Location = new System.Drawing.Point(198, 24);
+            this.lblKilnCode.Location = new System.Drawing.Point(297, 36);
+            this.lblKilnCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblKilnCode.Name = "lblKilnCode";
-            this.lblKilnCode.Size = new System.Drawing.Size(53, 12);
+            this.lblKilnCode.Size = new System.Drawing.Size(80, 18);
             this.lblKilnCode.TabIndex = 2;
             this.lblKilnCode.Text = "窑炉编号";
             // 
@@ -790,9 +864,10 @@
             this.lblRptProcedureName.BackColor = System.Drawing.SystemColors.Control;
             this.lblRptProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRptProcedureName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.lblRptProcedureName.Location = new System.Drawing.Point(15, 24);
+            this.lblRptProcedureName.Location = new System.Drawing.Point(22, 36);
+            this.lblRptProcedureName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblRptProcedureName.Name = "lblRptProcedureName";
-            this.lblRptProcedureName.Size = new System.Drawing.Size(53, 12);
+            this.lblRptProcedureName.Size = new System.Drawing.Size(80, 18);
             this.lblRptProcedureName.TabIndex = 0;
             this.lblRptProcedureName.Text = "数据来源";
             // 
@@ -804,9 +879,10 @@
             this.dropRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dropRptProcedure.FormattingEnabled = true;
             this.dropRptProcedure.IsMustInput = true;
-            this.dropRptProcedure.Location = new System.Drawing.Point(74, 20);
+            this.dropRptProcedure.Location = new System.Drawing.Point(111, 30);
+            this.dropRptProcedure.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dropRptProcedure.Name = "dropRptProcedure";
-            this.dropRptProcedure.Size = new System.Drawing.Size(120, 20);
+            this.dropRptProcedure.Size = new System.Drawing.Size(178, 26);
             this.dropRptProcedure.TabIndex = 1;
             // 
             // dkUserInfoSearchBox
@@ -815,11 +891,12 @@
             this.dkUserInfoSearchBox.Enabled = true;
             this.dkUserInfoSearchBox.IsMustInput = false;
             this.dkUserInfoSearchBox.IsWorker = false;
-            this.dkUserInfoSearchBox.Location = new System.Drawing.Point(17, 101);
+            this.dkUserInfoSearchBox.Location = new System.Drawing.Point(26, 152);
+            this.dkUserInfoSearchBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.dkUserInfoSearchBox.Name = "dkUserInfoSearchBox";
             this.dkUserInfoSearchBox.PurviewType = ((byte)(0));
             this.dkUserInfoSearchBox.SelectMore = true;
-            this.dkUserInfoSearchBox.Size = new System.Drawing.Size(179, 21);
+            this.dkUserInfoSearchBox.Size = new System.Drawing.Size(268, 32);
             this.dkUserInfoSearchBox.TabIndex = 21;
             this.dkUserInfoSearchBox.Title = "生产工号";
             this.dkUserInfoSearchBox.TxtUserBackColor = System.Drawing.SystemColors.Control;
@@ -835,7 +912,8 @@
             this.dkProcedureSearchBox.Enabled = true;
             this.dkProcedureSearchBox.IsEnablePurview = false;
             this.dkProcedureSearchBox.IsMustInput = false;
-            this.dkProcedureSearchBox.Location = new System.Drawing.Point(200, 47);
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(300, 70);
+            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.dkProcedureSearchBox.ModelType = null;
             this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
             this.dkProcedureSearchBox.ProcedureCode = "";
@@ -845,7 +923,7 @@
             this.dkProcedureSearchBox.Purview = null;
             this.dkProcedureSearchBox.PurviewType = ((byte)(0));
             this.dkProcedureSearchBox.SelectMore = true;
-            this.dkProcedureSearchBox.Size = new System.Drawing.Size(179, 21);
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(268, 32);
             this.dkProcedureSearchBox.TabIndex = 10;
             this.dkProcedureSearchBox.Title = "生产工序";
             this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -857,7 +935,8 @@
             this.dkproductionLineSearchBox.Enabled = true;
             this.dkproductionLineSearchBox.IsEnablePurview = false;
             this.dkproductionLineSearchBox.IsMustInput = false;
-            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(17, 47);
+            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(26, 70);
+            this.dkproductionLineSearchBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.dkproductionLineSearchBox.Name = "dkproductionLineSearchBox";
             this.dkproductionLineSearchBox.ProductionLineCode = "";
             this.dkproductionLineSearchBox.ProductionLineID = null;
@@ -865,7 +944,7 @@
             this.dkproductionLineSearchBox.ProductionLineName = null;
             this.dkproductionLineSearchBox.Purview = null;
             this.dkproductionLineSearchBox.PurviewType = ((byte)(0));
-            this.dkproductionLineSearchBox.Size = new System.Drawing.Size(179, 21);
+            this.dkproductionLineSearchBox.Size = new System.Drawing.Size(268, 32);
             this.dkproductionLineSearchBox.TabIndex = 9;
             this.dkproductionLineSearchBox.Title = "  生产线";
             this.dkproductionLineSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -876,9 +955,10 @@
             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(200, 105);
+            this.c_Label1.Location = new System.Drawing.Point(300, 158);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.Size = new System.Drawing.Size(80, 18);
             this.c_Label1.TabIndex = 22;
             this.c_Label1.Text = "成型工号";
             // 
@@ -888,9 +968,10 @@
             this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
             this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateEnd.Location = new System.Drawing.Point(595, 24);
+            this.lblAccountDateEnd.Location = new System.Drawing.Point(892, 36);
+            this.lblAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblAccountDateEnd.Name = "lblAccountDateEnd";
-            this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
+            this.lblAccountDateEnd.Size = new System.Drawing.Size(26, 18);
             this.lblAccountDateEnd.TabIndex = 6;
             this.lblAccountDateEnd.Text = "至";
             // 
@@ -900,9 +981,10 @@
             this.dtpOverDateEnd.Enabled = false;
             this.dtpOverDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpOverDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpOverDateEnd.Location = new System.Drawing.Point(616, 20);
+            this.dtpOverDateEnd.Location = new System.Drawing.Point(924, 30);
+            this.dtpOverDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpOverDateEnd.Name = "dtpOverDateEnd";
-            this.dtpOverDateEnd.Size = new System.Drawing.Size(133, 21);
+            this.dtpOverDateEnd.Size = new System.Drawing.Size(198, 28);
             this.dtpOverDateEnd.TabIndex = 7;
             // 
             // dtpOverDateStart
@@ -911,9 +993,10 @@
             this.dtpOverDateStart.Enabled = false;
             this.dtpOverDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpOverDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpOverDateStart.Location = new System.Drawing.Point(458, 20);
+            this.dtpOverDateStart.Location = new System.Drawing.Point(687, 30);
+            this.dtpOverDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpOverDateStart.Name = "dtpOverDateStart";
-            this.dtpOverDateStart.Size = new System.Drawing.Size(133, 21);
+            this.dtpOverDateStart.Size = new System.Drawing.Size(198, 28);
             this.dtpOverDateStart.TabIndex = 5;
             // 
             // btnClearCondition
@@ -923,9 +1006,10 @@
             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(1181, 92);
+            this.btnClearCondition.Location = new System.Drawing.Point(1506, 138);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.Size = new System.Drawing.Size(128, 45);
             this.btnClearCondition.TabIndex = 29;
             this.btnClearCondition.Text = "清空条件(&C)";
             this.btnClearCondition.UseVisualStyleBackColor = true;
@@ -938,9 +1022,10 @@
             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(1091, 92);
+            this.btnSearch.Location = new System.Drawing.Point(1370, 138);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.Size = new System.Drawing.Size(128, 45);
             this.btnSearch.TabIndex = 28;
             this.btnSearch.Text = "查询(&Q)";
             this.btnSearch.UseVisualStyleBackColor = true;
@@ -953,21 +1038,21 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tblReportModule.Controls.Add(this.tapReportModule);
             this.tblReportModule.Controls.Add(this.tapReportModuleDetail);
-            this.tblReportModule.Location = new System.Drawing.Point(0, 171);
+            this.tblReportModule.Location = new System.Drawing.Point(0, 256);
             this.tblReportModule.Margin = new System.Windows.Forms.Padding(0);
             this.tblReportModule.Name = "tblReportModule";
             this.tblReportModule.Padding = new System.Drawing.Point(0, 0);
             this.tblReportModule.SelectedIndex = 0;
-            this.tblReportModule.Size = new System.Drawing.Size(1272, 449);
+            this.tblReportModule.Size = new System.Drawing.Size(1642, 674);
             this.tblReportModule.TabIndex = 1;
             // 
             // tapReportModule
             // 
             this.tapReportModule.Controls.Add(this.dgvRptProcedure);
-            this.tapReportModule.Location = new System.Drawing.Point(4, 22);
+            this.tapReportModule.Location = new System.Drawing.Point(4, 28);
             this.tapReportModule.Margin = new System.Windows.Forms.Padding(0);
             this.tapReportModule.Name = "tapReportModule";
-            this.tapReportModule.Size = new System.Drawing.Size(1264, 423);
+            this.tapReportModule.Size = new System.Drawing.Size(1634, 642);
             this.tapReportModule.TabIndex = 0;
             this.tapReportModule.Text = "出窑数量汇总表";
             this.tapReportModule.UseVisualStyleBackColor = true;
@@ -996,6 +1081,7 @@
             dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvRptProcedure.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            this.dgvRptProcedure.ColumnHeadersHeight = 34;
             this.dgvRptProcedure.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvRptProcedure.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Procedureid,
@@ -1015,6 +1101,7 @@
             this.dgvRptProcedure.EnableHeadersVisualStyles = false;
             this.dgvRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvRptProcedure.FormatQuantityColumns = null;
+            this.dgvRptProcedure.HasNode = false;
             this.dgvRptProcedure.HorizontalMergeColumn = null;
             this.dgvRptProcedure.IsAutoCountSum = true;
             this.dgvRptProcedure.IsAutoResizeColumns = false;
@@ -1038,89 +1125,108 @@
             this.dgvRptProcedure.RowsDefaultCellStyle = dataGridViewCellStyle11;
             this.dgvRptProcedure.RowTemplate.Height = 21;
             this.dgvRptProcedure.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRptProcedure.Size = new System.Drawing.Size(1264, 423);
+            this.dgvRptProcedure.Size = new System.Drawing.Size(1634, 642);
             this.dgvRptProcedure.SortOrderColumnName = null;
             this.dgvRptProcedure.TabIndex = 29;
             this.dgvRptProcedure.Tag = true;
             this.dgvRptProcedure.TotalSumColumns = null;
             this.dgvRptProcedure.ViewRowFilter = "";
+            this.dgvRptProcedure.VirtualNodes = false;
             this.dgvRptProcedure.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvRptProcedure_CellMouseDoubleClick);
             // 
             // Procedureid
             // 
             this.Procedureid.DataPropertyName = "Procedureid";
             this.Procedureid.HeaderText = "工序id";
+            this.Procedureid.MinimumWidth = 8;
             this.Procedureid.Name = "Procedureid";
             this.Procedureid.ReadOnly = true;
             this.Procedureid.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Procedureid.Visible = false;
+            this.Procedureid.Width = 150;
             // 
             // ProcedureName
             // 
             this.ProcedureName.DataPropertyName = "ProcedureName";
             this.ProcedureName.HeaderText = "生产工序";
+            this.ProcedureName.MinimumWidth = 8;
             this.ProcedureName.Name = "ProcedureName";
             this.ProcedureName.ReadOnly = true;
             this.ProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ProcedureName.Width = 150;
             // 
             // Kilncode0
             // 
             this.Kilncode0.DataPropertyName = "Kilncode";
             this.Kilncode0.HeaderText = "窑炉编码";
+            this.Kilncode0.MinimumWidth = 8;
             this.Kilncode0.Name = "Kilncode0";
             this.Kilncode0.ReadOnly = true;
             this.Kilncode0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Kilncode0.Width = 150;
             // 
             // Userid
             // 
             this.Userid.DataPropertyName = "Userid";
             this.Userid.HeaderText = "生产工号Id";
+            this.Userid.MinimumWidth = 8;
             this.Userid.Name = "Userid";
             this.Userid.ReadOnly = true;
             this.Userid.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Userid.Visible = false;
+            this.Userid.Width = 150;
             // 
             // colUserCode
             // 
             this.colUserCode.DataPropertyName = "UserCode";
             this.colUserCode.HeaderText = "生产工号";
+            this.colUserCode.MinimumWidth = 8;
             this.colUserCode.Name = "colUserCode";
             this.colUserCode.ReadOnly = true;
             this.colUserCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colUserCode.Width = 150;
             // 
             // Kilnid
             // 
             this.Kilnid.DataPropertyName = "Kilnid";
             this.Kilnid.HeaderText = "Kilnid";
+            this.Kilnid.MinimumWidth = 8;
             this.Kilnid.Name = "Kilnid";
             this.Kilnid.ReadOnly = true;
             this.Kilnid.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.Kilnid.Visible = false;
+            this.Kilnid.Width = 150;
             // 
             // GoodsTypeName
             // 
             this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
             this.GoodsTypeName.HeaderText = "产品类别";
+            this.GoodsTypeName.MinimumWidth = 8;
             this.GoodsTypeName.Name = "GoodsTypeName";
             this.GoodsTypeName.ReadOnly = true;
             this.GoodsTypeName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsTypeName.Width = 150;
             // 
             // GoodsID
             // 
             this.GoodsID.DataPropertyName = "GoodsID";
             this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.MinimumWidth = 8;
             this.GoodsID.Name = "GoodsID";
             this.GoodsID.ReadOnly = true;
             this.GoodsID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.GoodsID.Visible = false;
+            this.GoodsID.Width = 150;
             // 
             // GoodsCode
             // 
             this.GoodsCode.DataPropertyName = "GoodsCode";
             this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.MinimumWidth = 8;
             this.GoodsCode.Name = "GoodsCode";
             this.GoodsCode.ReadOnly = true;
             this.GoodsCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsCode.Width = 150;
             // 
             // OutKilnCount
             // 
@@ -1128,18 +1234,47 @@
             dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
             this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle10;
             this.OutKilnCount.HeaderText = "出窑数量";
+            this.OutKilnCount.MinimumWidth = 8;
             this.OutKilnCount.Name = "OutKilnCount";
             this.OutKilnCount.ReadOnly = true;
             this.OutKilnCount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.OutKilnCount.Width = 150;
+            // 
+            // dropTestFormFlag
+            // 
+            this.dropTestFormFlag.BackColor = System.Drawing.Color.Yellow;
+            this.dropTestFormFlag.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.dropTestFormFlag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.dropTestFormFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dropTestFormFlag.FormattingEnabled = true;
+            this.dropTestFormFlag.IsMustInput = true;
+            this.dropTestFormFlag.Location = new System.Drawing.Point(1401, 77);
+            this.dropTestFormFlag.Margin = new System.Windows.Forms.Padding(4);
+            this.dropTestFormFlag.Name = "dropTestFormFlag";
+            this.dropTestFormFlag.Size = new System.Drawing.Size(148, 26);
+            this.dropTestFormFlag.TabIndex = 64;
+            // 
+            // txtTestFormFlag
+            // 
+            this.txtTestFormFlag.AutoSize = true;
+            this.txtTestFormFlag.BackColor = System.Drawing.Color.Transparent;
+            this.txtTestFormFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtTestFormFlag.Location = new System.Drawing.Point(1311, 80);
+            this.txtTestFormFlag.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtTestFormFlag.Name = "txtTestFormFlag";
+            this.txtTestFormFlag.Size = new System.Drawing.Size(62, 18);
+            this.txtTestFormFlag.TabIndex = 65;
+            this.txtTestFormFlag.Text = "实验单";
             // 
             // F_RPT_030103_1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1284, 616);
+            this.ClientSize = new System.Drawing.Size(1660, 924);
             this.Controls.Add(this.tsrOperate);
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.tblReportModule);
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "F_RPT_030103_1";
             this.RightToLeftLayout = true;
             this.Text = "出窑数量汇总表";
@@ -1236,5 +1371,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Kcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn Fyear;
         private System.Windows.Forms.DataGridViewCheckBoxColumn TestMouldFlag;
+        private Basics.BaseControls.C_ComboBox dropTestFormFlag;
+        private Basics.BaseControls.C_Label txtTestFormFlag;
     }
 }

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

@@ -118,6 +118,30 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				//end
 				getPurview();
 				getPurviewLine();
+				//实验单
+				DataTable dtTest = new DataTable();
+				dtTest.Columns.Add("TestFormFlagid", typeof(int));
+				dtTest.Columns.Add("TestFormFlagname", typeof(string));
+				DataRow drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 0;
+				drTest["TestFormFlagname"] = "全部";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 1;
+				drTest["TestFormFlagname"] = "实验单";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 2;
+				drTest["TestFormFlagname"] = "研发实验单";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 3;
+				drTest["TestFormFlagname"] = "非研发实验单";
+				dtTest.Rows.Add(drTest);
+
+				this.dropTestFormFlag.DataSource = dtTest;
+				this.dropTestFormFlag.ValueMember = "TestFormFlagid";
+				this.dropTestFormFlag.DisplayMember = "TestFormFlagname";
 			}
 			catch (Exception ex)
 			{
@@ -239,6 +263,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.chkspecialrepairflag.Checked = false;
 			this.chkPUserCode.Checked = true;
 			this.chkTestMouldFlag.AllItemCheck();
+			this.dropTestFormFlag.SelectedIndex = 0;
 		}
 
 		/// <summary>
@@ -421,6 +446,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				this.rptse.GTimeStart = DateTime.Parse(this.dtpGDateStart.Value.ToString("yyyy-MM-dd HH:mm") + ":00");
 				this.rptse.GTimeEnd = DateTime.Parse(this.dtpGDateEnd.Value.ToString("yyyy-MM-dd HH:mm") + ":59");
 			}
+			if (this.dropTestFormFlag.SelectedValue != null)
+			{
+				this.rptse.TestFormFlag = Convert.ToInt32(this.dropTestFormFlag.SelectedValue);
+			}
 			this.rptse.Specialrepairflag = this.chkspecialrepairflag.Checked;
 			this.rptse.GroutingUserCode = this.txtGroutingUserCode.Text.Trim();
             this.rptse.Kcode = this.txtKcode.Text.Trim();

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

@@ -225,14 +225,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -282,30 +282,32 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="Procedureid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Client/ReportModule/R04/M01/F_RPT_040104.cs

@@ -95,6 +95,30 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				this.chkTestMouldFlag.AllItemCheck();
 				this.chkRecyclingFlag.FalseItemCheck();
 				getPurviewLine();
+				//实验单
+				DataTable dtTest = new DataTable();
+				dtTest.Columns.Add("TestFormFlagid", typeof(int));
+				dtTest.Columns.Add("TestFormFlagname", typeof(string));
+				DataRow drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 0;
+				drTest["TestFormFlagname"] = "全部";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 1;
+				drTest["TestFormFlagname"] = "实验单";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 2;
+				drTest["TestFormFlagname"] = "研发实验单";
+				dtTest.Rows.Add(drTest);
+				drTest = dtTest.NewRow();
+				drTest["TestFormFlagid"] = 3;
+				drTest["TestFormFlagname"] = "非研发实验单";
+				dtTest.Rows.Add(drTest);
+
+				this.dropTestFormFlag.DataSource = dtTest;
+				this.dropTestFormFlag.ValueMember = "TestFormFlagid";
+				this.dropTestFormFlag.DisplayMember = "TestFormFlagname";
 			}
 			catch (Exception ex)
 			{
@@ -177,6 +201,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.dkUserInfoSearchBox.ClearControl();
 			this.chkTestMouldFlag.AllItemCheck();
 			this.chkRecyclingFlag.FalseItemCheck();
+			this.dropTestFormFlag.SelectedIndex = 0;
 		}
 
 
@@ -240,7 +265,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				{
 					se.TestRecyclingFlags = testRecyclingFlags[0].ToString();
 				}
-
+				if (this.dropTestFormFlag.SelectedValue != null)
+				{
+					se.TestFormFlag = int.Parse(this.dropTestFormFlag.SelectedValue.ToString());
+				}
 				// 调用服务器端获取数据集
 				ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 				{

DK.Client/ReportModule/R04/M01/F_RPT_040104.resx

@@ -168,14 +168,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="chkRecyclingFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -225,30 +225,32 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
-        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
-        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
+        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
+        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <data name="chkTestMouldFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -298,14 +300,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
-        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
-        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
-        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
-        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
-        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
-        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
-        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
+        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
+        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
+        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
+        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
+        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
+        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
+        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="ProductionLineId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -3500,8 +3500,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             {
                 selSql.Append("    AND pd.KilnID = :KilnID\n");
                 parameters.Add(new OracleParameter(":KilnID", OracleDbType.Int32, se.KilnID, ParameterDirection.Input));
-            }
-
+            } 
             //sqlString = @"
             //UNION ALL
             //SELECT T.GOODSLEVELTYPEID,
@@ -4306,7 +4305,19 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql.Append("    AND pd.KilnID = :KilnID\n");
                 parameters.Add(new OracleParameter(":KilnID", OracleDbType.Int32, se.KilnID, ParameterDirection.Input));
             }
-
+            //实验单标识
+            if (se.TestFormFlag == 1)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG in(1)) ");
+            }
+            else if (se.TestFormFlag == 2)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG in(2)) ");
+            }
+            else if (se.TestFormFlag == 3)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG  IS NULL OR gdd.TESTFORMFLAG =1) ");
+            }
             //sqlString = @"
             //UNION ALL
             //SELECT T.GOODSLEVELTYPEID,
@@ -4432,7 +4443,19 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql.Append("    AND pd.KilnID = :KilnID\n");
                 parameters.Add(new OracleParameter(":KilnID", OracleDbType.Int32, se.KilnID, ParameterDirection.Input));
             }
-
+            //实验单标识
+            if (se.TestFormFlag == 1)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG in(1)) ");
+            }
+            else if (se.TestFormFlag == 2)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG in(2)) ");
+            }
+            else if (se.TestFormFlag == 3)
+            {
+                selSql.Append(" AND(gdd.TESTFORMFLAG  IS NULL OR gdd.TESTFORMFLAG =1) ");
+            }
             sqlString =
             // 恒洁三车间特殊处理（质量相关）
             //"                   and exists\n" +
@@ -7256,7 +7279,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     "    SELECT pd.CreateTime, pd.ProductionDataID, pd.Barcode, pd.Kilncode,pd.KilnID, pd.KilnCarID,pd.Kilncarbatchno " +
                     "    from TP_PM_ProductionData pd ";
             //"    inner join TP_MST_RptSProcedure on TP_MST_RptSProcedure.Procedureid=pd.Procedureid ";
-            if (!string.IsNullOrEmpty(se.TestMouldFlag) || se.DTimeStart.HasValue || se.DTimeEnd.HasValue)
+            if (!string.IsNullOrEmpty(se.TestMouldFlag) || se.DTimeStart.HasValue || se.DTimeEnd.HasValue|| se.TestFormFlag!=0)
             {
                 selSql += "  inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid=pd.groutingdailydetailid ";
             }
@@ -7329,6 +7352,19 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql += "  AND gdd.TestMouldFlag = :TestMouldFlag  ";
                 parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
             }
+            //实验单标识
+            if (se.TestFormFlag == 1)
+            {
+                selSql+=" AND(gdd.TESTFORMFLAG in(1)) ";
+            }
+            else if (se.TestFormFlag == 2)
+            {
+                selSql+=" AND(gdd.TESTFORMFLAG in(2)) ";
+            }
+            else if (se.TestFormFlag == 3)
+            {
+                selSql+=" AND(gdd.TESTFORMFLAG  IS NULL OR gdd.TESTFORMFLAG =1) ";
+            }
             if (se.Specialrepairflag)
             {
                 selSql = selSql +
@@ -7601,6 +7637,18 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql += "  AND gdd.TestMouldFlag = :TestMouldFlag  ";
                 parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
             }
+            //实验单标识
+            if (se.TestFormFlag==1)
+            {
+                selSql += " AND(gdd.TESTFORMFLAG in(1)) ";
+            }else if (se.TestFormFlag == 2)
+            {
+                selSql += " AND(gdd.TESTFORMFLAG in(2)) ";
+            }
+            else if (se.TestFormFlag == 3)
+            {
+                selSql += " AND(gdd.TESTFORMFLAG  IS NULL OR gdd.TESTFORMFLAG =1) ";
+            }
             if (se.Specialrepairflag)
             {
                 selSql = selSql +

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -7937,10 +7937,14 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 		public static ServiceResultEntity ReadTrademark(SUserInfo sUserInfo, ClientRequestEntity cre)
 		{
 			ServiceResultEntity sre = new ServiceResultEntity();
-			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString); 
+			IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+			string goodsid = (cre.Properties["goodsid"] == null || cre.Properties["goodsid"].ToString() == "" || cre.Properties["goodsid"].ToString() == string.Empty) ? "" : cre.Properties["goodsid"].ToString();
 			try
 			{
-				string strSql = "SELECT LOGOID,LOGONAME FROM TP_MST_LOGO WHERE VALUEFLAG=1";
+				string strSql = "SELECT DISTINCT TO_CHAR(L.LOGONAME) AS LOGO, L.LOGOID " +
+					" FROM TP_MST_GOODSLOGOSAP GLS " +
+					"INNER JOIN TP_MST_LOGO L ON L.LOGOID = GLS.LOGOID " +
+					"WHERE GLS.GOODSID IN("+ goodsid + ")";
 
 				oracleConn.Open();
 				DataSet result = oracleConn.GetSqlResultToDs(strSql);
@@ -7971,10 +7975,14 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			List<Dictionary<string, string>> actualList = JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(cre.Properties["Respone"].ToString()); 
 			try
 			{
-                foreach (var item in actualList)
-                {
-					string strSql = "UPDATE TP_PC_GROUTINGLINEDETAIL SET LOGOID=" + item["LOGOID"]+ " WHERE GROUTINGLINEDETAILID="+ item["GROUTINGLINEDETAILID"];
-					oracleTrConn.ExecuteNonQuery(strSql);
+				foreach (var item in actualList)
+				{
+					string result = oracleTrConn.GetSqlResultToStr("SELECT LOGOID FROM TP_MST_GOODS WHERE GOODSID= " + item["GOODSID"]);
+					if (result!= item["LOGOID"]&& item["LOGOID"]!="")
+					{ 
+						string strSql = "UPDATE TP_PC_GROUTINGLINEDETAIL SET LOGOID=" + item["LOGOID"] + " WHERE GROUTINGLINEDETAILID=" + item["GROUTINGLINEDETAILID"];
+						oracleTrConn.ExecuteNonQuery(strSql);
+					} 
 				}
 				oracleTrConn.Commit();
 				sre.Status = Constant.ServiceResultStatus.Success;

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

@@ -241,5 +241,14 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+        /// <summary>
+        /// 实验单标识
+        /// </summary>
+        [DataMember]
+        public int TestFormFlag
+        {
+            get;
+            set;
+        }
     }
 }

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

@@ -216,6 +216,14 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
-
+        /// <summary>
+        /// 实验单标识
+        /// </summary>
+        [DataMember]
+        public int? TestFormFlag
+        {
+            get;
+            set;
+        }
     }
 }