修正盘点清除BUG（能用但不完全）

DK.Client/PMModule/F_PM_2112.Designer.cs

@@ -28,14 +28,14 @@
         /// </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 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();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle 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 dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_2112));
             this.dgvInProduction = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.Sel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -110,6 +110,7 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.buttonCheckAll = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.dgvInProduction)).BeginInit();
             this.gbxCondition.SuspendLayout();
             this.tsrOperate.SuspendLayout();
@@ -121,8 +122,8 @@
             this.dgvInProduction.AllowUserToDeleteRows = false;
             this.dgvInProduction.AllowUserToModifyRows = true;
             this.dgvInProduction.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvInProduction.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvInProduction.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvInProduction.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)));
@@ -133,14 +134,15 @@
             this.dgvInProduction.ChildNodeColumnText = null;
             this.dgvInProduction.ColumnDeep = 1;
             this.dgvInProduction.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.dgvInProduction.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            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.dgvInProduction.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+            this.dgvInProduction.ColumnHeadersHeight = 29;
             this.dgvInProduction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvInProduction.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Sel,
@@ -197,22 +199,23 @@
             this.dgvInProduction.IsOpenMergeCellFlag = false;
             this.dgvInProduction.IsSubTotalFlag = false;
             this.dgvInProduction.IsTopDeep = false;
-            this.dgvInProduction.Location = new System.Drawing.Point(0, 161);
+            this.dgvInProduction.Location = new System.Drawing.Point(0, 201);
+            this.dgvInProduction.Margin = new System.Windows.Forms.Padding(4);
             this.dgvInProduction.MergeColumnNames = null;
             this.dgvInProduction.MergeDetailColumnNames = null;
             this.dgvInProduction.MergeDetailOnlyColumn = null;
             this.dgvInProduction.MergeOnlyColumn = null;
-            this.dgvInProduction.MultiSelect = false;
             this.dgvInProduction.Name = "dgvInProduction";
             this.dgvInProduction.RefreshAtHscroll = false;
             this.dgvInProduction.RowHeadersWidth = 50;
             this.dgvInProduction.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvInProduction.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvInProduction.RowsDefaultCellStyle = dataGridViewCellStyle16;
             this.dgvInProduction.RowTemplate.Height = 21;
             this.dgvInProduction.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvInProduction.Size = new System.Drawing.Size(1119, 240);
+            this.dgvInProduction.Size = new System.Drawing.Size(1492, 300);
             this.dgvInProduction.SortOrderColumnName = null;
+            this.dgvInProduction.StandardTab = true;
             this.dgvInProduction.TabIndex = 28;
             this.dgvInProduction.Tag = true;
             this.dgvInProduction.TotalSumColumns = null;
@@ -224,84 +227,105 @@
             this.Sel.DataPropertyName = "Sel";
             this.Sel.FalseValue = "0";
             this.Sel.HeaderText = "选择";
+            this.Sel.MinimumWidth = 6;
             this.Sel.Name = "Sel";
             this.Sel.TrueValue = "1";
+            this.Sel.Width = 125;
             // 
             // BarCode
             // 
             this.BarCode.DataPropertyName = "BarCode";
             this.BarCode.HeaderText = "产品条码";
+            this.BarCode.MinimumWidth = 6;
             this.BarCode.Name = "BarCode";
             this.BarCode.ReadOnly = true;
+            this.BarCode.Width = 125;
             // 
             // GoodsCode
             // 
             this.GoodsCode.DataPropertyName = "GoodsCode";
             this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.MinimumWidth = 6;
             this.GoodsCode.Name = "GoodsCode";
             this.GoodsCode.ReadOnly = true;
+            this.GoodsCode.Width = 125;
             // 
             // GoodsName
             // 
             this.GoodsName.DataPropertyName = "GoodsName";
             this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.MinimumWidth = 6;
             this.GoodsName.Name = "GoodsName";
             this.GoodsName.ReadOnly = true;
+            this.GoodsName.Width = 125;
             // 
             // ProductionLineID
             // 
             this.ProductionLineID.DataPropertyName = "ProductionLineID";
             this.ProductionLineID.HeaderText = "生产线ID";
+            this.ProductionLineID.MinimumWidth = 6;
             this.ProductionLineID.Name = "ProductionLineID";
             this.ProductionLineID.ReadOnly = true;
             this.ProductionLineID.Visible = false;
+            this.ProductionLineID.Width = 125;
             // 
             // ProductionLineCode
             // 
             this.ProductionLineCode.DataPropertyName = "ProductionLineCode";
             this.ProductionLineCode.HeaderText = "生产线编码";
+            this.ProductionLineCode.MinimumWidth = 6;
             this.ProductionLineCode.Name = "ProductionLineCode";
             this.ProductionLineCode.ReadOnly = true;
             this.ProductionLineCode.Visible = false;
+            this.ProductionLineCode.Width = 125;
             // 
             // ProductionLineName
             // 
             this.ProductionLineName.DataPropertyName = "ProductionLineName";
             this.ProductionLineName.HeaderText = "生产线";
+            this.ProductionLineName.MinimumWidth = 6;
             this.ProductionLineName.Name = "ProductionLineName";
             this.ProductionLineName.ReadOnly = true;
+            this.ProductionLineName.Width = 125;
             // 
             // CompleteProcedureID
             // 
             this.CompleteProcedureID.DataPropertyName = "CompleteProcedureID";
             this.CompleteProcedureID.HeaderText = "完成工序ID";
+            this.CompleteProcedureID.MinimumWidth = 6;
             this.CompleteProcedureID.Name = "CompleteProcedureID";
             this.CompleteProcedureID.ReadOnly = true;
             this.CompleteProcedureID.Visible = false;
+            this.CompleteProcedureID.Width = 125;
             // 
             // CompleteProcedureName
             // 
             this.CompleteProcedureName.DataPropertyName = "CompleteProcedureName";
             this.CompleteProcedureName.HeaderText = "完成工序";
+            this.CompleteProcedureName.MinimumWidth = 6;
             this.CompleteProcedureName.Name = "CompleteProcedureName";
             this.CompleteProcedureName.ReadOnly = true;
+            this.CompleteProcedureName.Width = 125;
             // 
             // SCRAPDATE
             // 
             this.SCRAPDATE.DataPropertyName = "SCRAPDATE";
-            dataGridViewCellStyle3.Format = "yyyy-MM-dd";
-            dataGridViewCellStyle3.NullValue = null;
-            this.SCRAPDATE.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle11.Format = "yyyy-MM-dd";
+            dataGridViewCellStyle11.NullValue = null;
+            this.SCRAPDATE.DefaultCellStyle = dataGridViewCellStyle11;
             this.SCRAPDATE.HeaderText = "报废日期";
+            this.SCRAPDATE.MinimumWidth = 6;
             this.SCRAPDATE.Name = "SCRAPDATE";
             this.SCRAPDATE.ReadOnly = true;
+            this.SCRAPDATE.Width = 125;
             // 
             // CreateTime
             // 
             this.CreateTime.DataPropertyName = "CreateTime";
-            dataGridViewCellStyle4.Format = "yyyy-MM-dd HH:mm:ss";
-            this.CreateTime.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle12.Format = "yyyy-MM-dd HH:mm:ss";
+            this.CreateTime.DefaultCellStyle = dataGridViewCellStyle12;
             this.CreateTime.HeaderText = "交坯时间";
+            this.CreateTime.MinimumWidth = 6;
             this.CreateTime.Name = "CreateTime";
             this.CreateTime.ReadOnly = true;
             this.CreateTime.Width = 180;
@@ -309,250 +333,310 @@
             // UpdateTime
             // 
             this.UpdateTime.DataPropertyName = "UpdateTime";
-            dataGridViewCellStyle5.Format = "yyyy-MM-dd HH:mm:ss";
-            dataGridViewCellStyle5.NullValue = null;
-            this.UpdateTime.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle13.Format = "yyyy-MM-dd HH:mm:ss";
+            dataGridViewCellStyle13.NullValue = null;
+            this.UpdateTime.DefaultCellStyle = dataGridViewCellStyle13;
             this.UpdateTime.HeaderText = "完成时间";
+            this.UpdateTime.MinimumWidth = 6;
             this.UpdateTime.Name = "UpdateTime";
             this.UpdateTime.ReadOnly = true;
+            this.UpdateTime.Width = 125;
             // 
             // UserCode
             // 
             this.UserCode.DataPropertyName = "UserCode";
             this.UserCode.HeaderText = "生产工号";
+            this.UserCode.MinimumWidth = 6;
             this.UserCode.Name = "UserCode";
             this.UserCode.ReadOnly = true;
+            this.UserCode.Width = 125;
             // 
             // ModelType
             // 
             this.ModelType.DataPropertyName = "ModelType";
             this.ModelType.HeaderText = "工序类别";
+            this.ModelType.MinimumWidth = 6;
             this.ModelType.Name = "ModelType";
             this.ModelType.ReadOnly = true;
             this.ModelType.Visible = false;
+            this.ModelType.Width = 125;
             // 
             // ProcedureModel
             // 
             this.ProcedureModel.DataPropertyName = "ProcedureModel";
             this.ProcedureModel.HeaderText = "工序模型";
+            this.ProcedureModel.MinimumWidth = 6;
             this.ProcedureModel.Name = "ProcedureModel";
             this.ProcedureModel.ReadOnly = true;
             this.ProcedureModel.Visible = false;
+            this.ProcedureModel.Width = 125;
             // 
             // GoodsLevelName
             // 
             this.GoodsLevelName.DataPropertyName = "GoodsLevelName";
             this.GoodsLevelName.HeaderText = "产品分级";
+            this.GoodsLevelName.MinimumWidth = 6;
             this.GoodsLevelName.Name = "GoodsLevelName";
             this.GoodsLevelName.ReadOnly = true;
+            this.GoodsLevelName.Width = 125;
             // 
             // GoodsLevelTypeName
             // 
             this.GoodsLevelTypeName.DataPropertyName = "GoodsLevelTypeName";
             this.GoodsLevelTypeName.HeaderText = "产品分级类别";
+            this.GoodsLevelTypeName.MinimumWidth = 6;
             this.GoodsLevelTypeName.Name = "GoodsLevelTypeName";
             this.GoodsLevelTypeName.ReadOnly = true;
             this.GoodsLevelTypeName.Visible = false;
+            this.GoodsLevelTypeName.Width = 125;
             // 
             // GroutingLineID
             // 
             this.GroutingLineID.DataPropertyName = "GroutingLineID";
             this.GroutingLineID.HeaderText = "成型生产线ID";
+            this.GroutingLineID.MinimumWidth = 6;
             this.GroutingLineID.Name = "GroutingLineID";
             this.GroutingLineID.ReadOnly = true;
             this.GroutingLineID.Visible = false;
+            this.GroutingLineID.Width = 125;
             // 
             // GroutingLineCode
             // 
             this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
             this.GroutingLineCode.HeaderText = "成型线编码";
+            this.GroutingLineCode.MinimumWidth = 6;
             this.GroutingLineCode.Name = "GroutingLineCode";
             this.GroutingLineCode.ReadOnly = true;
+            this.GroutingLineCode.Width = 125;
             // 
             // GroutingLineName
             // 
             this.GroutingLineName.DataPropertyName = "GroutingLineName";
             this.GroutingLineName.HeaderText = "成型线名称";
+            this.GroutingLineName.MinimumWidth = 6;
             this.GroutingLineName.Name = "GroutingLineName";
             this.GroutingLineName.ReadOnly = true;
             this.GroutingLineName.Visible = false;
+            this.GroutingLineName.Width = 125;
             // 
             // GMouldTypeID
             // 
             this.GMouldTypeID.DataPropertyName = "GMouldTypeID";
             this.GMouldTypeID.HeaderText = "成型线类型ID";
+            this.GMouldTypeID.MinimumWidth = 6;
             this.GMouldTypeID.Name = "GMouldTypeID";
             this.GMouldTypeID.ReadOnly = true;
             this.GMouldTypeID.Visible = false;
+            this.GMouldTypeID.Width = 125;
             // 
             // GMouldTypeName
             // 
             this.GMouldTypeName.DataPropertyName = "GMouldTypeName";
             this.GMouldTypeName.HeaderText = "成型线类型";
+            this.GMouldTypeName.MinimumWidth = 6;
             this.GMouldTypeName.Name = "GMouldTypeName";
             this.GMouldTypeName.ReadOnly = true;
+            this.GMouldTypeName.Width = 125;
             // 
             // GroutingMouldCode
             // 
             this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
             this.GroutingMouldCode.HeaderText = "模具编号";
+            this.GroutingMouldCode.MinimumWidth = 6;
             this.GroutingMouldCode.Name = "GroutingMouldCode";
             this.GroutingMouldCode.ReadOnly = true;
+            this.GroutingMouldCode.Width = 125;
             // 
             // GroutingDate
             // 
             this.GroutingDate.DataPropertyName = "GroutingDate";
-            dataGridViewCellStyle6.Format = "yyyy-MM-dd";
-            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle14.Format = "yyyy-MM-dd";
+            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle14;
             this.GroutingDate.HeaderText = "注浆日期";
+            this.GroutingDate.MinimumWidth = 6;
             this.GroutingDate.Name = "GroutingDate";
             this.GroutingDate.ReadOnly = true;
+            this.GroutingDate.Width = 125;
             // 
             // GROUTINGCOUNT
             // 
             this.GROUTINGCOUNT.DataPropertyName = "GROUTINGCOUNT";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.GROUTINGCOUNT.DefaultCellStyle = dataGridViewCellStyle15;
             this.GROUTINGCOUNT.HeaderText = "注浆次数";
+            this.GROUTINGCOUNT.MinimumWidth = 6;
             this.GROUTINGCOUNT.Name = "GROUTINGCOUNT";
             this.GROUTINGCOUNT.ReadOnly = true;
+            this.GROUTINGCOUNT.Width = 125;
             // 
             // GROUTINGUSERCODE
             // 
             this.GROUTINGUSERCODE.DataPropertyName = "GROUTINGUSERCODE";
             this.GROUTINGUSERCODE.HeaderText = "成型工号";
+            this.GROUTINGUSERCODE.MinimumWidth = 6;
             this.GROUTINGUSERCODE.Name = "GROUTINGUSERCODE";
             this.GROUTINGUSERCODE.ReadOnly = true;
+            this.GROUTINGUSERCODE.Width = 125;
             // 
             // GoodsID
             // 
             this.GoodsID.DataPropertyName = "GoodsID";
             this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.MinimumWidth = 6;
             this.GoodsID.Name = "GoodsID";
             this.GoodsID.ReadOnly = true;
             this.GoodsID.Visible = false;
+            this.GoodsID.Width = 125;
             // 
             // UserID
             // 
             this.UserID.DataPropertyName = "UserID";
             this.UserID.HeaderText = "工号ID";
+            this.UserID.MinimumWidth = 6;
             this.UserID.Name = "UserID";
             this.UserID.ReadOnly = true;
             this.UserID.Visible = false;
+            this.UserID.Width = 125;
             // 
             // UserName
             // 
             this.UserName.DataPropertyName = "UserName";
             this.UserName.HeaderText = "工号姓名";
+            this.UserName.MinimumWidth = 6;
             this.UserName.Name = "UserName";
             this.UserName.ReadOnly = true;
             this.UserName.Visible = false;
+            this.UserName.Width = 125;
             // 
             // IsPublicBody
             // 
             this.IsPublicBody.DataPropertyName = "IsPublicBody";
             this.IsPublicBody.FalseValue = "0";
             this.IsPublicBody.HeaderText = "公坯标识";
+            this.IsPublicBody.MinimumWidth = 6;
             this.IsPublicBody.Name = "IsPublicBody";
             this.IsPublicBody.ReadOnly = true;
             this.IsPublicBody.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.IsPublicBody.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.IsPublicBody.TrueValue = "1";
             this.IsPublicBody.Visible = false;
+            this.IsPublicBody.Width = 125;
             // 
             // IsReworked
             // 
             this.IsReworked.DataPropertyName = "IsReFire";
             this.IsReworked.FalseValue = "0";
             this.IsReworked.HeaderText = "重烧标识";
+            this.IsReworked.MinimumWidth = 6;
             this.IsReworked.Name = "IsReworked";
             this.IsReworked.ReadOnly = true;
             this.IsReworked.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.IsReworked.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.IsReworked.TrueValue = "1";
+            this.IsReworked.Width = 125;
             // 
             // SPECIALREPAIRFLAG
             // 
             this.SPECIALREPAIRFLAG.DataPropertyName = "SPECIALREPAIRFLAG";
             this.SPECIALREPAIRFLAG.FalseValue = "0";
             this.SPECIALREPAIRFLAG.HeaderText = "干补标识";
+            this.SPECIALREPAIRFLAG.MinimumWidth = 6;
             this.SPECIALREPAIRFLAG.Name = "SPECIALREPAIRFLAG";
             this.SPECIALREPAIRFLAG.ReadOnly = true;
             this.SPECIALREPAIRFLAG.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.SPECIALREPAIRFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.SPECIALREPAIRFLAG.TrueValue = "1";
+            this.SPECIALREPAIRFLAG.Width = 125;
             // 
             // GroutingDailyID
             // 
             this.GroutingDailyID.DataPropertyName = "GroutingDailyID";
             this.GroutingDailyID.HeaderText = "注浆日报ID";
+            this.GroutingDailyID.MinimumWidth = 6;
             this.GroutingDailyID.Name = "GroutingDailyID";
             this.GroutingDailyID.ReadOnly = true;
             this.GroutingDailyID.Visible = false;
+            this.GroutingDailyID.Width = 125;
             // 
             // GroutingDailyDetailID
             // 
             this.GroutingDailyDetailID.DataPropertyName = "GroutingDailyDetailID";
             this.GroutingDailyDetailID.HeaderText = "注浆日报明细ID";
+            this.GroutingDailyDetailID.MinimumWidth = 6;
             this.GroutingDailyDetailID.Name = "GroutingDailyDetailID";
             this.GroutingDailyDetailID.ReadOnly = true;
             this.GroutingDailyDetailID.Visible = false;
+            this.GroutingDailyDetailID.Width = 125;
             // 
             // CanManyTimes
             // 
             this.CanManyTimes.DataPropertyName = "CanManyTimes";
             this.CanManyTimes.HeaderText = "能否多次注浆";
+            this.CanManyTimes.MinimumWidth = 6;
             this.CanManyTimes.Name = "CanManyTimes";
             this.CanManyTimes.ReadOnly = true;
             this.CanManyTimes.Visible = false;
+            this.CanManyTimes.Width = 125;
             // 
             // GroutingLineDetailID
             // 
             this.GroutingLineDetailID.DataPropertyName = "GroutingLineDetailID";
             this.GroutingLineDetailID.HeaderText = "成型生产线明细ID";
+            this.GroutingLineDetailID.MinimumWidth = 6;
             this.GroutingLineDetailID.Name = "GroutingLineDetailID";
             this.GroutingLineDetailID.ReadOnly = true;
             this.GroutingLineDetailID.Visible = false;
+            this.GroutingLineDetailID.Width = 125;
             // 
             // CreateUserID
             // 
             this.CreateUserID.DataPropertyName = "CreateUserID";
             this.CreateUserID.HeaderText = "创建数据操作员ID";
+            this.CreateUserID.MinimumWidth = 6;
             this.CreateUserID.Name = "CreateUserID";
             this.CreateUserID.ReadOnly = true;
             this.CreateUserID.Visible = false;
+            this.CreateUserID.Width = 125;
             // 
             // CreateUserName
             // 
             this.CreateUserName.DataPropertyName = "CreateUserName";
             this.CreateUserName.HeaderText = "创建数据操作员";
+            this.CreateUserName.MinimumWidth = 6;
             this.CreateUserName.Name = "CreateUserName";
             this.CreateUserName.ReadOnly = true;
             this.CreateUserName.Visible = false;
+            this.CreateUserName.Width = 125;
             // 
             // UpdateUserID
             // 
             this.UpdateUserID.DataPropertyName = "UpdateUserID";
             this.UpdateUserID.HeaderText = "更新数据操作员ID";
+            this.UpdateUserID.MinimumWidth = 6;
             this.UpdateUserID.Name = "UpdateUserID";
             this.UpdateUserID.ReadOnly = true;
             this.UpdateUserID.Visible = false;
+            this.UpdateUserID.Width = 125;
             // 
             // UpdateUserName
             // 
             this.UpdateUserName.DataPropertyName = "UpdateUserName";
             this.UpdateUserName.HeaderText = "更新数据操作员";
+            this.UpdateUserName.MinimumWidth = 6;
             this.UpdateUserName.Name = "UpdateUserName";
             this.UpdateUserName.ReadOnly = true;
             this.UpdateUserName.Visible = false;
+            this.UpdateUserName.Width = 125;
             // 
             // Remarks
             // 
             this.Remarks.DataPropertyName = "Remarks";
             this.Remarks.HeaderText = "备注";
+            this.Remarks.MinimumWidth = 6;
             this.Remarks.Name = "Remarks";
             this.Remarks.ReadOnly = true;
             this.Remarks.Visible = false;
+            this.Remarks.Width = 125;
             // 
             // gbxCondition
             // 
@@ -585,10 +669,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, 48);
+            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1119, 117);
+            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
+            this.gbxCondition.Size = new System.Drawing.Size(1492, 146);
             this.gbxCondition.TabIndex = 27;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
@@ -602,10 +688,11 @@
             this.txtBarcode.ErrorMessage = "";
             this.txtBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtBarcode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtBarcode.Location = new System.Drawing.Point(81, 87);
+            this.txtBarcode.Location = new System.Drawing.Point(108, 109);
+            this.txtBarcode.Margin = new System.Windows.Forms.Padding(4);
             this.txtBarcode.MaxLength = 11;
             this.txtBarcode.Name = "txtBarcode";
-            this.txtBarcode.Size = new System.Drawing.Size(135, 21);
+            this.txtBarcode.Size = new System.Drawing.Size(179, 25);
             this.txtBarcode.TabIndex = 10;
             this.txtBarcode.TextValue = "";
             // 
@@ -614,9 +701,10 @@
             this.lblbarcode1.AutoSize = true;
             this.lblbarcode1.BackColor = System.Drawing.Color.Transparent;
             this.lblbarcode1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblbarcode1.Location = new System.Drawing.Point(20, 92);
+            this.lblbarcode1.Location = new System.Drawing.Point(27, 115);
+            this.lblbarcode1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblbarcode1.Name = "lblbarcode1";
-            this.lblbarcode1.Size = new System.Drawing.Size(53, 12);
+            this.lblbarcode1.Size = new System.Drawing.Size(67, 15);
             this.lblbarcode1.TabIndex = 40;
             this.lblbarcode1.Text = "产品条码";
             // 
@@ -624,9 +712,10 @@
             // 
             this.chkDeletedate.AutoSize = true;
             this.chkDeletedate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkDeletedate.Location = new System.Drawing.Point(437, 89);
+            this.chkDeletedate.Location = new System.Drawing.Point(583, 111);
+            this.chkDeletedate.Margin = new System.Windows.Forms.Padding(4);
             this.chkDeletedate.Name = "chkDeletedate";
-            this.chkDeletedate.Size = new System.Drawing.Size(72, 16);
+            this.chkDeletedate.Size = new System.Drawing.Size(89, 19);
             this.chkDeletedate.TabIndex = 11;
             this.chkDeletedate.Text = "清除日期";
             this.chkDeletedate.UseVisualStyleBackColor = true;
@@ -636,9 +725,10 @@
             // 
             this.chkScrapDate.AutoSize = true;
             this.chkScrapDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkScrapDate.Location = new System.Drawing.Point(438, 63);
+            this.chkScrapDate.Location = new System.Drawing.Point(584, 79);
+            this.chkScrapDate.Margin = new System.Windows.Forms.Padding(4);
             this.chkScrapDate.Name = "chkScrapDate";
-            this.chkScrapDate.Size = new System.Drawing.Size(72, 16);
+            this.chkScrapDate.Size = new System.Drawing.Size(89, 19);
             this.chkScrapDate.TabIndex = 7;
             this.chkScrapDate.Text = "报废日期";
             this.chkScrapDate.UseVisualStyleBackColor = true;
@@ -648,9 +738,10 @@
             // 
             this.chkDateTime.AutoSize = true;
             this.chkDateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkDateTime.Location = new System.Drawing.Point(438, 36);
+            this.chkDateTime.Location = new System.Drawing.Point(584, 45);
+            this.chkDateTime.Margin = new System.Windows.Forms.Padding(4);
             this.chkDateTime.Name = "chkDateTime";
-            this.chkDateTime.Size = new System.Drawing.Size(72, 16);
+            this.chkDateTime.Size = new System.Drawing.Size(89, 19);
             this.chkDateTime.TabIndex = 2;
             this.chkDateTime.Text = "完成日期";
             this.chkDateTime.UseVisualStyleBackColor = true;
@@ -662,9 +753,10 @@
             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(658, 90);
+            this.c_Label4.Location = new System.Drawing.Point(877, 112);
+            this.c_Label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(11, 12);
+            this.c_Label4.Size = new System.Drawing.Size(15, 15);
             this.c_Label4.TabIndex = 36;
             this.c_Label4.Text = "-";
             // 
@@ -674,9 +766,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(658, 65);
+            this.c_Label3.Location = new System.Drawing.Point(877, 81);
+            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(11, 12);
+            this.c_Label3.Size = new System.Drawing.Size(15, 15);
             this.c_Label3.TabIndex = 36;
             this.c_Label3.Text = "-";
             // 
@@ -685,9 +778,10 @@
             this.dtpDeletedDateEnd.CustomFormat = "yyyy-MM-dd";
             this.dtpDeletedDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpDeletedDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpDeletedDateEnd.Location = new System.Drawing.Point(680, 85);
+            this.dtpDeletedDateEnd.Location = new System.Drawing.Point(907, 106);
+            this.dtpDeletedDateEnd.Margin = new System.Windows.Forms.Padding(4);
             this.dtpDeletedDateEnd.Name = "dtpDeletedDateEnd";
-            this.dtpDeletedDateEnd.Size = new System.Drawing.Size(149, 21);
+            this.dtpDeletedDateEnd.Size = new System.Drawing.Size(197, 25);
             this.dtpDeletedDateEnd.TabIndex = 13;
             // 
             // dtpScrapDateEnd
@@ -695,9 +789,10 @@
             this.dtpScrapDateEnd.CustomFormat = "yyyy-MM-dd";
             this.dtpScrapDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpScrapDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpScrapDateEnd.Location = new System.Drawing.Point(680, 60);
+            this.dtpScrapDateEnd.Location = new System.Drawing.Point(907, 75);
+            this.dtpScrapDateEnd.Margin = new System.Windows.Forms.Padding(4);
             this.dtpScrapDateEnd.Name = "dtpScrapDateEnd";
-            this.dtpScrapDateEnd.Size = new System.Drawing.Size(149, 21);
+            this.dtpScrapDateEnd.Size = new System.Drawing.Size(197, 25);
             this.dtpScrapDateEnd.TabIndex = 9;
             // 
             // c_Label2
@@ -706,9 +801,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(658, 38);
+            this.c_Label2.Location = new System.Drawing.Point(877, 48);
+            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(11, 12);
+            this.c_Label2.Size = new System.Drawing.Size(15, 15);
             this.c_Label2.TabIndex = 34;
             this.c_Label2.Text = "-";
             // 
@@ -717,9 +813,10 @@
             this.dtpUpdateTimeEnd.CustomFormat = "yyyy-MM-dd";
             this.dtpUpdateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpUpdateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpUpdateTimeEnd.Location = new System.Drawing.Point(680, 34);
+            this.dtpUpdateTimeEnd.Location = new System.Drawing.Point(907, 42);
+            this.dtpUpdateTimeEnd.Margin = new System.Windows.Forms.Padding(4);
             this.dtpUpdateTimeEnd.Name = "dtpUpdateTimeEnd";
-            this.dtpUpdateTimeEnd.Size = new System.Drawing.Size(149, 21);
+            this.dtpUpdateTimeEnd.Size = new System.Drawing.Size(197, 25);
             this.dtpUpdateTimeEnd.TabIndex = 4;
             // 
             // cmbDataSource
@@ -729,9 +826,10 @@
             this.cmbDataSource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbDataSource.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cmbDataSource.FormattingEnabled = true;
-            this.cmbDataSource.Location = new System.Drawing.Point(80, 61);
+            this.cmbDataSource.Location = new System.Drawing.Point(107, 76);
+            this.cmbDataSource.Margin = new System.Windows.Forms.Padding(4);
             this.cmbDataSource.Name = "cmbDataSource";
-            this.cmbDataSource.Size = new System.Drawing.Size(135, 20);
+            this.cmbDataSource.Size = new System.Drawing.Size(179, 23);
             this.cmbDataSource.TabIndex = 5;
             this.cmbDataSource.SelectedIndexChanged += new System.EventHandler(this.cmbDataSource_SelectedIndexChanged);
             // 
@@ -740,9 +838,10 @@
             this.dtpDeletedDateStart.CustomFormat = "yyyy-MM-dd";
             this.dtpDeletedDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpDeletedDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpDeletedDateStart.Location = new System.Drawing.Point(513, 85);
+            this.dtpDeletedDateStart.Location = new System.Drawing.Point(684, 106);
+            this.dtpDeletedDateStart.Margin = new System.Windows.Forms.Padding(4);
             this.dtpDeletedDateStart.Name = "dtpDeletedDateStart";
-            this.dtpDeletedDateStart.Size = new System.Drawing.Size(135, 21);
+            this.dtpDeletedDateStart.Size = new System.Drawing.Size(179, 25);
             this.dtpDeletedDateStart.TabIndex = 12;
             // 
             // comGoodsType
@@ -752,9 +851,10 @@
             this.comGoodsType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comGoodsType.FormattingEnabled = true;
-            this.comGoodsType.Location = new System.Drawing.Point(292, 61);
+            this.comGoodsType.Location = new System.Drawing.Point(389, 76);
+            this.comGoodsType.Margin = new System.Windows.Forms.Padding(4);
             this.comGoodsType.Name = "comGoodsType";
-            this.comGoodsType.Size = new System.Drawing.Size(135, 20);
+            this.comGoodsType.Size = new System.Drawing.Size(179, 23);
             this.comGoodsType.TabIndex = 6;
             // 
             // dtpScrapDate
@@ -762,9 +862,10 @@
             this.dtpScrapDate.CustomFormat = "yyyy-MM-dd";
             this.dtpScrapDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpScrapDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpScrapDate.Location = new System.Drawing.Point(513, 60);
+            this.dtpScrapDate.Location = new System.Drawing.Point(684, 75);
+            this.dtpScrapDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtpScrapDate.Name = "dtpScrapDate";
-            this.dtpScrapDate.Size = new System.Drawing.Size(135, 21);
+            this.dtpScrapDate.Size = new System.Drawing.Size(179, 25);
             this.dtpScrapDate.TabIndex = 8;
             // 
             // dtpUpdateTimeStart
@@ -772,9 +873,10 @@
             this.dtpUpdateTimeStart.CustomFormat = "yyyy-MM-dd";
             this.dtpUpdateTimeStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpUpdateTimeStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpUpdateTimeStart.Location = new System.Drawing.Point(513, 34);
+            this.dtpUpdateTimeStart.Location = new System.Drawing.Point(684, 42);
+            this.dtpUpdateTimeStart.Margin = new System.Windows.Forms.Padding(4);
             this.dtpUpdateTimeStart.Name = "dtpUpdateTimeStart";
-            this.dtpUpdateTimeStart.Size = new System.Drawing.Size(135, 21);
+            this.dtpUpdateTimeStart.Size = new System.Drawing.Size(179, 25);
             this.dtpUpdateTimeStart.TabIndex = 3;
             // 
             // c_Label1
@@ -783,9 +885,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(21, 62);
+            this.c_Label1.Location = new System.Drawing.Point(28, 78);
+            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(67, 15);
             this.c_Label1.TabIndex = 6;
             this.c_Label1.Text = "数据来源";
             // 
@@ -795,9 +898,10 @@
             this.lblGoodsType.BackColor = System.Drawing.Color.Transparent;
             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(233, 63);
+            this.lblGoodsType.Location = new System.Drawing.Point(311, 79);
+            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(67, 15);
             this.lblGoodsType.TabIndex = 6;
             this.lblGoodsType.Text = "产品分级";
             // 
@@ -808,7 +912,8 @@
             this.dkProcedureSearchBox.Enabled = true;
             this.dkProcedureSearchBox.IsEnablePurview = false;
             this.dkProcedureSearchBox.IsMustInput = false;
-            this.dkProcedureSearchBox.Location = new System.Drawing.Point(235, 34);
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(313, 42);
+            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
             this.dkProcedureSearchBox.ModelType = null;
             this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
             this.dkProcedureSearchBox.ProcedureCode = "";
@@ -818,7 +923,7 @@
             this.dkProcedureSearchBox.Purview = null;
             this.dkProcedureSearchBox.PurviewType = ((byte)(0));
             this.dkProcedureSearchBox.SelectMore = true;
-            this.dkProcedureSearchBox.Size = new System.Drawing.Size(193, 21);
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(257, 26);
             this.dkProcedureSearchBox.TabIndex = 1;
             this.dkProcedureSearchBox.Title = "完成工序";
             this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -830,7 +935,8 @@
             this.dkproductionLineSearchBox.Enabled = true;
             this.dkproductionLineSearchBox.IsEnablePurview = false;
             this.dkproductionLineSearchBox.IsMustInput = false;
-            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(22, 34);
+            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(29, 42);
+            this.dkproductionLineSearchBox.Margin = new System.Windows.Forms.Padding(5);
             this.dkproductionLineSearchBox.Name = "dkproductionLineSearchBox";
             this.dkproductionLineSearchBox.ProductionLineCode = "";
             this.dkproductionLineSearchBox.ProductionLineID = null;
@@ -839,7 +945,7 @@
             this.dkproductionLineSearchBox.Purview = null;
             this.dkproductionLineSearchBox.PurviewType = ((byte)(0));
             this.dkproductionLineSearchBox.SelectMore = true;
-            this.dkproductionLineSearchBox.Size = new System.Drawing.Size(193, 21);
+            this.dkproductionLineSearchBox.Size = new System.Drawing.Size(257, 26);
             this.dkproductionLineSearchBox.TabIndex = 0;
             this.dkproductionLineSearchBox.Title = "  生产线";
             this.dkproductionLineSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -851,9 +957,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(950, 82);
+            this.btnClearCondition.Location = new System.Drawing.Point(1267, 102);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4);
             this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
             this.btnClearCondition.TabIndex = 15;
             this.btnClearCondition.Text = "清空条件(&C)";
             this.btnClearCondition.UseVisualStyleBackColor = true;
@@ -866,9 +973,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(859, 82);
+            this.btnSearch.Location = new System.Drawing.Point(1145, 102);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.Size = new System.Drawing.Size(113, 38);
             this.btnSearch.TabIndex = 14;
             this.btnSearch.Text = "查询(&Q)";
             this.btnSearch.UseVisualStyleBackColor = true;
@@ -879,11 +987,13 @@
             this.tsrOperate.AutoSize = false;
             this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
             this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnClearSelected,
             this.tsbtnAllClear,
             this.tsbtnResetData,
             this.tsbtnResetSelected,
+            this.buttonCheckAll,
             this.toolStripSeparator1,
             this.tsbtnAdaptive,
             this.tsbtnClose});
@@ -891,7 +1001,7 @@
             this.tsrOperate.Name = "tsrOperate";
             this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1131, 35);
+            this.tsrOperate.Size = new System.Drawing.Size(1508, 44);
             this.tsrOperate.TabIndex = 26;
             this.tsrOperate.Text = "toolStrip1";
             // 
@@ -901,7 +1011,7 @@
             this.tsbtnClearSelected.Enabled = false;
             this.tsbtnClearSelected.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnClearSelected.Name = "tsbtnClearSelected";
-            this.tsbtnClearSelected.Size = new System.Drawing.Size(57, 32);
+            this.tsbtnClearSelected.Size = new System.Drawing.Size(71, 41);
             this.tsbtnClearSelected.Text = "清除选择";
             this.tsbtnClearSelected.Click += new System.EventHandler(this.tsbtnClearSelected_Click);
             // 
@@ -911,7 +1021,7 @@
             this.tsbtnAllClear.Enabled = false;
             this.tsbtnAllClear.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnAllClear.Name = "tsbtnAllClear";
-            this.tsbtnAllClear.Size = new System.Drawing.Size(57, 32);
+            this.tsbtnAllClear.Size = new System.Drawing.Size(71, 41);
             this.tsbtnAllClear.Text = "批量清除";
             this.tsbtnAllClear.Click += new System.EventHandler(this.tsbtnAllClear_Click);
             // 
@@ -921,7 +1031,7 @@
             this.tsbtnResetData.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnResetData.Image")));
             this.tsbtnResetData.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnResetData.Name = "tsbtnResetData";
-            this.tsbtnResetData.Size = new System.Drawing.Size(57, 32);
+            this.tsbtnResetData.Size = new System.Drawing.Size(71, 41);
             this.tsbtnResetData.Text = "恢复数据";
             this.tsbtnResetData.Click += new System.EventHandler(this.tsbtnResetData_Click);
             // 
@@ -931,7 +1041,7 @@
             this.tsbtnResetSelected.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnResetSelected.Image")));
             this.tsbtnResetSelected.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbtnResetSelected.Name = "tsbtnResetSelected";
-            this.tsbtnResetSelected.Size = new System.Drawing.Size(57, 32);
+            this.tsbtnResetSelected.Size = new System.Drawing.Size(71, 41);
             this.tsbtnResetSelected.Text = "恢复选定";
             this.tsbtnResetSelected.Click += new System.EventHandler(this.tsbtnResetSelected_Click);
             // 
@@ -963,15 +1073,26 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
+            // buttonCheckAll
+            // 
+            this.buttonCheckAll.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.buttonCheckAll.Image = ((System.Drawing.Image)(resources.GetObject("buttonCheckAll.Image")));
+            this.buttonCheckAll.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.buttonCheckAll.Name = "buttonCheckAll";
+            this.buttonCheckAll.Size = new System.Drawing.Size(41, 41);
+            this.buttonCheckAll.Text = "全选";
+            this.buttonCheckAll.Click += new System.EventHandler(this.buttonCheckAll_Click);
+            // 
             // F_PM_2112
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1131, 401);
+            this.ClientSize = new System.Drawing.Size(1508, 501);
             this.Controls.Add(this.dgvInProduction);
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.tsrOperate);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_PM_2112";
             this.RightToLeftLayout = true;
             this.Text = "清除在产临时数据";
@@ -1061,5 +1182,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserID;
         private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+        private System.Windows.Forms.ToolStripButton buttonCheckAll;
     }
 }

DK.Client/PMModule/F_PM_2112.cs

@@ -606,5 +606,14 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
         }
 
         #endregion
+
+        private void buttonCheckAll_Click(object sender, EventArgs e)
+        {
+            for(int i = 0; i < dgvInProduction.Rows.Count; i++)
+            {
+                ((DataGridViewCheckBoxCell)dgvInProduction.Rows[i].Cells["Sel"]).Value = true;
+            }
+            
+        }
     }
 }

DK.Client/PMModule/F_PM_2112.resx

@@ -200,7 +200,7 @@
   <data name="tsbtnResetData.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -215,7 +215,22 @@
   <data name="tsbtnResetSelected.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="buttonCheckAll.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -16719,6 +16719,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                                     KILNID, KILNCODE, KILNNAME, KILNCARID, 
                                                     KILNCARCODE, KILNCARNAME, KILNCARBATCHNO, KILNCARPOSITION,SpecialRepairFlag,FlowProcedureID
                                                     ,FlowProcedureTime,ProcedureID,ProcedureTime,ProductionDataID,0,logoid,IsReworkFlag,SemiCheckID
+                                                    --xuwei add 2022-12-24 ISLENGBU 是否冷补 暂时默认为0 应补充到TP_PM_InProduction_Tmp表中
+                                                    ,0
                         from TP_PM_InProduction_Tmp  p where p.barcode = :barcode";
                     }
                     else
@@ -16743,6 +16745,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                                     CREATEUSERID, UPDATETIME, UPDATEUSERID,optimestamp,
                                                     SpecialRepairFlag,FlowProcedureID
                                                     ,FlowProcedureTime,ProcedureID,ProcedureTime,ProductionDataID,logoid,IsReworkFlag,SemiCheckID
+                                                    --xuwei add 2022-12-24
+                                                    ,0
                         from TP_PM_InProduction_Tmp  p where p.barcode = :barcode";
                     }
                     returnRows += oracleTrConn.ExecuteNonQuery(sql, Paras);
@@ -16790,7 +16794,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 pd.GROUTINGLINEID,pd.GROUTINGLINECODE,pd.GROUTINGLINENAME,pd.GMOULDTYPEID,pd.CANMANYTIMES,
                                  pd.GROUTINGLINEDETAILID,pd.SPECIALREPAIRFLAG,pd.CLASSESSETTINGID,
                             '1',pd.LOGOID,
-                            pd.BackOutTime,pd.BackOutUserID,pd.BackOutUserCode,pd.checktime
+                            pd.BackOutTime,pd.BackOutUserID,pd.BackOutUserCode,pd.checktime,
+                            --xuwei add 2022-12-24
+                            pd.FINISHEDPROCEDUREID,
+                            pd.ISLENGBU
                       from tp_pm_productiondata pd
                      where pd.barcode = :barcode
                        and pd.productiondataid not in