成型工号→成型工位号

DK.Client/PCModule/F_PC_0104_1.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnDisable.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
@@ -139,7 +139,7 @@
   <data name="tsbtnStart.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
@@ -154,7 +154,7 @@
   <data name="tsbtnManager.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

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -944,7 +944,7 @@
 			// UserCode
 			// 
 			this.UserCode.DataPropertyName = "UserCode";
-			this.UserCode.HeaderText = "成型工号";
+			this.UserCode.HeaderText = "成型工位号";
 			this.UserCode.MinimumWidth = 6;
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;

DK.Client/PMModule/F_PM_0102.Designer.cs

@@ -37,27 +37,6 @@
 			this.btnClose = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.dgvDetail = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.GroutingDailyID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingDailyDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingUserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.monitorid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.monitorcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.NoGroutingRreason = new System.Windows.Forms.DataGridViewComboBoxColumn();
-			this.colLogo = new System.Windows.Forms.DataGridViewComboBoxColumn();
-			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ScrapFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.lblGroutingDate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
 			this.tsbtnAllGrouting = new System.Windows.Forms.ToolStripButton();
@@ -79,6 +58,27 @@
 			this.txtGrouting = new System.Windows.Forms.TextBox();
 			this.lblGroutingDateValue = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.lblGrouting = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.GroutingDailyID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingDailyDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineDetailID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingUserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.monitorid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.monitorcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.NoGroutingRreason = new System.Windows.Forms.DataGridViewComboBoxColumn();
+			this.colLogo = new System.Windows.Forms.DataGridViewComboBoxColumn();
+			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ScrapFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
 			this.tsrOperate.SuspendLayout();
 			this.gbxInfo.SuspendLayout();
@@ -93,7 +93,7 @@
 			this.btnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClose.ForeColor = System.Drawing.Color.White;
 			this.btnClose.Location = new System.Drawing.Point(1052, 558);
-			this.btnClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnClose.Margin = new System.Windows.Forms.Padding(4);
 			this.btnClose.Name = "btnClose";
 			this.btnClose.Size = new System.Drawing.Size(113, 38);
 			this.btnClose.TabIndex = 4;
@@ -110,7 +110,7 @@
 			this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSave.ForeColor = System.Drawing.Color.White;
 			this.btnSave.Location = new System.Drawing.Point(931, 558);
-			this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSave.Margin = new System.Windows.Forms.Padding(4);
 			this.btnSave.Name = "btnSave";
 			this.btnSave.Size = new System.Drawing.Size(113, 38);
 			this.btnSave.TabIndex = 3;
@@ -190,7 +190,7 @@
 			this.dgvDetail.IsSubTotalFlag = false;
 			this.dgvDetail.IsTopDeep = false;
 			this.dgvDetail.Location = new System.Drawing.Point(16, 176);
-			this.dgvDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvDetail.Margin = new System.Windows.Forms.Padding(4);
 			this.dgvDetail.MergeColumnNames = null;
 			this.dgvDetail.MergeDetailColumnNames = null;
 			this.dgvDetail.MergeDetailOnlyColumn = null;
@@ -214,206 +214,6 @@
 			this.dgvDetail.CurrentCellDirtyStateChanged += new System.EventHandler(this.dgvDetail_CurrentCellDirtyStateChanged);
 			this.dgvDetail.Sorted += new System.EventHandler(this.dgvDetail_Sorted);
 			// 
-			// GroutingDailyID
-			// 
-			this.GroutingDailyID.DataPropertyName = "GroutingDailyID";
-			this.GroutingDailyID.HeaderText = "注浆日报ID";
-			this.GroutingDailyID.MinimumWidth = 6;
-			this.GroutingDailyID.Name = "GroutingDailyID";
-			this.GroutingDailyID.Visible = false;
-			this.GroutingDailyID.Width = 125;
-			// 
-			// GroutingDailyDetailID
-			// 
-			this.GroutingDailyDetailID.HeaderText = "注浆日报明细ID";
-			this.GroutingDailyDetailID.MinimumWidth = 6;
-			this.GroutingDailyDetailID.Name = "GroutingDailyDetailID";
-			this.GroutingDailyDetailID.Visible = false;
-			this.GroutingDailyDetailID.Width = 125;
-			// 
-			// GroutingLineId
-			// 
-			this.GroutingLineId.DataPropertyName = "GroutingLineId";
-			this.GroutingLineId.HeaderText = "成型线ID";
-			this.GroutingLineId.MinimumWidth = 6;
-			this.GroutingLineId.Name = "GroutingLineId";
-			this.GroutingLineId.Visible = false;
-			this.GroutingLineId.Width = 125;
-			// 
-			// GroutingLineDetailID
-			// 
-			this.GroutingLineDetailID.DataPropertyName = "GroutingLineDetailID";
-			this.GroutingLineDetailID.HeaderText = "成型线明细ID";
-			this.GroutingLineDetailID.MinimumWidth = 6;
-			this.GroutingLineDetailID.Name = "GroutingLineDetailID";
-			this.GroutingLineDetailID.Visible = false;
-			this.GroutingLineDetailID.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.Width = 125;
-			// 
-			// GroutingUserID
-			// 
-			this.GroutingUserID.DataPropertyName = "UserID";
-			this.GroutingUserID.HeaderText = "成型工号ID";
-			this.GroutingUserID.MinimumWidth = 6;
-			this.GroutingUserID.Name = "GroutingUserID";
-			this.GroutingUserID.Visible = false;
-			this.GroutingUserID.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;
-			// 
-			// monitorid
-			// 
-			this.monitorid.DataPropertyName = "monitorid";
-			this.monitorid.HeaderText = "monitorid";
-			this.monitorid.MinimumWidth = 6;
-			this.monitorid.Name = "monitorid";
-			this.monitorid.Visible = false;
-			this.monitorid.Width = 125;
-			// 
-			// monitorcode
-			// 
-			this.monitorcode.DataPropertyName = "monitorcode";
-			this.monitorcode.HeaderText = "成型班长";
-			this.monitorcode.MinimumWidth = 6;
-			this.monitorcode.Name = "monitorcode";
-			this.monitorcode.ReadOnly = true;
-			this.monitorcode.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;
-			// 
-			// GroutingMouldCode
-			// 
-			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-			this.GroutingMouldCode.HeaderText = "模具编号";
-			this.GroutingMouldCode.MinimumWidth = 6;
-			this.GroutingMouldCode.Name = "GroutingMouldCode";
-			this.GroutingMouldCode.ReadOnly = true;
-			this.GroutingMouldCode.Width = 120;
-			// 
-			// GMouldStatus
-			// 
-			this.GMouldStatus.DataPropertyName = "GMouldStatusName";
-			this.GMouldStatus.HeaderText = "模具状态";
-			this.GMouldStatus.MinimumWidth = 6;
-			this.GMouldStatus.Name = "GMouldStatus";
-			this.GMouldStatus.ReadOnly = true;
-			this.GMouldStatus.Width = 60;
-			// 
-			// GroutingBatchNo
-			// 
-			this.GroutingBatchNo.DataPropertyName = "GroutingBatchNo";
-			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle3;
-			this.GroutingBatchNo.HeaderText = "注浆批次";
-			this.GroutingBatchNo.MinimumWidth = 6;
-			this.GroutingBatchNo.Name = "GroutingBatchNo";
-			this.GroutingBatchNo.ReadOnly = true;
-			this.GroutingBatchNo.Width = 125;
-			// 
-			// GroutingFlag
-			// 
-			this.GroutingFlag.DataPropertyName = "GroutingFlag";
-			this.GroutingFlag.FalseValue = "0";
-			this.GroutingFlag.HeaderText = "注浆标识";
-			this.GroutingFlag.IndeterminateValue = "0";
-			this.GroutingFlag.MinimumWidth = 6;
-			this.GroutingFlag.Name = "GroutingFlag";
-			this.GroutingFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.GroutingFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.GroutingFlag.TrueValue = "1";
-			this.GroutingFlag.Width = 80;
-			// 
-			// NoGroutingRreason
-			// 
-			this.NoGroutingRreason.DataPropertyName = "NoGroutingRreason";
-			this.NoGroutingRreason.HeaderText = "未注浆原因";
-			this.NoGroutingRreason.MinimumWidth = 6;
-			this.NoGroutingRreason.Name = "NoGroutingRreason";
-			this.NoGroutingRreason.ReadOnly = true;
-			this.NoGroutingRreason.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.NoGroutingRreason.Width = 125;
-			// 
-			// colLogo
-			// 
-			this.colLogo.DataPropertyName = "LogoID";
-			this.colLogo.HeaderText = "产品商标";
-			this.colLogo.MinimumWidth = 6;
-			this.colLogo.Name = "colLogo";
-			this.colLogo.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.colLogo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.colLogo.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;
-			// 
-			// ScrapFlag
-			// 
-			this.ScrapFlag.DataPropertyName = "ScrapFlag";
-			this.ScrapFlag.FalseValue = "0";
-			this.ScrapFlag.HeaderText = "损坯标识";
-			this.ScrapFlag.IndeterminateValue = "0";
-			this.ScrapFlag.MinimumWidth = 6;
-			this.ScrapFlag.Name = "ScrapFlag";
-			this.ScrapFlag.ReadOnly = true;
-			this.ScrapFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.ScrapFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.ScrapFlag.TrueValue = "1";
-			this.ScrapFlag.Width = 125;
-			// 
-			// Remarks
-			// 
-			this.Remarks.DataPropertyName = "Remarks";
-			this.Remarks.HeaderText = "备注";
-			this.Remarks.MinimumWidth = 6;
-			this.Remarks.Name = "Remarks";
-			this.Remarks.Width = 125;
-			// 
 			// lblGroutingDate
 			// 
 			this.lblGroutingDate.AutoSize = true;
@@ -549,9 +349,9 @@
 			this.gbxInfo.Controls.Add(this.lblGrouting);
 			this.gbxInfo.Controls.Add(this.lblGroutingDate);
 			this.gbxInfo.Location = new System.Drawing.Point(16, 48);
-			this.gbxInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxInfo.Margin = new System.Windows.Forms.Padding(4);
 			this.gbxInfo.Name = "gbxInfo";
-			this.gbxInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxInfo.Padding = new System.Windows.Forms.Padding(4);
 			this.gbxInfo.Size = new System.Drawing.Size(1149, 121);
 			this.gbxInfo.TabIndex = 1;
 			this.gbxInfo.TabStop = false;
@@ -577,7 +377,7 @@
 			this.c_Button1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Button1.ForeColor = System.Drawing.Color.White;
 			this.c_Button1.Location = new System.Drawing.Point(525, 41);
-			this.c_Button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.c_Button1.Margin = new System.Windows.Forms.Padding(4);
 			this.c_Button1.Name = "c_Button1";
 			this.c_Button1.Size = new System.Drawing.Size(59, 34);
 			this.c_Button1.TabIndex = 6;
@@ -593,7 +393,7 @@
 			this.cmbLogo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cmbLogo.FormattingEnabled = true;
 			this.cmbLogo.Location = new System.Drawing.Point(105, 48);
-			this.cmbLogo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cmbLogo.Margin = new System.Windows.Forms.Padding(4);
 			this.cmbLogo.Name = "cmbLogo";
 			this.cmbLogo.Size = new System.Drawing.Size(412, 23);
 			this.cmbLogo.TabIndex = 5;
@@ -632,7 +432,7 @@
 			this.btnNGRSetting.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnNGRSetting.ForeColor = System.Drawing.Color.White;
 			this.btnNGRSetting.Location = new System.Drawing.Point(525, 78);
-			this.btnNGRSetting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnNGRSetting.Margin = new System.Windows.Forms.Padding(4);
 			this.btnNGRSetting.Name = "btnNGRSetting";
 			this.btnNGRSetting.Size = new System.Drawing.Size(59, 34);
 			this.btnNGRSetting.TabIndex = 9;
@@ -649,7 +449,7 @@
 			this.cboNoGroutingRreason.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cboNoGroutingRreason.FormattingEnabled = true;
 			this.cboNoGroutingRreason.Location = new System.Drawing.Point(105, 85);
-			this.cboNoGroutingRreason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cboNoGroutingRreason.Margin = new System.Windows.Forms.Padding(4);
 			this.cboNoGroutingRreason.Name = "cboNoGroutingRreason";
 			this.cboNoGroutingRreason.Size = new System.Drawing.Size(152, 23);
 			this.cboNoGroutingRreason.TabIndex = 8;
@@ -660,7 +460,7 @@
 			this.txtGrouting.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.txtGrouting.Location = new System.Drawing.Point(643, 22);
-			this.txtGrouting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGrouting.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGrouting.Multiline = true;
 			this.txtGrouting.Name = "txtGrouting";
 			this.txtGrouting.ReadOnly = true;
@@ -694,6 +494,206 @@
 			this.lblGrouting.TabIndex = 2;
 			this.lblGrouting.Text = "成型线信息";
 			// 
+			// GroutingDailyID
+			// 
+			this.GroutingDailyID.DataPropertyName = "GroutingDailyID";
+			this.GroutingDailyID.HeaderText = "注浆日报ID";
+			this.GroutingDailyID.MinimumWidth = 6;
+			this.GroutingDailyID.Name = "GroutingDailyID";
+			this.GroutingDailyID.Visible = false;
+			this.GroutingDailyID.Width = 125;
+			// 
+			// GroutingDailyDetailID
+			// 
+			this.GroutingDailyDetailID.HeaderText = "注浆日报明细ID";
+			this.GroutingDailyDetailID.MinimumWidth = 6;
+			this.GroutingDailyDetailID.Name = "GroutingDailyDetailID";
+			this.GroutingDailyDetailID.Visible = false;
+			this.GroutingDailyDetailID.Width = 125;
+			// 
+			// GroutingLineId
+			// 
+			this.GroutingLineId.DataPropertyName = "GroutingLineId";
+			this.GroutingLineId.HeaderText = "成型线ID";
+			this.GroutingLineId.MinimumWidth = 6;
+			this.GroutingLineId.Name = "GroutingLineId";
+			this.GroutingLineId.Visible = false;
+			this.GroutingLineId.Width = 125;
+			// 
+			// GroutingLineDetailID
+			// 
+			this.GroutingLineDetailID.DataPropertyName = "GroutingLineDetailID";
+			this.GroutingLineDetailID.HeaderText = "成型线明细ID";
+			this.GroutingLineDetailID.MinimumWidth = 6;
+			this.GroutingLineDetailID.Name = "GroutingLineDetailID";
+			this.GroutingLineDetailID.Visible = false;
+			this.GroutingLineDetailID.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.Width = 125;
+			// 
+			// GroutingUserID
+			// 
+			this.GroutingUserID.DataPropertyName = "UserID";
+			this.GroutingUserID.HeaderText = "成型工号ID";
+			this.GroutingUserID.MinimumWidth = 6;
+			this.GroutingUserID.Name = "GroutingUserID";
+			this.GroutingUserID.Visible = false;
+			this.GroutingUserID.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;
+			// 
+			// monitorid
+			// 
+			this.monitorid.DataPropertyName = "monitorid";
+			this.monitorid.HeaderText = "monitorid";
+			this.monitorid.MinimumWidth = 6;
+			this.monitorid.Name = "monitorid";
+			this.monitorid.Visible = false;
+			this.monitorid.Width = 125;
+			// 
+			// monitorcode
+			// 
+			this.monitorcode.DataPropertyName = "monitorcode";
+			this.monitorcode.HeaderText = "成型班长";
+			this.monitorcode.MinimumWidth = 6;
+			this.monitorcode.Name = "monitorcode";
+			this.monitorcode.ReadOnly = true;
+			this.monitorcode.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;
+			// 
+			// GroutingMouldCode
+			// 
+			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+			this.GroutingMouldCode.HeaderText = "模具编号";
+			this.GroutingMouldCode.MinimumWidth = 6;
+			this.GroutingMouldCode.Name = "GroutingMouldCode";
+			this.GroutingMouldCode.ReadOnly = true;
+			this.GroutingMouldCode.Width = 120;
+			// 
+			// GMouldStatus
+			// 
+			this.GMouldStatus.DataPropertyName = "GMouldStatusName";
+			this.GMouldStatus.HeaderText = "模具状态";
+			this.GMouldStatus.MinimumWidth = 6;
+			this.GMouldStatus.Name = "GMouldStatus";
+			this.GMouldStatus.ReadOnly = true;
+			this.GMouldStatus.Width = 60;
+			// 
+			// GroutingBatchNo
+			// 
+			this.GroutingBatchNo.DataPropertyName = "GroutingBatchNo";
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle3;
+			this.GroutingBatchNo.HeaderText = "注浆批次";
+			this.GroutingBatchNo.MinimumWidth = 6;
+			this.GroutingBatchNo.Name = "GroutingBatchNo";
+			this.GroutingBatchNo.ReadOnly = true;
+			this.GroutingBatchNo.Width = 125;
+			// 
+			// GroutingFlag
+			// 
+			this.GroutingFlag.DataPropertyName = "GroutingFlag";
+			this.GroutingFlag.FalseValue = "0";
+			this.GroutingFlag.HeaderText = "注浆标识";
+			this.GroutingFlag.IndeterminateValue = "0";
+			this.GroutingFlag.MinimumWidth = 6;
+			this.GroutingFlag.Name = "GroutingFlag";
+			this.GroutingFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.GroutingFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.GroutingFlag.TrueValue = "1";
+			this.GroutingFlag.Width = 80;
+			// 
+			// NoGroutingRreason
+			// 
+			this.NoGroutingRreason.DataPropertyName = "NoGroutingRreason";
+			this.NoGroutingRreason.HeaderText = "未注浆原因";
+			this.NoGroutingRreason.MinimumWidth = 6;
+			this.NoGroutingRreason.Name = "NoGroutingRreason";
+			this.NoGroutingRreason.ReadOnly = true;
+			this.NoGroutingRreason.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.NoGroutingRreason.Width = 125;
+			// 
+			// colLogo
+			// 
+			this.colLogo.DataPropertyName = "LogoID";
+			this.colLogo.HeaderText = "产品商标";
+			this.colLogo.MinimumWidth = 6;
+			this.colLogo.Name = "colLogo";
+			this.colLogo.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.colLogo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.colLogo.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;
+			// 
+			// ScrapFlag
+			// 
+			this.ScrapFlag.DataPropertyName = "ScrapFlag";
+			this.ScrapFlag.FalseValue = "0";
+			this.ScrapFlag.HeaderText = "损坯标识";
+			this.ScrapFlag.IndeterminateValue = "0";
+			this.ScrapFlag.MinimumWidth = 6;
+			this.ScrapFlag.Name = "ScrapFlag";
+			this.ScrapFlag.ReadOnly = true;
+			this.ScrapFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.ScrapFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.ScrapFlag.TrueValue = "1";
+			this.ScrapFlag.Width = 125;
+			// 
+			// Remarks
+			// 
+			this.Remarks.DataPropertyName = "Remarks";
+			this.Remarks.HeaderText = "备注";
+			this.Remarks.MinimumWidth = 6;
+			this.Remarks.Name = "Remarks";
+			this.Remarks.Width = 125;
+			// 
 			// F_PM_0102
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -753,26 +753,26 @@
         private Basics.BaseControls.C_ComboBox cmbLogo;
         private Basics.BaseControls.C_Label c_Label1;
         private Basics.BaseControls.C_Label txtGrouting1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyDetailID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineId;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineDetailID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserID;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn monitorid;
-        private System.Windows.Forms.DataGridViewTextBoxColumn monitorcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatus;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn GroutingFlag;
-        private System.Windows.Forms.DataGridViewComboBoxColumn NoGroutingRreason;
-        private System.Windows.Forms.DataGridViewComboBoxColumn colLogo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn ScrapFlag;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-    }
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDailyDetailID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineId;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineDetailID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn monitorid;
+		private System.Windows.Forms.DataGridViewTextBoxColumn monitorcode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GMouldStatus;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn GroutingFlag;
+		private System.Windows.Forms.DataGridViewComboBoxColumn NoGroutingRreason;
+		private System.Windows.Forms.DataGridViewComboBoxColumn colLogo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn ScrapFlag;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
+	}
 }

DK.Client/PMModule/F_PM_0103.Designer.cs

@@ -519,7 +519,7 @@
 			// GroutingUserCode
 			// 
 			this.GroutingUserCode.DataPropertyName = "UserCode";
-			this.GroutingUserCode.HeaderText = "成型工号";
+			this.GroutingUserCode.HeaderText = "成型工位号";
 			this.GroutingUserCode.MinimumWidth = 6;
 			this.GroutingUserCode.Name = "GroutingUserCode";
 			this.GroutingUserCode.ReadOnly = true;

DK.Client/PMModule/F_PM_0104_1.Designer.cs

@@ -113,7 +113,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
 			this.txtGroutingLineCode.Location = new System.Drawing.Point(103, 24);
-			this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGroutingLineCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGroutingLineCode.MaxLength = 30;
 			this.txtGroutingLineCode.Name = "txtGroutingLineCode";
 			this.txtGroutingLineCode.Size = new System.Drawing.Size(164, 25);
@@ -140,7 +140,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.txtGroutingLineName.ErrorMessage = "";
 			this.txtGroutingLineName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGroutingLineName.Location = new System.Drawing.Point(103, 56);
-			this.txtGroutingLineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGroutingLineName.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGroutingLineName.MaxLength = 50;
 			this.txtGroutingLineName.Name = "txtGroutingLineName";
 			this.txtGroutingLineName.Size = new System.Drawing.Size(164, 25);
@@ -225,7 +225,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
 			this.dgvGroutingLine.RowsDefaultCellStyle = dataGridViewCellStyle7;
 			this.dgvGroutingLine.RowTemplate.Height = 21;
-			this.dgvGroutingLine.Size = new System.Drawing.Size(831, 510);
+			this.dgvGroutingLine.Size = new System.Drawing.Size(830, 510);
 			this.dgvGroutingLine.SortOrderColumnName = null;
 			this.dgvGroutingLine.TabIndex = 0;
 			this.dgvGroutingLine.Tag = "";
@@ -244,7 +244,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F);
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
 			this.btnSearch.Location = new System.Drawing.Point(847, 49);
-			this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(113, 38);
 			this.btnSearch.TabIndex = 8;
@@ -260,7 +260,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.btnOK.Font = new System.Drawing.Font("宋体", 9F);
 			this.btnOK.ForeColor = System.Drawing.Color.White;
 			this.btnOK.Location = new System.Drawing.Point(871, 634);
-			this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnOK.Margin = new System.Windows.Forms.Padding(4);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(113, 38);
 			this.btnOK.TabIndex = 5;
@@ -277,7 +277,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.btnCancel.Font = new System.Drawing.Font("宋体", 9F);
 			this.btnCancel.ForeColor = System.Drawing.Color.White;
 			this.btnCancel.Location = new System.Drawing.Point(992, 634);
-			this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
 			this.btnCancel.Name = "btnCancel";
 			this.btnCancel.Size = new System.Drawing.Size(113, 38);
 			this.btnCancel.TabIndex = 6;
@@ -291,7 +291,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.cbSelectAll.AutoSize = true;
 			this.cbSelectAll.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cbSelectAll.Location = new System.Drawing.Point(16, 635);
-			this.cbSelectAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cbSelectAll.Margin = new System.Windows.Forms.Padding(4);
 			this.cbSelectAll.Name = "cbSelectAll";
 			this.cbSelectAll.Size = new System.Drawing.Size(59, 19);
 			this.cbSelectAll.TabIndex = 3;
@@ -322,7 +322,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.txtUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
 			this.txtUserCode.Location = new System.Drawing.Point(355, 24);
-			this.txtUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtUserCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtUserCode.MaxLength = 20;
 			this.txtUserCode.Name = "txtUserCode";
 			this.txtUserCode.Size = new System.Drawing.Size(164, 25);
@@ -346,9 +346,9 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.gbxConditions.Controls.Add(this.txtGroutingLineName);
 			this.gbxConditions.Controls.Add(this.lblGroutingLineName);
 			this.gbxConditions.Location = new System.Drawing.Point(16, 15);
-			this.gbxConditions.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxConditions.Margin = new System.Windows.Forms.Padding(4);
 			this.gbxConditions.Name = "gbxConditions";
-			this.gbxConditions.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxConditions.Padding = new System.Windows.Forms.Padding(4);
 			this.gbxConditions.Size = new System.Drawing.Size(1089, 94);
 			this.gbxConditions.TabIndex = 0;
 			this.gbxConditions.TabStop = false;
@@ -376,7 +376,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.dtpGroutingDate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpGroutingDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpGroutingDate.Location = new System.Drawing.Point(355, 56);
-			this.dtpGroutingDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpGroutingDate.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpGroutingDate.Name = "dtpGroutingDate";
 			this.dtpGroutingDate.Size = new System.Drawing.Size(164, 25);
 			this.dtpGroutingDate.TabIndex = 7;
@@ -390,7 +390,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.txtMUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtMUserCode.ImeMode = System.Windows.Forms.ImeMode.Off;
 			this.txtMUserCode.Location = new System.Drawing.Point(607, 24);
-			this.txtMUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtMUserCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtMUserCode.MaxLength = 20;
 			this.txtMUserCode.Name = "txtMUserCode";
 			this.txtMUserCode.Size = new System.Drawing.Size(164, 25);
@@ -430,7 +430,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
 			this.splitContainer1.Location = new System.Drawing.Point(16, 116);
-			this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
 			this.splitContainer1.Name = "splitContainer1";
 			// 
 			// splitContainer1.Panel1
@@ -441,7 +441,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			// 
 			this.splitContainer1.Panel2.Controls.Add(this.dgvGroutingUser);
 			this.splitContainer1.Size = new System.Drawing.Size(1089, 510);
-			this.splitContainer1.SplitterDistance = 831;
+			this.splitContainer1.SplitterDistance = 830;
 			this.splitContainer1.SplitterWidth = 5;
 			this.splitContainer1.TabIndex = 2;
 			// 
@@ -510,7 +510,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
 			this.dgvGroutingUser.RowsDefaultCellStyle = dataGridViewCellStyle11;
 			this.dgvGroutingUser.RowTemplate.Height = 21;
-			this.dgvGroutingUser.Size = new System.Drawing.Size(253, 510);
+			this.dgvGroutingUser.Size = new System.Drawing.Size(254, 510);
 			this.dgvGroutingUser.SortOrderColumnName = null;
 			this.dgvGroutingUser.TabIndex = 0;
 			this.dgvGroutingUser.Tag = "";
@@ -554,7 +554,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			this.btnAdaptive.Font = new System.Drawing.Font("宋体", 9F);
 			this.btnAdaptive.ForeColor = System.Drawing.Color.White;
 			this.btnAdaptive.Location = new System.Drawing.Point(88, 634);
-			this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnAdaptive.Margin = new System.Windows.Forms.Padding(4);
 			this.btnAdaptive.Name = "btnAdaptive";
 			this.btnAdaptive.Size = new System.Drawing.Size(115, 38);
 			this.btnAdaptive.TabIndex = 4;
@@ -655,7 +655,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
 			// GroutingUserCode
 			// 
 			this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
-			this.GroutingUserCode.HeaderText = "成型工号";
+			this.GroutingUserCode.HeaderText = "成型工位号";
 			this.GroutingUserCode.MinimumWidth = 6;
 			this.GroutingUserCode.Name = "GroutingUserCode";
 			this.GroutingUserCode.ReadOnly = true;

DK.Client/PMModule/F_PM_2701.Designer.cs

@@ -137,10 +137,10 @@
 			this.gbSelect.ForeColor = System.Drawing.SystemColors.ControlText;
 			this.gbSelect.IsMustInput = false;
 			this.gbSelect.Location = new System.Drawing.Point(0, 48);
-			this.gbSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbSelect.Margin = new System.Windows.Forms.Padding(4);
 			this.gbSelect.Name = "gbSelect";
 			this.gbSelect.OriginalHeight = -1;
-			this.gbSelect.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbSelect.Padding = new System.Windows.Forms.Padding(4);
 			this.gbSelect.Size = new System.Drawing.Size(1492, 129);
 			this.gbSelect.TabIndex = 13;
 			this.gbSelect.TabStop = false;
@@ -154,7 +154,7 @@
 			this.txtUserCode.ErrorMessage = "";
 			this.txtUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtUserCode.Location = new System.Drawing.Point(663, 59);
-			this.txtUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtUserCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtUserCode.MaxLength = 20;
 			this.txtUserCode.Name = "txtUserCode";
 			this.txtUserCode.Size = new System.Drawing.Size(177, 25);
@@ -177,7 +177,7 @@
 			this.cbAuditStatus.ListBox.Size = new System.Drawing.Size(175, 136);
 			this.cbAuditStatus.ListBox.TabIndex = 0;
 			this.cbAuditStatus.Location = new System.Drawing.Point(1195, 25);
-			this.cbAuditStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cbAuditStatus.Margin = new System.Windows.Forms.Padding(4);
 			this.cbAuditStatus.Name = "cbAuditStatus";
 			this.cbAuditStatus.Size = new System.Drawing.Size(177, 23);
 			this.cbAuditStatus.TabIndex = 102;
@@ -200,7 +200,7 @@
 			this.cbSelectTime.AutoSize = true;
 			this.cbSelectTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.cbSelectTime.Location = new System.Drawing.Point(559, 28);
-			this.cbSelectTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cbSelectTime.Margin = new System.Windows.Forms.Padding(4);
 			this.cbSelectTime.Name = "cbSelectTime";
 			this.cbSelectTime.Size = new System.Drawing.Size(89, 19);
 			this.cbSelectTime.TabIndex = 3;
@@ -215,7 +215,7 @@
 			this.txtRreason.ErrorMessage = "";
 			this.txtRreason.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtRreason.Location = new System.Drawing.Point(929, 60);
-			this.txtRreason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtRreason.Margin = new System.Windows.Forms.Padding(4);
 			this.txtRreason.MaxLength = 500;
 			this.txtRreason.Name = "txtRreason";
 			this.txtRreason.Size = new System.Drawing.Size(177, 25);
@@ -241,7 +241,7 @@
 			this.txtRemarks.ErrorMessage = "";
 			this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtRemarks.Location = new System.Drawing.Point(100, 92);
-			this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtRemarks.Margin = new System.Windows.Forms.Padding(4);
 			this.txtRemarks.MaxLength = 500;
 			this.txtRemarks.Name = "txtRemarks";
 			this.txtRemarks.Size = new System.Drawing.Size(1007, 25);
@@ -255,7 +255,7 @@
 			this.txtGroutingUserCode.ErrorMessage = "";
 			this.txtGroutingUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGroutingUserCode.Location = new System.Drawing.Point(365, 59);
-			this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGroutingUserCode.MaxLength = 20;
 			this.txtGroutingUserCode.Name = "txtGroutingUserCode";
 			this.txtGroutingUserCode.Size = new System.Drawing.Size(177, 25);
@@ -268,7 +268,7 @@
 			this.txtGoodsName.ErrorMessage = "";
 			this.txtGoodsName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGoodsName.Location = new System.Drawing.Point(365, 25);
-			this.txtGoodsName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGoodsName.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGoodsName.MaxLength = 20;
 			this.txtGoodsName.Name = "txtGoodsName";
 			this.txtGoodsName.Size = new System.Drawing.Size(177, 25);
@@ -283,7 +283,7 @@
 			this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
 			this.txtGoodsCode.Location = new System.Drawing.Point(100, 25);
-			this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGoodsCode.MaxLength = 10;
 			this.txtGoodsCode.Name = "txtGoodsCode";
 			this.txtGoodsCode.Size = new System.Drawing.Size(177, 25);
@@ -347,7 +347,7 @@
 			this.txtScrapDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtScrapDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.txtScrapDateEnd.Location = new System.Drawing.Point(929, 25);
-			this.txtScrapDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtScrapDateEnd.Margin = new System.Windows.Forms.Padding(4);
 			this.txtScrapDateEnd.Name = "txtScrapDateEnd";
 			this.txtScrapDateEnd.Size = new System.Drawing.Size(177, 25);
 			this.txtScrapDateEnd.TabIndex = 5;
@@ -371,7 +371,7 @@
 			this.txtScrapDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtScrapDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.txtScrapDateStart.Location = new System.Drawing.Point(663, 25);
-			this.txtScrapDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtScrapDateStart.Margin = new System.Windows.Forms.Padding(4);
 			this.txtScrapDateStart.Name = "txtScrapDateStart";
 			this.txtScrapDateStart.Size = new System.Drawing.Size(177, 25);
 			this.txtScrapDateStart.TabIndex = 4;
@@ -397,7 +397,7 @@
 			this.txtBarCode.ErrorMessage = "";
 			this.txtBarCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtBarCode.Location = new System.Drawing.Point(100, 59);
-			this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtBarCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtBarCode.MaxLength = 11;
 			this.txtBarCode.Name = "txtBarCode";
 			this.txtBarCode.Size = new System.Drawing.Size(177, 25);
@@ -648,7 +648,7 @@
 			this.dgvScrapProduct.IsSubTotalFlag = false;
 			this.dgvScrapProduct.IsTopDeep = false;
 			this.dgvScrapProduct.Location = new System.Drawing.Point(0, 184);
-			this.dgvScrapProduct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvScrapProduct.Margin = new System.Windows.Forms.Padding(4);
 			this.dgvScrapProduct.MergeColumnNames = null;
 			this.dgvScrapProduct.MergeDetailColumnNames = null;
 			this.dgvScrapProduct.MergeDetailOnlyColumn = null;
@@ -743,7 +743,7 @@
 			// GroutingUserCode
 			// 
 			this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
-			this.GroutingUserCode.HeaderText = "成型工号";
+			this.GroutingUserCode.HeaderText = "成型工位号";
 			this.GroutingUserCode.MinimumWidth = 6;
 			this.GroutingUserCode.Name = "GroutingUserCode";
 			this.GroutingUserCode.ReadOnly = true;
@@ -962,7 +962,7 @@
 			this.Controls.Add(this.dgvScrapProduct);
 			this.Controls.Add(this.tsrOperate);
 			this.Controls.Add(this.gbSelect);
-			this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.Margin = new System.Windows.Forms.Padding(5);
 			this.Name = "F_PM_2701";
 			this.Text = "成型报损";
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PM_2701_FormClosed);

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

@@ -213,7 +213,7 @@
 			this.dgvRptGroutingDaily.IsSubTotalFlag = false;
 			this.dgvRptGroutingDaily.IsTopDeep = false;
 			this.dgvRptGroutingDaily.Location = new System.Drawing.Point(0, 218);
-			this.dgvRptGroutingDaily.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvRptGroutingDaily.Margin = new System.Windows.Forms.Padding(4);
 			this.dgvRptGroutingDaily.MergeColumnNames = null;
 			this.dgvRptGroutingDaily.MergeDetailColumnNames = null;
 			this.dgvRptGroutingDaily.MergeDetailOnlyColumn = null;
@@ -286,10 +286,10 @@
 			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
 			this.gbxCondition.IsMustInput = false;
 			this.gbxCondition.Location = new System.Drawing.Point(0, 48);
-			this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Margin = new System.Windows.Forms.Padding(4);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
 			this.gbxCondition.Size = new System.Drawing.Size(1564, 162);
 			this.gbxCondition.TabIndex = 1;
 			this.gbxCondition.TabStop = false;
@@ -314,7 +314,7 @@
 			this.chkGCTime.AutoSize = true;
 			this.chkGCTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.chkGCTime.Location = new System.Drawing.Point(1152, 28);
-			this.chkGCTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.chkGCTime.Margin = new System.Windows.Forms.Padding(4);
 			this.chkGCTime.Name = "chkGCTime";
 			this.chkGCTime.Size = new System.Drawing.Size(119, 19);
 			this.chkGCTime.TabIndex = 40;
@@ -342,7 +342,7 @@
 			this.dtpGCTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpGCTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpGCTimeEnd.Location = new System.Drawing.Point(1288, 59);
-			this.dtpGCTimeEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpGCTimeEnd.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpGCTimeEnd.Name = "dtpGCTimeEnd";
 			this.dtpGCTimeEnd.ShowUpDown = true;
 			this.dtpGCTimeEnd.Size = new System.Drawing.Size(188, 25);
@@ -355,7 +355,7 @@
 			this.dtpGCTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpGCTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpGCTimeBegin.Location = new System.Drawing.Point(1288, 25);
-			this.dtpGCTimeBegin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpGCTimeBegin.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpGCTimeBegin.Name = "dtpGCTimeBegin";
 			this.dtpGCTimeBegin.ShowUpDown = true;
 			this.dtpGCTimeBegin.Size = new System.Drawing.Size(188, 25);
@@ -379,7 +379,7 @@
 			this.scbGroutingLine.CheckedData = null;
 			this.scbGroutingLine.DisplayMember = "GroutingLineCode";
 			this.scbGroutingLine.Location = new System.Drawing.Point(115, 59);
-			this.scbGroutingLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.scbGroutingLine.Margin = new System.Windows.Forms.Padding(4);
 			this.scbGroutingLine.Name = "scbGroutingLine";
 			this.scbGroutingLine.Size = new System.Drawing.Size(177, 26);
 			this.scbGroutingLine.TabIndex = 38;
@@ -401,7 +401,7 @@
 			// 
 			this.scbGMouldType.CheckedData = null;
 			this.scbGMouldType.Location = new System.Drawing.Point(115, 25);
-			this.scbGMouldType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.scbGMouldType.Margin = new System.Windows.Forms.Padding(4);
 			this.scbGMouldType.MultiSelect = true;
 			this.scbGMouldType.Name = "scbGMouldType";
 			this.scbGMouldType.Size = new System.Drawing.Size(177, 26);
@@ -411,7 +411,7 @@
 			// 
 			this.scbGoods.CheckedData = null;
 			this.scbGoods.Location = new System.Drawing.Point(380, 59);
-			this.scbGoods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.scbGoods.Margin = new System.Windows.Forms.Padding(4);
 			this.scbGoods.MultiSelect = true;
 			this.scbGoods.Name = "scbGoods";
 			this.scbGoods.Size = new System.Drawing.Size(160, 26);
@@ -448,7 +448,7 @@
 			this.scbGoodsType.CheckedData = null;
 			this.scbGoodsType.IsOnlyDisplayEnd = false;
 			this.scbGoodsType.Location = new System.Drawing.Point(380, 25);
-			this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
 			this.scbGoodsType.Name = "scbGoodsType";
 			this.scbGoodsType.Size = new System.Drawing.Size(160, 26);
 			this.scbGoodsType.TabIndex = 32;
@@ -458,7 +458,7 @@
 			this.chkScrapTime.AutoSize = true;
 			this.chkScrapTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.chkScrapTime.Location = new System.Drawing.Point(565, 95);
-			this.chkScrapTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.chkScrapTime.Margin = new System.Windows.Forms.Padding(4);
 			this.chkScrapTime.Name = "chkScrapTime";
 			this.chkScrapTime.Size = new System.Drawing.Size(89, 19);
 			this.chkScrapTime.TabIndex = 17;
@@ -486,7 +486,7 @@
 			this.dtpScrapTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpScrapTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpScrapTimeEnd.Location = new System.Drawing.Point(835, 92);
-			this.dtpScrapTimeEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpScrapTimeEnd.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpScrapTimeEnd.Name = "dtpScrapTimeEnd";
 			this.dtpScrapTimeEnd.Size = new System.Drawing.Size(129, 25);
 			this.dtpScrapTimeEnd.TabIndex = 20;
@@ -498,7 +498,7 @@
 			this.dtpScrapTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpScrapTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpScrapTimeBegin.Location = new System.Drawing.Point(665, 92);
-			this.dtpScrapTimeBegin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpScrapTimeBegin.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpScrapTimeBegin.Name = "dtpScrapTimeBegin";
 			this.dtpScrapTimeBegin.Size = new System.Drawing.Size(129, 25);
 			this.dtpScrapTimeBegin.TabIndex = 18;
@@ -523,7 +523,7 @@
 			this.chkGroutingDateStart.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.chkGroutingDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.chkGroutingDateStart.Location = new System.Drawing.Point(565, 28);
-			this.chkGroutingDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.chkGroutingDateStart.Margin = new System.Windows.Forms.Padding(4);
 			this.chkGroutingDateStart.Name = "chkGroutingDateStart";
 			this.chkGroutingDateStart.Size = new System.Drawing.Size(89, 19);
 			this.chkGroutingDateStart.TabIndex = 2;
@@ -536,7 +536,7 @@
 			this.chkDeliverTime.AutoSize = true;
 			this.chkDeliverTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.chkDeliverTime.Location = new System.Drawing.Point(565, 61);
-			this.chkDeliverTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.chkDeliverTime.Margin = new System.Windows.Forms.Padding(4);
 			this.chkDeliverTime.Name = "chkDeliverTime";
 			this.chkDeliverTime.Size = new System.Drawing.Size(89, 19);
 			this.chkDeliverTime.TabIndex = 9;
@@ -620,7 +620,7 @@
 			this.dtpDeliverTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpDeliverTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpDeliverTimeEnd.Location = new System.Drawing.Point(835, 59);
-			this.dtpDeliverTimeEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpDeliverTimeEnd.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpDeliverTimeEnd.Name = "dtpDeliverTimeEnd";
 			this.dtpDeliverTimeEnd.Size = new System.Drawing.Size(129, 25);
 			this.dtpDeliverTimeEnd.TabIndex = 12;
@@ -632,7 +632,7 @@
 			this.dtpDeliverTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpDeliverTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpDeliverTimeBegin.Location = new System.Drawing.Point(665, 59);
-			this.dtpDeliverTimeBegin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpDeliverTimeBegin.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpDeliverTimeBegin.Name = "dtpDeliverTimeBegin";
 			this.dtpDeliverTimeBegin.Size = new System.Drawing.Size(129, 25);
 			this.dtpDeliverTimeBegin.TabIndex = 10;
@@ -658,7 +658,7 @@
 			this.txtGroutingBatchNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGroutingBatchNo.ImeMode = System.Windows.Forms.ImeMode.Off;
 			this.txtGroutingBatchNo.Location = new System.Drawing.Point(380, 126);
-			this.txtGroutingBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGroutingBatchNo.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGroutingBatchNo.MaxValue = new decimal(new int[] {
             1000,
             0,
@@ -683,7 +683,7 @@
 			this.dropNotGroutingRreason.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dropNotGroutingRreason.FormattingEnabled = true;
 			this.dropNotGroutingRreason.Location = new System.Drawing.Point(115, 126);
-			this.dropNotGroutingRreason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dropNotGroutingRreason.Margin = new System.Windows.Forms.Padding(4);
 			this.dropNotGroutingRreason.Name = "dropNotGroutingRreason";
 			this.dropNotGroutingRreason.Size = new System.Drawing.Size(176, 23);
 			this.dropNotGroutingRreason.TabIndex = 23;
@@ -695,7 +695,7 @@
 			this.dkGroutingUserCode.IsMustInput = false;
 			this.dkGroutingUserCode.IsWorker = false;
 			this.dkGroutingUserCode.Location = new System.Drawing.Point(19, 92);
-			this.dkGroutingUserCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.dkGroutingUserCode.Margin = new System.Windows.Forms.Padding(5);
 			this.dkGroutingUserCode.Name = "dkGroutingUserCode";
 			this.dkGroutingUserCode.PurviewType = ((byte)(0));
 			this.dkGroutingUserCode.SelectMore = true;
@@ -742,7 +742,7 @@
 			this.txtGroutingMouldCode.ErrorMessage = "";
 			this.txtGroutingMouldCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGroutingMouldCode.Location = new System.Drawing.Point(380, 92);
-			this.txtGroutingMouldCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtGroutingMouldCode.Margin = new System.Windows.Forms.Padding(4);
 			this.txtGroutingMouldCode.MaxLength = 50;
 			this.txtGroutingMouldCode.Name = "txtGroutingMouldCode";
 			this.txtGroutingMouldCode.Size = new System.Drawing.Size(159, 25);
@@ -767,7 +767,7 @@
 			this.dtpGroutingDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpGroutingDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpGroutingDateEnd.Location = new System.Drawing.Point(835, 25);
-			this.dtpGroutingDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpGroutingDateEnd.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpGroutingDateEnd.Name = "dtpGroutingDateEnd";
 			this.dtpGroutingDateEnd.Size = new System.Drawing.Size(129, 25);
 			this.dtpGroutingDateEnd.TabIndex = 5;
@@ -778,7 +778,7 @@
 			this.dtpGroutingDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.dtpGroutingDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
 			this.dtpGroutingDateStart.Location = new System.Drawing.Point(665, 25);
-			this.dtpGroutingDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpGroutingDateStart.Margin = new System.Windows.Forms.Padding(4);
 			this.dtpGroutingDateStart.Name = "dtpGroutingDateStart";
 			this.dtpGroutingDateStart.Size = new System.Drawing.Size(129, 25);
 			this.dtpGroutingDateStart.TabIndex = 3;
@@ -791,7 +791,7 @@
 			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(1443, 118);
-			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
 			this.btnClearCondition.TabIndex = 31;
@@ -807,7 +807,7 @@
 			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(1321, 118);
-			this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(113, 38);
 			this.btnSearch.TabIndex = 30;
@@ -822,7 +822,7 @@
 			this.dkOperUserCode.IsMustInput = false;
 			this.dkOperUserCode.IsWorker = false;
 			this.dkOperUserCode.Location = new System.Drawing.Point(1155, 122);
-			this.dkOperUserCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.dkOperUserCode.Margin = new System.Windows.Forms.Padding(5);
 			this.dkOperUserCode.Name = "dkOperUserCode";
 			this.dkOperUserCode.PurviewType = ((byte)(0));
 			this.dkOperUserCode.Size = new System.Drawing.Size(140, 26);
@@ -842,7 +842,7 @@
 			this.txtRemarks.ErrorMessage = "";
 			this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtRemarks.Location = new System.Drawing.Point(665, 126);
-			this.txtRemarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtRemarks.Margin = new System.Windows.Forms.Padding(4);
 			this.txtRemarks.MaxLength = 500;
 			this.txtRemarks.Name = "txtRemarks";
 			this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -929,7 +929,7 @@
 			// UserCode
 			// 
 			this.UserCode.DataPropertyName = "UserCode";
-			this.UserCode.HeaderText = "成型工号";
+			this.UserCode.HeaderText = "成型工位号";
 			this.UserCode.MinimumWidth = 6;
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
@@ -1286,7 +1286,7 @@
 			this.Controls.Add(this.dgvRptGroutingDaily);
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.tsrOperate);
-			this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.Margin = new System.Windows.Forms.Padding(5);
 			this.Name = "F_RPT_010101_1";
 			this.Text = "注浆明细表";
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010101_1_FormClosed);

DK.Client/ReportModule/R01/M03/F_RPT_010301_1.Designer.cs

@@ -29,240 +29,252 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010301_1));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle 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();
-            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
-            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.lblBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_BarCode();
-            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.dgvReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.NewBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.USERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Gmouldtypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tsrOperate.SuspendLayout();
-            this.gbxCondition.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tsrOperate
-            // 
-            this.tsrOperate.AutoSize = false;
-            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010301_1));
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle 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();
+			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.lblBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.txtBarcode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_BarCode();
+			this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.dgvReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NewBarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.USERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Gmouldtypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate.SuspendLayout();
+			this.gbxCondition.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tsrOperate
+			// 
+			this.tsrOperate.AutoSize = false;
+			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrOperate.ImageScalingSize = new System.Drawing.Size(20, 20);
+			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnAdaptive,
             this.tsbtnClose});
-            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-            this.tsrOperate.Name = "tsrOperate";
-            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1131, 35);
-            this.tsrOperate.TabIndex = 0;
-            this.tsrOperate.Text = "toolStrip1";
-            // 
-            // tsbtnAdaptive
-            // 
-            this.tsbtnAdaptive.AutoSize = false;
-            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-            // 
-            // tsbtnClose
-            // 
-            this.tsbtnClose.AutoSize = false;
-            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnClose.Name = "tsbtnClose";
-            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-            this.tsbtnClose.Text = "关闭(&X)";
-            this.tsbtnClose.ToolTipText = "关闭";
-            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-            // 
-            // gbxCondition
-            // 
-            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+			this.tsrOperate.Name = "tsrOperate";
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1508, 44);
+			this.tsrOperate.TabIndex = 0;
+			this.tsrOperate.Text = "toolStrip1";
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.ToolTipText = "关闭";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// gbxCondition
+			// 
+			this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
-            this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
-            this.gbxCondition.Controls.Add(this.lblBarcode);
-            this.gbxCondition.Controls.Add(this.txtBarcode);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
-            this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
-            this.gbxCondition.Controls.Add(this.lblAccountDateStart);
-            this.gbxCondition.Controls.Add(this.btnClearCondition);
-            this.gbxCondition.Controls.Add(this.btnSearch);
-            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.gbxCondition.IsMustInput = false;
-            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
-            this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1119, 45);
-            this.gbxCondition.TabIndex = 1;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
-            // 
-            // lblBarcode
-            // 
-            this.lblBarcode.AutoSize = true;
-            this.lblBarcode.BackColor = System.Drawing.Color.Transparent;
-            this.lblBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblBarcode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblBarcode.Location = new System.Drawing.Point(15, 20);
-            this.lblBarcode.Name = "lblBarcode";
-            this.lblBarcode.Size = new System.Drawing.Size(65, 12);
-            this.lblBarcode.TabIndex = 12;
-            this.lblBarcode.Text = "产品条码：";
-            // 
-            // txtBarcode
-            // 
-            this.txtBarcode.BackColor = System.Drawing.SystemColors.Window;
-            this.txtBarcode.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtBarcode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.txtBarcode.EditingControlFormattedValue = "";
-            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(87, 16);
-            this.txtBarcode.Name = "txtBarcode";
-            this.txtBarcode.Size = new System.Drawing.Size(128, 21);
-            this.txtBarcode.TabIndex = 0;
-            this.txtBarcode.TextValue = "";
-            // 
-            // dtpAccountDateEnd
-            // 
-            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateEnd.Location = new System.Drawing.Point(453, 16);
-            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
-            this.dtpAccountDateEnd.Size = new System.Drawing.Size(102, 21);
-            this.dtpAccountDateEnd.TabIndex = 2;
-            // 
-            // dtpAccountDateStart
-            // 
-            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateStart.Location = new System.Drawing.Point(302, 16);
-            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
-            this.dtpAccountDateStart.Size = new System.Drawing.Size(102, 21);
-            this.dtpAccountDateStart.TabIndex = 1;
-            // 
-            // lblAccountDateEnd
-            // 
-            this.lblAccountDateEnd.AutoSize = true;
-            this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateEnd.Location = new System.Drawing.Point(423, 20);
-            this.lblAccountDateEnd.Name = "lblAccountDateEnd";
-            this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
-            this.lblAccountDateEnd.TabIndex = 6;
-            this.lblAccountDateEnd.Text = "至";
-            // 
-            // lblAccountDateStart
-            // 
-            this.lblAccountDateStart.AutoSize = true;
-            this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateStart.Location = new System.Drawing.Point(231, 20);
-            this.lblAccountDateStart.Name = "lblAccountDateStart";
-            this.lblAccountDateStart.Size = new System.Drawing.Size(65, 12);
-            this.lblAccountDateStart.TabIndex = 4;
-            this.lblAccountDateStart.Text = "变更日期：";
-            // 
-            // btnClearCondition
-            // 
-            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
-            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(1018, 11);
-            this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
-            this.btnClearCondition.TabIndex = 13;
-            this.btnClearCondition.Text = "清空条件(&C)";
-            this.btnClearCondition.UseVisualStyleBackColor = true;
-            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
-            // 
-            // btnSearch
-            // 
-            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
-            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(927, 11);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
-            this.btnSearch.TabIndex = 12;
-            this.btnSearch.Text = "查询(&Q)";
-            this.btnSearch.UseVisualStyleBackColor = true;
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-            // 
-            // dgvReportModule
-            // 
-            this.dgvReportModule.AllowUserToAddRows = false;
-            this.dgvReportModule.AllowUserToDeleteRows = false;
-            this.dgvReportModule.AllowUserToModifyRows = true;
-            this.dgvReportModule.AllowUserToOrderColumns = true;
-            this.dgvReportModule.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvReportModule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvReportModule.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.lblBarcode);
+			this.gbxCondition.Controls.Add(this.txtBarcode);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+			this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
+			this.gbxCondition.Controls.Add(this.lblAccountDateStart);
+			this.gbxCondition.Controls.Add(this.btnClearCondition);
+			this.gbxCondition.Controls.Add(this.btnSearch);
+			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.gbxCondition.IsMustInput = false;
+			this.gbxCondition.Location = new System.Drawing.Point(0, 48);
+			this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Name = "gbxCondition";
+			this.gbxCondition.OriginalHeight = -1;
+			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Size = new System.Drawing.Size(1492, 56);
+			this.gbxCondition.TabIndex = 1;
+			this.gbxCondition.TabStop = false;
+			this.gbxCondition.Text = "查询条件 ▼";
+			// 
+			// lblBarcode
+			// 
+			this.lblBarcode.AutoSize = true;
+			this.lblBarcode.BackColor = System.Drawing.Color.Transparent;
+			this.lblBarcode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblBarcode.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblBarcode.Location = new System.Drawing.Point(20, 25);
+			this.lblBarcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblBarcode.Name = "lblBarcode";
+			this.lblBarcode.Size = new System.Drawing.Size(82, 15);
+			this.lblBarcode.TabIndex = 12;
+			this.lblBarcode.Text = "产品条码：";
+			// 
+			// txtBarcode
+			// 
+			this.txtBarcode.BackColor = System.Drawing.SystemColors.Window;
+			this.txtBarcode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtBarcode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtBarcode.EditingControlFormattedValue = "";
+			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(116, 20);
+			this.txtBarcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtBarcode.Name = "txtBarcode";
+			this.txtBarcode.Size = new System.Drawing.Size(169, 25);
+			this.txtBarcode.TabIndex = 0;
+			this.txtBarcode.TextValue = "";
+			// 
+			// dtpAccountDateEnd
+			// 
+			this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
+			this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateEnd.Location = new System.Drawing.Point(604, 20);
+			this.dtpAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+			this.dtpAccountDateEnd.Size = new System.Drawing.Size(135, 25);
+			this.dtpAccountDateEnd.TabIndex = 2;
+			// 
+			// dtpAccountDateStart
+			// 
+			this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd";
+			this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateStart.Location = new System.Drawing.Point(403, 20);
+			this.dtpAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+			this.dtpAccountDateStart.Size = new System.Drawing.Size(135, 25);
+			this.dtpAccountDateStart.TabIndex = 1;
+			// 
+			// lblAccountDateEnd
+			// 
+			this.lblAccountDateEnd.AutoSize = true;
+			this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
+			this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblAccountDateEnd.Location = new System.Drawing.Point(564, 25);
+			this.lblAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblAccountDateEnd.Name = "lblAccountDateEnd";
+			this.lblAccountDateEnd.Size = new System.Drawing.Size(22, 15);
+			this.lblAccountDateEnd.TabIndex = 6;
+			this.lblAccountDateEnd.Text = "至";
+			// 
+			// lblAccountDateStart
+			// 
+			this.lblAccountDateStart.AutoSize = true;
+			this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
+			this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblAccountDateStart.Location = new System.Drawing.Point(308, 25);
+			this.lblAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblAccountDateStart.Name = "lblAccountDateStart";
+			this.lblAccountDateStart.Size = new System.Drawing.Size(82, 15);
+			this.lblAccountDateStart.TabIndex = 4;
+			this.lblAccountDateStart.Text = "变更日期：";
+			// 
+			// btnClearCondition
+			// 
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
+			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(1357, 14);
+			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnClearCondition.Name = "btnClearCondition";
+			this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
+			this.btnClearCondition.TabIndex = 13;
+			this.btnClearCondition.Text = "清空条件(&C)";
+			this.btnClearCondition.UseVisualStyleBackColor = true;
+			this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+			// 
+			// btnSearch
+			// 
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+			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(1236, 14);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSearch.Name = "btnSearch";
+			this.btnSearch.Size = new System.Drawing.Size(113, 38);
+			this.btnSearch.TabIndex = 12;
+			this.btnSearch.Text = "查询(&Q)";
+			this.btnSearch.UseVisualStyleBackColor = true;
+			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+			// 
+			// dgvReportModule
+			// 
+			this.dgvReportModule.AllowUserToAddRows = false;
+			this.dgvReportModule.AllowUserToDeleteRows = false;
+			this.dgvReportModule.AllowUserToModifyRows = true;
+			this.dgvReportModule.AllowUserToOrderColumns = true;
+			this.dgvReportModule.AllowUserToSortRows = false;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvReportModule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.dgvReportModule.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.dgvReportModule.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvReportModule.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvReportModule.CellHeight = 23;
-            this.dgvReportModule.ChildNodeColumnName = null;
-            this.dgvReportModule.ChildNodeColumnText = null;
-            this.dgvReportModule.ColumnDeep = 1;
-            this.dgvReportModule.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.dgvReportModule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvReportModule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvReportModule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.dgvReportModule.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvReportModule.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvReportModule.CellHeight = 23;
+			this.dgvReportModule.ChildNodeColumnName = null;
+			this.dgvReportModule.ChildNodeColumnText = null;
+			this.dgvReportModule.ColumnDeep = 1;
+			this.dgvReportModule.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.dgvReportModule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+			this.dgvReportModule.ColumnHeadersHeight = 29;
+			this.dgvReportModule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvReportModule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.BarCode,
             this.NewBarCode,
             this.LogoCodeName,
@@ -278,183 +290,203 @@
             this.GroutingCount,
             this.GroutingUserCode,
             this.MONITORName});
-            this.dgvReportModule.ColumnTreeView = null;
-            this.dgvReportModule.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.dgvReportModule.DynamicColumnName = "";
-            this.dgvReportModule.EnableHeadersVisualStyles = false;
-            this.dgvReportModule.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvReportModule.FormatQuantityColumns = null;
-            this.dgvReportModule.HorizontalMergeColumn = null;
-            this.dgvReportModule.IsAutoCountSum = true;
-            this.dgvReportModule.IsAutoResizeColumns = false;
-            this.dgvReportModule.IsClickF12 = false;
-            this.dgvReportModule.IsOpenMergeCellFlag = false;
-            this.dgvReportModule.IsSubTotalFlag = false;
-            this.dgvReportModule.IsTopDeep = false;
-            this.dgvReportModule.Location = new System.Drawing.Point(0, 90);
-            this.dgvReportModule.MergeColumnNames = null;
-            this.dgvReportModule.MergeDetailColumnNames = null;
-            this.dgvReportModule.MergeDetailOnlyColumn = null;
-            this.dgvReportModule.MergeOnlyColumn = null;
-            this.dgvReportModule.MultiSelect = false;
-            this.dgvReportModule.Name = "dgvReportModule";
-            this.dgvReportModule.ReadOnly = true;
-            this.dgvReportModule.RefreshAtHscroll = false;
-            this.dgvReportModule.RowHeadersWidth = 50;
-            this.dgvReportModule.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvReportModule.RowsDefaultCellStyle = dataGridViewCellStyle6;
-            this.dgvReportModule.RowTemplate.Height = 21;
-            this.dgvReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvReportModule.Size = new System.Drawing.Size(1119, 391);
-            this.dgvReportModule.SortOrderColumnName = null;
-            this.dgvReportModule.TabIndex = 28;
-            this.dgvReportModule.Tag = true;
-            this.dgvReportModule.TotalSumColumns = null;
-            this.dgvReportModule.ViewRowFilter = "";
-            // 
-            // BarCode
-            // 
-            this.BarCode.DataPropertyName = "BarCode";
-            this.BarCode.HeaderText = "原产品条码";
-            this.BarCode.Name = "BarCode";
-            this.BarCode.ReadOnly = true;
-            this.BarCode.Width = 80;
-            // 
-            // NewBarCode
-            // 
-            this.NewBarCode.DataPropertyName = "NewBarCode";
-            this.NewBarCode.HeaderText = "新产品条码";
-            this.NewBarCode.Name = "NewBarCode";
-            this.NewBarCode.ReadOnly = true;
-            this.NewBarCode.Width = 80;
-            // 
-            // LogoCodeName
-            // 
-            this.LogoCodeName.DataPropertyName = "LogoCodeName";
-            this.LogoCodeName.HeaderText = "商标";
-            this.LogoCodeName.Name = "LogoCodeName";
-            this.LogoCodeName.ReadOnly = true;
-            // 
-            // PROCEDURENAME
-            // 
-            this.PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
-            this.PROCEDURENAME.HeaderText = "变更工序";
-            this.PROCEDURENAME.Name = "PROCEDURENAME";
-            this.PROCEDURENAME.ReadOnly = true;
-            this.PROCEDURENAME.Width = 90;
-            // 
-            // USERNAME
-            // 
-            this.USERNAME.DataPropertyName = "USERNAME";
-            this.USERNAME.HeaderText = "变更者";
-            this.USERNAME.Name = "USERNAME";
-            this.USERNAME.ReadOnly = true;
-            this.USERNAME.Width = 50;
-            // 
-            // CreateTime
-            // 
-            this.CreateTime.DataPropertyName = "CreateTime";
-            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
-            this.CreateTime.DefaultCellStyle = dataGridViewCellStyle3;
-            this.CreateTime.HeaderText = "变更时间";
-            this.CreateTime.Name = "CreateTime";
-            this.CreateTime.ReadOnly = true;
-            this.CreateTime.Width = 120;
-            // 
-            // GoodsCode
-            // 
-            this.GoodsCode.DataPropertyName = "GoodsCode";
-            this.GoodsCode.HeaderText = "产品编码";
-            this.GoodsCode.Name = "GoodsCode";
-            this.GoodsCode.ReadOnly = true;
-            this.GoodsCode.Width = 60;
-            // 
-            // GoodsName
-            // 
-            this.GoodsName.DataPropertyName = "GoodsName";
-            this.GoodsName.HeaderText = "产品名称";
-            this.GoodsName.Name = "GoodsName";
-            this.GoodsName.ReadOnly = true;
-            this.GoodsName.Width = 90;
-            // 
-            // GroutingLineCode
-            // 
-            this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
-            this.GroutingLineCode.HeaderText = "成型线编码";
-            this.GroutingLineCode.Name = "GroutingLineCode";
-            this.GroutingLineCode.ReadOnly = true;
-            this.GroutingLineCode.Width = 90;
-            // 
-            // Gmouldtypename
-            // 
-            this.Gmouldtypename.DataPropertyName = "Gmouldtypename";
-            this.Gmouldtypename.HeaderText = "成型线类别";
-            this.Gmouldtypename.Name = "Gmouldtypename";
-            this.Gmouldtypename.ReadOnly = true;
-            // 
-            // GroutingMouldCode
-            // 
-            this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-            this.GroutingMouldCode.HeaderText = "模具编号";
-            this.GroutingMouldCode.Name = "GroutingMouldCode";
-            this.GroutingMouldCode.ReadOnly = true;
-            this.GroutingMouldCode.Width = 80;
-            // 
-            // GroutingDate
-            // 
-            this.GroutingDate.DataPropertyName = "GroutingDate";
-            dataGridViewCellStyle4.Format = "yyyy-MM-dd";
-            this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle4;
-            this.GroutingDate.HeaderText = "注浆日期";
-            this.GroutingDate.Name = "GroutingDate";
-            this.GroutingDate.ReadOnly = true;
-            this.GroutingDate.Width = 90;
-            // 
-            // GroutingCount
-            // 
-            this.GroutingCount.DataPropertyName = "GroutingCount";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle5;
-            this.GroutingCount.HeaderText = "注浆次数";
-            this.GroutingCount.Name = "GroutingCount";
-            this.GroutingCount.ReadOnly = true;
-            this.GroutingCount.Width = 70;
-            // 
-            // GroutingUserCode
-            // 
-            this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
-            this.GroutingUserCode.HeaderText = "成型工号";
-            this.GroutingUserCode.Name = "GroutingUserCode";
-            this.GroutingUserCode.ReadOnly = true;
-            this.GroutingUserCode.Width = 60;
-            // 
-            // MONITORName
-            // 
-            this.MONITORName.DataPropertyName = "MONITORName";
-            this.MONITORName.HeaderText = "成型班长";
-            this.MONITORName.Name = "MONITORName";
-            this.MONITORName.ReadOnly = true;
-            // 
-            // F_RPT_010301_1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1131, 481);
-            this.Controls.Add(this.dgvReportModule);
-            this.Controls.Add(this.gbxCondition);
-            this.Controls.Add(this.tsrOperate);
-            this.Name = "F_RPT_010301_1";
-            this.RightToLeftLayout = true;
-            this.Text = "条码变更明细表";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010301_1_FormClosed);
-            this.Load += new System.EventHandler(this.F_RPT_010301_1_Load);
-            this.tsrOperate.ResumeLayout(false);
-            this.tsrOperate.PerformLayout();
-            this.gbxCondition.ResumeLayout(false);
-            this.gbxCondition.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).EndInit();
-            this.ResumeLayout(false);
+			this.dgvReportModule.ColumnTreeView = null;
+			this.dgvReportModule.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.dgvReportModule.DynamicColumnName = "";
+			this.dgvReportModule.EnableHeadersVisualStyles = false;
+			this.dgvReportModule.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvReportModule.FormatQuantityColumns = null;
+			this.dgvReportModule.HorizontalMergeColumn = null;
+			this.dgvReportModule.IsAutoCountSum = true;
+			this.dgvReportModule.IsAutoResizeColumns = false;
+			this.dgvReportModule.IsClickF12 = false;
+			this.dgvReportModule.IsOpenMergeCellFlag = false;
+			this.dgvReportModule.IsSubTotalFlag = false;
+			this.dgvReportModule.IsTopDeep = false;
+			this.dgvReportModule.Location = new System.Drawing.Point(0, 112);
+			this.dgvReportModule.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvReportModule.MergeColumnNames = null;
+			this.dgvReportModule.MergeDetailColumnNames = null;
+			this.dgvReportModule.MergeDetailOnlyColumn = null;
+			this.dgvReportModule.MergeOnlyColumn = null;
+			this.dgvReportModule.MultiSelect = false;
+			this.dgvReportModule.Name = "dgvReportModule";
+			this.dgvReportModule.ReadOnly = true;
+			this.dgvReportModule.RefreshAtHscroll = false;
+			this.dgvReportModule.RowHeadersWidth = 50;
+			this.dgvReportModule.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvReportModule.RowsDefaultCellStyle = dataGridViewCellStyle6;
+			this.dgvReportModule.RowTemplate.Height = 21;
+			this.dgvReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvReportModule.Size = new System.Drawing.Size(1492, 489);
+			this.dgvReportModule.SortOrderColumnName = null;
+			this.dgvReportModule.TabIndex = 28;
+			this.dgvReportModule.Tag = true;
+			this.dgvReportModule.TotalSumColumns = null;
+			this.dgvReportModule.ViewRowFilter = "";
+			// 
+			// BarCode
+			// 
+			this.BarCode.DataPropertyName = "BarCode";
+			this.BarCode.HeaderText = "原产品条码";
+			this.BarCode.MinimumWidth = 6;
+			this.BarCode.Name = "BarCode";
+			this.BarCode.ReadOnly = true;
+			this.BarCode.Width = 80;
+			// 
+			// NewBarCode
+			// 
+			this.NewBarCode.DataPropertyName = "NewBarCode";
+			this.NewBarCode.HeaderText = "新产品条码";
+			this.NewBarCode.MinimumWidth = 6;
+			this.NewBarCode.Name = "NewBarCode";
+			this.NewBarCode.ReadOnly = true;
+			this.NewBarCode.Width = 80;
+			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.MinimumWidth = 6;
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			this.LogoCodeName.Width = 125;
+			// 
+			// PROCEDURENAME
+			// 
+			this.PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
+			this.PROCEDURENAME.HeaderText = "变更工序";
+			this.PROCEDURENAME.MinimumWidth = 6;
+			this.PROCEDURENAME.Name = "PROCEDURENAME";
+			this.PROCEDURENAME.ReadOnly = true;
+			this.PROCEDURENAME.Width = 90;
+			// 
+			// USERNAME
+			// 
+			this.USERNAME.DataPropertyName = "USERNAME";
+			this.USERNAME.HeaderText = "变更者";
+			this.USERNAME.MinimumWidth = 6;
+			this.USERNAME.Name = "USERNAME";
+			this.USERNAME.ReadOnly = true;
+			this.USERNAME.Width = 50;
+			// 
+			// CreateTime
+			// 
+			this.CreateTime.DataPropertyName = "CreateTime";
+			dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
+			this.CreateTime.DefaultCellStyle = dataGridViewCellStyle3;
+			this.CreateTime.HeaderText = "变更时间";
+			this.CreateTime.MinimumWidth = 6;
+			this.CreateTime.Name = "CreateTime";
+			this.CreateTime.ReadOnly = true;
+			this.CreateTime.Width = 120;
+			// 
+			// GoodsCode
+			// 
+			this.GoodsCode.DataPropertyName = "GoodsCode";
+			this.GoodsCode.HeaderText = "产品编码";
+			this.GoodsCode.MinimumWidth = 6;
+			this.GoodsCode.Name = "GoodsCode";
+			this.GoodsCode.ReadOnly = true;
+			this.GoodsCode.Width = 60;
+			// 
+			// GoodsName
+			// 
+			this.GoodsName.DataPropertyName = "GoodsName";
+			this.GoodsName.HeaderText = "产品名称";
+			this.GoodsName.MinimumWidth = 6;
+			this.GoodsName.Name = "GoodsName";
+			this.GoodsName.ReadOnly = true;
+			this.GoodsName.Width = 90;
+			// 
+			// GroutingLineCode
+			// 
+			this.GroutingLineCode.DataPropertyName = "GroutingLineCode";
+			this.GroutingLineCode.HeaderText = "成型线编码";
+			this.GroutingLineCode.MinimumWidth = 6;
+			this.GroutingLineCode.Name = "GroutingLineCode";
+			this.GroutingLineCode.ReadOnly = true;
+			this.GroutingLineCode.Width = 90;
+			// 
+			// 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 = 80;
+			// 
+			// GroutingDate
+			// 
+			this.GroutingDate.DataPropertyName = "GroutingDate";
+			dataGridViewCellStyle4.Format = "yyyy-MM-dd";
+			this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle4;
+			this.GroutingDate.HeaderText = "注浆日期";
+			this.GroutingDate.MinimumWidth = 6;
+			this.GroutingDate.Name = "GroutingDate";
+			this.GroutingDate.ReadOnly = true;
+			this.GroutingDate.Width = 90;
+			// 
+			// GroutingCount
+			// 
+			this.GroutingCount.DataPropertyName = "GroutingCount";
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle5;
+			this.GroutingCount.HeaderText = "注浆次数";
+			this.GroutingCount.MinimumWidth = 6;
+			this.GroutingCount.Name = "GroutingCount";
+			this.GroutingCount.ReadOnly = true;
+			this.GroutingCount.Width = 70;
+			// 
+			// GroutingUserCode
+			// 
+			this.GroutingUserCode.DataPropertyName = "GroutingUserCode";
+			this.GroutingUserCode.HeaderText = "成型工位号";
+			this.GroutingUserCode.MinimumWidth = 6;
+			this.GroutingUserCode.Name = "GroutingUserCode";
+			this.GroutingUserCode.ReadOnly = true;
+			this.GroutingUserCode.Width = 60;
+			// 
+			// MONITORName
+			// 
+			this.MONITORName.DataPropertyName = "MONITORName";
+			this.MONITORName.HeaderText = "成型班长";
+			this.MONITORName.MinimumWidth = 6;
+			this.MONITORName.Name = "MONITORName";
+			this.MONITORName.ReadOnly = true;
+			this.MONITORName.Width = 125;
+			// 
+			// F_RPT_010301_1
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1508, 601);
+			this.Controls.Add(this.dgvReportModule);
+			this.Controls.Add(this.gbxCondition);
+			this.Controls.Add(this.tsrOperate);
+			this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.Name = "F_RPT_010301_1";
+			this.RightToLeftLayout = true;
+			this.Text = "条码变更明细表";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010301_1_FormClosed);
+			this.Load += new System.EventHandler(this.F_RPT_010301_1_Load);
+			this.tsrOperate.ResumeLayout(false);
+			this.tsrOperate.PerformLayout();
+			this.gbxCondition.ResumeLayout(false);
+			this.gbxCondition.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).EndInit();
+			this.ResumeLayout(false);
 
         }
 
@@ -473,20 +505,20 @@
         private Basics.BaseControls.C_DataGridView dgvReportModule;
         private Basics.BaseControls.C_Label lblBarcode;
         private Basics.BaseControls.C_DGV_BarCode txtBarcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn NewBarCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
-        private System.Windows.Forms.DataGridViewTextBoxColumn USERNAME;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Gmouldtypename;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
-    }
+		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NewBarCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn USERNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Gmouldtypename;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingUserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
+	}
 }