Merge branch 'master' of http://pscg.dongkesoft.com:9002/r/mes/hg5020

DK.Basics/WFControls/11_Standard/09_SearchBox/ScbSearchBox.Designer.cs

@@ -44,9 +44,9 @@
             this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnSearch.BackgroundImage = global::Dongke.WinForm.Controls.Properties.Resources.SearchBox_Button_00;
             this.btnSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.btnSearch.Location = new System.Drawing.Point(97, 0);
+            this.btnSearch.Location = new System.Drawing.Point(99, 0);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(23, 23);
+            this.btnSearch.Size = new System.Drawing.Size(21, 21);
             this.btnSearch.TabIndex = 1;
             this.btnSearch.UseVisualStyleBackColor = true;
             this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);

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

@@ -29,17 +29,14 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
             this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+            this.txtGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.txtDefectCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkDefectSearchBox();
             this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-            this.txtGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.txtSemiCheckUserCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkUserInfoSearchBox();
             this.txtGroutingUserCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkUserInfoSearchBox();
             this.dkSemiCheckDefectPositionSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox();
@@ -55,104 +52,22 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
+            this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.grpCollapsible1.SuspendLayout();
             this.tsrToolStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).BeginInit();
             this.SuspendLayout();
             // 
-            // dgvSum
-            // 
-            this.dgvSum.AllowUserToAddRows = false;
-            this.dgvSum.AllowUserToDeleteRows = false;
-            this.dgvSum.AllowUserToModifyRows = true;
-            this.dgvSum.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvSum.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvSum.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvSum.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvSum.CellHeight = 23;
-            this.dgvSum.ChildNodeColumnName = null;
-            this.dgvSum.ChildNodeColumnText = null;
-            this.dgvSum.ColumnDeep = 1;
-            this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvSum.ColumnHeadersHeight = 29;
-            this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.defectcode,
-            this.defectname});
-            this.dgvSum.ColumnTreeView = new System.Windows.Forms.TreeView[0];
-            this.dgvSum.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)));
-            this.dgvSum.DynamicColumnName = "";
-            this.dgvSum.EnableHeadersVisualStyles = false;
-            this.dgvSum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvSum.FormatQuantityColumns = null;
-            this.dgvSum.HorizontalMergeColumn = null;
-            this.dgvSum.IsAutoCountSum = false;
-            this.dgvSum.IsAutoResizeColumns = false;
-            this.dgvSum.IsClickF12 = false;
-            this.dgvSum.IsOpenMergeCellFlag = false;
-            this.dgvSum.IsSaveDataGridViewSetting = false;
-            this.dgvSum.IsSubTotalFlag = false;
-            this.dgvSum.IsTopDeep = false;
-            this.dgvSum.Location = new System.Drawing.Point(0, 152);
-            this.dgvSum.Margin = new System.Windows.Forms.Padding(4);
-            this.dgvSum.MergeColumnNames = null;
-            this.dgvSum.MergeDetailColumnNames = null;
-            this.dgvSum.MergeDetailOnlyColumn = null;
-            this.dgvSum.MergeOnlyColumn = null;
-            this.dgvSum.MultiSelect = false;
-            this.dgvSum.Name = "dgvSum";
-            this.dgvSum.ReadOnly = true;
-            this.dgvSum.RefreshAtHscroll = false;
-            this.dgvSum.RowHeadersWidth = 50;
-            this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle3;
-            this.dgvSum.RowTemplate.Height = 21;
-            this.dgvSum.Size = new System.Drawing.Size(1354, 294);
-            this.dgvSum.SortOrderColumnName = null;
-            this.dgvSum.TabIndex = 2;
-            this.dgvSum.Tag = "";
-            this.dgvSum.TotalSumColumns = null;
-            this.dgvSum.ViewRowFilter = "";
-            // 
-            // defectcode
-            // 
-            this.defectcode.DataPropertyName = "defectcode";
-            this.defectcode.HeaderText = "缺陷编码";
-            this.defectcode.MinimumWidth = 6;
-            this.defectcode.Name = "defectcode";
-            this.defectcode.ReadOnly = true;
-            this.defectcode.Width = 125;
-            // 
-            // defectname
-            // 
-            this.defectname.DataPropertyName = "defectname";
-            this.defectname.HeaderText = "缺陷名称";
-            this.defectname.MinimumWidth = 6;
-            this.defectname.Name = "defectname";
-            this.defectname.ReadOnly = true;
-            this.defectname.Width = 125;
-            // 
             // grpCollapsible1
             // 
             this.grpCollapsible1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.grpCollapsible1.Controls.Add(this.txtGoodsCode);
+            this.grpCollapsible1.Controls.Add(this.scbGoodsType);
             this.grpCollapsible1.Controls.Add(this.txtDefectCode);
             this.grpCollapsible1.Controls.Add(this.dkProcedureSearchBox);
-            this.grpCollapsible1.Controls.Add(this.scbGoodsType);
-            this.grpCollapsible1.Controls.Add(this.txtGoodsCode);
             this.grpCollapsible1.Controls.Add(this.txtSemiCheckUserCode);
             this.grpCollapsible1.Controls.Add(this.txtGroutingUserCode);
             this.grpCollapsible1.Controls.Add(this.dkSemiCheckDefectPositionSearchBox1);
@@ -162,15 +77,33 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.grpCollapsible1.Controls.Add(this.c_Label1);
             this.grpCollapsible1.Controls.Add(this.lblGoodsCode);
             this.grpCollapsible1.Controls.Add(this.label1);
-            this.grpCollapsible1.Location = new System.Drawing.Point(0, 48);
-            this.grpCollapsible1.Margin = new System.Windows.Forms.Padding(4);
+            this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
             this.grpCollapsible1.Name = "grpCollapsible1";
-            this.grpCollapsible1.Padding = new System.Windows.Forms.Padding(4);
-            this.grpCollapsible1.Size = new System.Drawing.Size(1354, 98);
+            this.grpCollapsible1.Size = new System.Drawing.Size(1016, 78);
             this.grpCollapsible1.TabIndex = 1;
             this.grpCollapsible1.TabStop = false;
             this.grpCollapsible1.Text = "查询条件";
             // 
+            // txtGoodsCode
+            // 
+            this.txtGoodsCode.CheckedData = null;
+            this.txtGoodsCode.DisplayMember = "GoodsCode";
+            this.txtGoodsCode.Location = new System.Drawing.Point(73, 19);
+            this.txtGoodsCode.MultiSelect = true;
+            this.txtGoodsCode.Name = "txtGoodsCode";
+            this.txtGoodsCode.Size = new System.Drawing.Size(120, 21);
+            this.txtGoodsCode.TabIndex = 1;
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(73, 46);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
+            this.scbGoodsType.TabIndex = 10;
+            this.scbGoodsType.ValueMember = "GOODSTYPECODE";
+            // 
             // txtDefectCode
             // 
             this.txtDefectCode.DataSource = null;
@@ -178,12 +111,11 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtDefectCode.DefectIDS = null;
             this.txtDefectCode.Enabled = true;
             this.txtDefectCode.IsMustInput = false;
-            this.txtDefectCode.Location = new System.Drawing.Point(268, 60);
-            this.txtDefectCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtDefectCode.Location = new System.Drawing.Point(388, 19);
             this.txtDefectCode.Name = "txtDefectCode";
             this.txtDefectCode.PurviewType = ((byte)(0));
-            this.txtDefectCode.Size = new System.Drawing.Size(240, 26);
-            this.txtDefectCode.TabIndex = 45;
+            this.txtDefectCode.Size = new System.Drawing.Size(180, 21);
+            this.txtDefectCode.TabIndex = 4;
             this.txtDefectCode.Title = "缺陷编码";
             this.txtDefectCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
             // 
@@ -194,8 +126,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dkProcedureSearchBox.Enabled = true;
             this.dkProcedureSearchBox.IsEnablePurview = false;
             this.dkProcedureSearchBox.IsMustInput = false;
-            this.dkProcedureSearchBox.Location = new System.Drawing.Point(1055, 59);
-            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(574, 46);
+            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(4);
             this.dkProcedureSearchBox.ModelType = null;
             this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
             this.dkProcedureSearchBox.ProcedureCode = "";
@@ -205,46 +137,24 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dkProcedureSearchBox.Purview = null;
             this.dkProcedureSearchBox.PurviewType = ((byte)(0));
             this.dkProcedureSearchBox.SelectMore = true;
-            this.dkProcedureSearchBox.Size = new System.Drawing.Size(239, 26);
-            this.dkProcedureSearchBox.TabIndex = 44;
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(195, 21);
+            this.dkProcedureSearchBox.TabIndex = 0;
             this.dkProcedureSearchBox.Title = "返修工序";
             this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
             // 
-            // scbGoodsType
-            // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(857, 59);
-            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(179, 26);
-            this.scbGoodsType.TabIndex = 43;
-            this.scbGoodsType.ValueMember = "GOODSTYPECODE";
-            // 
-            // txtGoodsCode
-            // 
-            this.txtGoodsCode.CheckedData = null;
-            this.txtGoodsCode.DisplayMember = "GoodsCode";
-            this.txtGoodsCode.Location = new System.Drawing.Point(92, 26);
-            this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4);
-            this.txtGoodsCode.MultiSelect = true;
-            this.txtGoodsCode.Name = "txtGoodsCode";
-            this.txtGoodsCode.Size = new System.Drawing.Size(167, 26);
-            this.txtGoodsCode.TabIndex = 42;
-            // 
             // txtSemiCheckUserCode
             // 
             this.txtSemiCheckUserCode.DataSource = null;
             this.txtSemiCheckUserCode.Enabled = true;
             this.txtSemiCheckUserCode.IsMustInput = false;
             this.txtSemiCheckUserCode.IsWorker = false;
-            this.txtSemiCheckUserCode.Location = new System.Drawing.Point(19, 59);
-            this.txtSemiCheckUserCode.Margin = new System.Windows.Forms.Padding(5);
+            this.txtSemiCheckUserCode.Location = new System.Drawing.Point(200, 46);
+            this.txtSemiCheckUserCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtSemiCheckUserCode.Name = "txtSemiCheckUserCode";
             this.txtSemiCheckUserCode.PurviewType = ((byte)(0));
             this.txtSemiCheckUserCode.SelectMore = true;
-            this.txtSemiCheckUserCode.Size = new System.Drawing.Size(240, 26);
-            this.txtSemiCheckUserCode.TabIndex = 7;
+            this.txtSemiCheckUserCode.Size = new System.Drawing.Size(180, 21);
+            this.txtSemiCheckUserCode.TabIndex = 11;
             this.txtSemiCheckUserCode.Title = "半检工号";
             this.txtSemiCheckUserCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
             this.txtSemiCheckUserCode.UserCode = "";
@@ -258,13 +168,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtGroutingUserCode.Enabled = true;
             this.txtGroutingUserCode.IsMustInput = false;
             this.txtGroutingUserCode.IsWorker = false;
-            this.txtGroutingUserCode.Location = new System.Drawing.Point(268, 25);
-            this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(5);
+            this.txtGroutingUserCode.Location = new System.Drawing.Point(200, 19);
+            this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtGroutingUserCode.Name = "txtGroutingUserCode";
             this.txtGroutingUserCode.PurviewType = ((byte)(0));
             this.txtGroutingUserCode.SelectMore = true;
-            this.txtGroutingUserCode.Size = new System.Drawing.Size(240, 26);
-            this.txtGroutingUserCode.TabIndex = 2;
+            this.txtGroutingUserCode.Size = new System.Drawing.Size(180, 21);
+            this.txtGroutingUserCode.TabIndex = 3;
             this.txtGroutingUserCode.Title = "成型工号";
             this.txtGroutingUserCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
             this.txtGroutingUserCode.UserCode = "";
@@ -279,13 +189,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS = null;
             this.dkSemiCheckDefectPositionSearchBox1.Enabled = true;
             this.dkSemiCheckDefectPositionSearchBox1.IsMustInput = false;
-            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(520, 59);
-            this.dkSemiCheckDefectPositionSearchBox1.Margin = new System.Windows.Forms.Padding(5);
+            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(388, 46);
+            this.dkSemiCheckDefectPositionSearchBox1.Margin = new System.Windows.Forms.Padding(4);
             this.dkSemiCheckDefectPositionSearchBox1.Name = "dkSemiCheckDefectPositionSearchBox1";
             this.dkSemiCheckDefectPositionSearchBox1.PurviewType = ((byte)(0));
             this.dkSemiCheckDefectPositionSearchBox1.SelectMore = true;
-            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(256, 26);
-            this.dkSemiCheckDefectPositionSearchBox1.TabIndex = 10;
+            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(180, 21);
+            this.dkSemiCheckDefectPositionSearchBox1.TabIndex = 12;
             this.dkSemiCheckDefectPositionSearchBox1.Title = "缺陷位置";
             this.dkSemiCheckDefectPositionSearchBox1.TxtUserBackColor = System.Drawing.SystemColors.Control;
             // 
@@ -294,11 +204,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtSemiCheckDateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.txtSemiCheckDateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSemiCheckDateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txtSemiCheckDateTimeEnd.Location = new System.Drawing.Point(857, 23);
-            this.txtSemiCheckDateTimeEnd.Margin = new System.Windows.Forms.Padding(4);
+            this.txtSemiCheckDateTimeEnd.Location = new System.Drawing.Point(798, 19);
             this.txtSemiCheckDateTimeEnd.Name = "txtSemiCheckDateTimeEnd";
-            this.txtSemiCheckDateTimeEnd.Size = new System.Drawing.Size(179, 25);
-            this.txtSemiCheckDateTimeEnd.TabIndex = 6;
+            this.txtSemiCheckDateTimeEnd.Size = new System.Drawing.Size(136, 21);
+            this.txtSemiCheckDateTimeEnd.TabIndex = 8;
             this.txtSemiCheckDateTimeEnd.Value = new System.DateTime(2016, 7, 18, 0, 0, 0, 0);
             // 
             // c_Label4
@@ -307,11 +216,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.c_Label4.BackColor = System.Drawing.Color.Transparent;
             this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(805, 30);
-            this.c_Label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label4.Location = new System.Drawing.Point(775, 23);
             this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(22, 15);
-            this.c_Label4.TabIndex = 5;
+            this.c_Label4.Size = new System.Drawing.Size(17, 12);
+            this.c_Label4.TabIndex = 7;
             this.c_Label4.Text = "至";
             // 
             // txtSemiCheckDateTimeStart
@@ -319,11 +227,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtSemiCheckDateTimeStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.txtSemiCheckDateTimeStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSemiCheckDateTimeStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txtSemiCheckDateTimeStart.Location = new System.Drawing.Point(592, 25);
-            this.txtSemiCheckDateTimeStart.Margin = new System.Windows.Forms.Padding(4);
+            this.txtSemiCheckDateTimeStart.Location = new System.Drawing.Point(633, 19);
             this.txtSemiCheckDateTimeStart.Name = "txtSemiCheckDateTimeStart";
-            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(184, 25);
-            this.txtSemiCheckDateTimeStart.TabIndex = 4;
+            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(136, 21);
+            this.txtSemiCheckDateTimeStart.TabIndex = 6;
             this.txtSemiCheckDateTimeStart.Value = new System.DateTime(2016, 7, 18, 0, 0, 0, 0);
             // 
             // c_Label1
@@ -332,11 +239,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             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(782, 64);
-            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label1.Location = new System.Drawing.Point(14, 50);
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(67, 15);
-            this.c_Label1.TabIndex = 0;
+            this.c_Label1.Size = new System.Drawing.Size(53, 12);
+            this.c_Label1.TabIndex = 9;
             this.c_Label1.Text = "产品类别";
             // 
             // lblGoodsCode
@@ -345,21 +251,19 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.lblGoodsCode.BackColor = System.Drawing.Color.Transparent;
             this.lblGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsCode.Location = new System.Drawing.Point(19, 30);
-            this.lblGoodsCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsCode.Location = new System.Drawing.Point(14, 23);
             this.lblGoodsCode.Name = "lblGoodsCode";
-            this.lblGoodsCode.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsCode.Size = new System.Drawing.Size(53, 12);
             this.lblGoodsCode.TabIndex = 0;
             this.lblGoodsCode.Text = "产品编码";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(517, 30);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(574, 23);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(67, 15);
-            this.label1.TabIndex = 3;
+            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.TabIndex = 5;
             this.label1.Text = "半检时间";
             // 
             // tsrToolStrip1
@@ -374,7 +278,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.tsbtnClose});
             this.tsrToolStrip1.Location = new System.Drawing.Point(0, 0);
             this.tsrToolStrip1.Name = "tsrToolStrip1";
-            this.tsrToolStrip1.Size = new System.Drawing.Size(1370, 44);
+            this.tsrToolStrip1.Size = new System.Drawing.Size(1028, 35);
             this.tsrToolStrip1.TabIndex = 0;
             // 
             // tsbtnSearch
@@ -427,24 +331,107 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
+            // defectname
+            // 
+            this.defectname.DataPropertyName = "defectname";
+            this.defectname.HeaderText = "缺陷名称";
+            this.defectname.MinimumWidth = 6;
+            this.defectname.Name = "defectname";
+            this.defectname.ReadOnly = true;
+            this.defectname.Width = 125;
+            // 
+            // defectcode
+            // 
+            this.defectcode.DataPropertyName = "defectcode";
+            this.defectcode.HeaderText = "缺陷编码";
+            this.defectcode.MinimumWidth = 6;
+            this.defectcode.Name = "defectcode";
+            this.defectcode.ReadOnly = true;
+            this.defectcode.Width = 125;
+            // 
+            // dgvSum
+            // 
+            this.dgvSum.AllowUserToAddRows = false;
+            this.dgvSum.AllowUserToDeleteRows = false;
+            this.dgvSum.AllowUserToModifyRows = true;
+            this.dgvSum.AllowUserToOrderColumns = true;
+            dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31;
+            this.dgvSum.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dgvSum.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvSum.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvSum.CellHeight = 23;
+            this.dgvSum.ChildNodeColumnName = null;
+            this.dgvSum.ChildNodeColumnText = null;
+            this.dgvSum.ColumnDeep = 1;
+            this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle32.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle32.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32;
+            this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.defectcode,
+            this.defectname});
+            this.dgvSum.ColumnTreeView = new System.Windows.Forms.TreeView[0];
+            this.dgvSum.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)));
+            this.dgvSum.DynamicColumnName = "";
+            this.dgvSum.EnableHeadersVisualStyles = false;
+            this.dgvSum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvSum.FormatQuantityColumns = null;
+            this.dgvSum.HorizontalMergeColumn = null;
+            this.dgvSum.IsAutoCountSum = false;
+            this.dgvSum.IsAutoResizeColumns = false;
+            this.dgvSum.IsClickF12 = false;
+            this.dgvSum.IsOpenMergeCellFlag = false;
+            this.dgvSum.IsSaveDataGridViewSetting = false;
+            this.dgvSum.IsSubTotalFlag = false;
+            this.dgvSum.IsTopDeep = false;
+            this.dgvSum.Location = new System.Drawing.Point(0, 122);
+            this.dgvSum.MergeColumnNames = null;
+            this.dgvSum.MergeDetailColumnNames = null;
+            this.dgvSum.MergeDetailOnlyColumn = null;
+            this.dgvSum.MergeOnlyColumn = null;
+            this.dgvSum.MultiSelect = false;
+            this.dgvSum.Name = "dgvSum";
+            this.dgvSum.ReadOnly = true;
+            this.dgvSum.RefreshAtHscroll = false;
+            this.dgvSum.RowHeadersWidth = 50;
+            this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle33.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle33;
+            this.dgvSum.RowTemplate.Height = 21;
+            this.dgvSum.Size = new System.Drawing.Size(1016, 235);
+            this.dgvSum.SortOrderColumnName = null;
+            this.dgvSum.TabIndex = 2;
+            this.dgvSum.Tag = "";
+            this.dgvSum.TotalSumColumns = null;
+            this.dgvSum.ViewRowFilter = "";
+            // 
             // F_RPT_030119
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1370, 446);
+            this.ClientSize = new System.Drawing.Size(1028, 357);
             this.Controls.Add(this.dgvSum);
             this.Controls.Add(this.grpCollapsible1);
             this.Controls.Add(this.tsrToolStrip1);
-            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "F_RPT_030119";
             this.Text = "半检返修缺陷汇总表";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PC_1001_FormClosed);
             this.Load += new System.EventHandler(this.F_PC_1001_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).EndInit();
             this.grpCollapsible1.ResumeLayout(false);
             this.grpCollapsible1.PerformLayout();
             this.tsrToolStrip1.ResumeLayout(false);
             this.tsrToolStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSum)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -457,22 +444,22 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
         private System.Windows.Forms.ToolStripButton tsbtnClose;
         private WinForm.Controls.GrpCollapsible grpCollapsible1;
-        private Basics.BaseControls.C_DataGridView dgvSum;
         private System.Windows.Forms.ToolStripButton tsbtnClearCondition;
         private System.Windows.Forms.Label label1;
         private Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox dkSemiCheckDefectPositionSearchBox1;
         private Basics.BaseControls.C_DateTimePicker txtSemiCheckDateTimeEnd;
         private Basics.BaseControls.C_Label c_Label4;
         private Basics.BaseControls.C_DateTimePicker txtSemiCheckDateTimeStart;
-        private System.Windows.Forms.DataGridViewTextBoxColumn defectcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn defectname;
         private Controls.SearchTextBox.dkUserInfoSearchBox txtGroutingUserCode;
         private Controls.SearchTextBox.dkUserInfoSearchBox txtSemiCheckUserCode;
-        private Controls.SearchBox.ScbGoods txtGoodsCode;
         private Basics.BaseControls.C_Label lblGoodsCode;
-        private Controls.SearchBox.ScbGoodsType scbGoodsType;
         private Basics.BaseControls.C_Label c_Label1;
         private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox;
         private Controls.SearchTextBox.dkDefectSearchBox txtDefectCode;
+        private Controls.SearchBox.ScbGoodsType scbGoodsType;
+        private Controls.SearchBox.ScbGoods txtGoodsCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn defectname;
+        private System.Windows.Forms.DataGridViewTextBoxColumn defectcode;
+        private Basics.BaseControls.C_DataGridView dgvSum;
     }
 }

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

@@ -117,14 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="defectcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+  <metadata name="tsrToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="defectname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="tsrToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+  <metadata name="defectcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>40</value>