注浆表显示列调整 成型线修改为模糊查询 交坯明细表数据取值修改

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -87,27 +87,27 @@
 			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.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.colGMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ScrapFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.GroutingFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
 			this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.colGMouldStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.ScrapFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.DeliverFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.NoGroutingRreason = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Slurry_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.collogo = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.TestFlagName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.DeliverFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Createuser = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -752,27 +752,27 @@
             this.GroutingLineID,
             this.GroutingLineDetailID,
             this.GroutingLineCode,
-            this.GroutingLineName,
             this.GoodsCode,
             this.GoodsName,
             this.UserCode,
             this.STAFFNAME,
-            this.GroutingBatchNo,
-            this.colGMouldStatus,
             this.GroutingMouldCode,
             this.BarCode,
-            this.ScrapFlag,
-            this.GroutingFlag,
             this.GroutingCount,
             this.GroutingDate,
-            this.MONITORName,
+            this.GroutingBatchNo,
+            this.colGMouldStatus,
+            this.GroutingFlag,
+            this.ScrapFlag,
+            this.DeliverFlag,
+            this.DeliverTime,
             this.NoGroutingRreason,
+            this.MONITORName,
+            this.GroutingLineName,
             this.Slurry_Weight,
             this.collogo,
             this.TestFlagName,
             this.GMouldTypeName,
-            this.DeliverFlag,
-            this.DeliverTime,
             this.CreateTime,
             this.Createuser,
             this.Remarks,
@@ -871,15 +871,6 @@
 			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;
-			// 
 			// GoodsCode
 			// 
 			this.GoodsCode.DataPropertyName = "GoodsCode";
@@ -916,11 +907,52 @@
 			this.STAFFNAME.ReadOnly = true;
 			this.STAFFNAME.Width = 125;
 			// 
+			// GroutingMouldCode
+			// 
+			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+			this.GroutingMouldCode.HeaderText = "模具编号";
+			this.GroutingMouldCode.MinimumWidth = 6;
+			this.GroutingMouldCode.Name = "GroutingMouldCode";
+			this.GroutingMouldCode.ReadOnly = true;
+			this.GroutingMouldCode.Width = 125;
+			// 
+			// BarCode
+			// 
+			this.BarCode.DataPropertyName = "BarCode";
+			this.BarCode.HeaderText = "绑定条码";
+			this.BarCode.MinimumWidth = 6;
+			this.BarCode.Name = "BarCode";
+			this.BarCode.ReadOnly = true;
+			this.BarCode.Width = 125;
+			// 
+			// GroutingCount
+			// 
+			this.GroutingCount.DataPropertyName = "GroutingCount";
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle3;
+			this.GroutingCount.HeaderText = "注浆次数";
+			this.GroutingCount.MinimumWidth = 6;
+			this.GroutingCount.Name = "GroutingCount";
+			this.GroutingCount.ReadOnly = true;
+			this.GroutingCount.Width = 125;
+			// 
+			// GroutingDate
+			// 
+			this.GroutingDate.DataPropertyName = "GroutingDate";
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			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 = 125;
+			// 
 			// GroutingBatchNo
 			// 
 			this.GroutingBatchNo.DataPropertyName = "GroutingBatchNo";
-			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle3;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle5;
 			this.GroutingBatchNo.HeaderText = "注浆批次";
 			this.GroutingBatchNo.MinimumWidth = 6;
 			this.GroutingBatchNo.Name = "GroutingBatchNo";
@@ -936,23 +968,18 @@
 			this.colGMouldStatus.ReadOnly = true;
 			this.colGMouldStatus.Width = 125;
 			// 
-			// GroutingMouldCode
-			// 
-			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-			this.GroutingMouldCode.HeaderText = "模具编号";
-			this.GroutingMouldCode.MinimumWidth = 6;
-			this.GroutingMouldCode.Name = "GroutingMouldCode";
-			this.GroutingMouldCode.ReadOnly = true;
-			this.GroutingMouldCode.Width = 125;
-			// 
-			// BarCode
+			// GroutingFlag
 			// 
-			this.BarCode.DataPropertyName = "BarCode";
-			this.BarCode.HeaderText = "绑定条码";
-			this.BarCode.MinimumWidth = 6;
-			this.BarCode.Name = "BarCode";
-			this.BarCode.ReadOnly = true;
-			this.BarCode.Width = 125;
+			this.GroutingFlag.DataPropertyName = "GroutingFlag";
+			this.GroutingFlag.FalseValue = "0";
+			this.GroutingFlag.HeaderText = "注浆标识";
+			this.GroutingFlag.MinimumWidth = 6;
+			this.GroutingFlag.Name = "GroutingFlag";
+			this.GroutingFlag.ReadOnly = true;
+			this.GroutingFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.GroutingFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.GroutingFlag.TrueValue = "1";
+			this.GroutingFlag.Width = 125;
 			// 
 			// ScrapFlag
 			// 
@@ -967,41 +994,37 @@
 			this.ScrapFlag.TrueValue = "1";
 			this.ScrapFlag.Width = 125;
 			// 
-			// GroutingFlag
+			// DeliverFlag
 			// 
-			this.GroutingFlag.DataPropertyName = "GroutingFlag";
-			this.GroutingFlag.FalseValue = "0";
-			this.GroutingFlag.HeaderText = "注浆标识";
-			this.GroutingFlag.MinimumWidth = 6;
-			this.GroutingFlag.Name = "GroutingFlag";
-			this.GroutingFlag.ReadOnly = true;
-			this.GroutingFlag.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-			this.GroutingFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.GroutingFlag.TrueValue = "1";
-			this.GroutingFlag.Width = 125;
+			this.DeliverFlag.DataPropertyName = "DeliverFlag";
+			this.DeliverFlag.FalseValue = "0";
+			this.DeliverFlag.HeaderText = "交坯标识";
+			this.DeliverFlag.MinimumWidth = 6;
+			this.DeliverFlag.Name = "DeliverFlag";
+			this.DeliverFlag.ReadOnly = true;
+			this.DeliverFlag.TrueValue = "1";
+			this.DeliverFlag.Width = 125;
 			// 
-			// GroutingCount
+			// DeliverTime
 			// 
-			this.GroutingCount.DataPropertyName = "GroutingCount";
-			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.GroutingCount.DefaultCellStyle = dataGridViewCellStyle4;
-			this.GroutingCount.HeaderText = "注浆次数";
-			this.GroutingCount.MinimumWidth = 6;
-			this.GroutingCount.Name = "GroutingCount";
-			this.GroutingCount.ReadOnly = true;
-			this.GroutingCount.Width = 125;
+			this.DeliverTime.DataPropertyName = "DeliverTime";
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle6.Format = "yyyy-MM-dd";
+			this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle6;
+			this.DeliverTime.HeaderText = "交坯日期";
+			this.DeliverTime.MinimumWidth = 6;
+			this.DeliverTime.Name = "DeliverTime";
+			this.DeliverTime.ReadOnly = true;
+			this.DeliverTime.Width = 125;
 			// 
-			// GroutingDate
+			// NoGroutingRreason
 			// 
-			this.GroutingDate.DataPropertyName = "GroutingDate";
-			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle5.Format = "yyyy-MM-dd";
-			this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle5;
-			this.GroutingDate.HeaderText = "注浆日期";
-			this.GroutingDate.MinimumWidth = 6;
-			this.GroutingDate.Name = "GroutingDate";
-			this.GroutingDate.ReadOnly = true;
-			this.GroutingDate.Width = 125;
+			this.NoGroutingRreason.DataPropertyName = "NoGroutingRreason";
+			this.NoGroutingRreason.HeaderText = "未注浆原因";
+			this.NoGroutingRreason.MinimumWidth = 6;
+			this.NoGroutingRreason.Name = "NoGroutingRreason";
+			this.NoGroutingRreason.ReadOnly = true;
+			this.NoGroutingRreason.Width = 125;
 			// 
 			// MONITORName
 			// 
@@ -1012,14 +1035,14 @@
 			this.MONITORName.ReadOnly = true;
 			this.MONITORName.Width = 125;
 			// 
-			// NoGroutingRreason
+			// GroutingLineName
 			// 
-			this.NoGroutingRreason.DataPropertyName = "NoGroutingRreason";
-			this.NoGroutingRreason.HeaderText = "未注浆原因";
-			this.NoGroutingRreason.MinimumWidth = 6;
-			this.NoGroutingRreason.Name = "NoGroutingRreason";
-			this.NoGroutingRreason.ReadOnly = true;
-			this.NoGroutingRreason.Width = 125;
+			this.GroutingLineName.DataPropertyName = "GroutingLineName";
+			this.GroutingLineName.HeaderText = "成型线名称";
+			this.GroutingLineName.MinimumWidth = 6;
+			this.GroutingLineName.Name = "GroutingLineName";
+			this.GroutingLineName.ReadOnly = true;
+			this.GroutingLineName.Width = 125;
 			// 
 			// Slurry_Weight
 			// 
@@ -1057,29 +1080,6 @@
 			this.GMouldTypeName.ReadOnly = true;
 			this.GMouldTypeName.Width = 125;
 			// 
-			// DeliverFlag
-			// 
-			this.DeliverFlag.DataPropertyName = "DeliverFlag";
-			this.DeliverFlag.FalseValue = "0";
-			this.DeliverFlag.HeaderText = "交坯标识";
-			this.DeliverFlag.MinimumWidth = 6;
-			this.DeliverFlag.Name = "DeliverFlag";
-			this.DeliverFlag.ReadOnly = true;
-			this.DeliverFlag.TrueValue = "1";
-			this.DeliverFlag.Width = 125;
-			// 
-			// DeliverTime
-			// 
-			this.DeliverTime.DataPropertyName = "DeliverTime";
-			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle6.Format = "yyyy-MM-dd";
-			this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle6;
-			this.DeliverTime.HeaderText = "交坯日期";
-			this.DeliverTime.MinimumWidth = 6;
-			this.DeliverTime.Name = "DeliverTime";
-			this.DeliverTime.ReadOnly = true;
-			this.DeliverTime.Width = 125;
-			// 
 			// CreateTime
 			// 
 			this.CreateTime.DataPropertyName = "CreateTime";
@@ -1195,27 +1195,27 @@
 		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 GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
-		private System.Windows.Forms.DataGridViewTextBoxColumn colGMouldStatus;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn ScrapFlag;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn GroutingFlag;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
-		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn colGMouldStatus;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn GroutingFlag;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn ScrapFlag;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn DeliverFlag;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn NoGroutingRreason;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Slurry_Weight;
 		private System.Windows.Forms.DataGridViewTextBoxColumn collogo;
 		private System.Windows.Forms.DataGridViewTextBoxColumn TestFlagName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn DeliverFlag;
-		private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Createuser;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;

DK.Client/PMModule/F_PM_0101.resx

@@ -494,9 +494,6 @@
   <metadata name="GroutingLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -509,52 +506,55 @@
   <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingBatchNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="colGMouldStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ScrapFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingBatchNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colGMouldStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="GroutingFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ScrapFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DeliverFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DeliverTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="NoGroutingRreason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Slurry_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="collogo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="TestFlagName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Slurry_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="collogo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="DeliverFlag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="TestFlagName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="DeliverTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="CreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@@ -40,13 +40,13 @@
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.dgvRptGroutingDaily = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.txtGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.chkTestMouldFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox();
 			this.chkGCTime = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
 			this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dtpGCTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
 			this.dtpGCTimeBegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-			this.lblGroutingLine = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.scbGroutingLine = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGroutingLine();
 			this.lblGMouldType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.scbGMouldType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGMouldType();
 			this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
@@ -89,17 +89,19 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gmouldstatusname = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.SCRAPFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.GROUTINGFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.Groutingcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.gmouldstatusname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GROUTINGFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.SCRAPFLAG = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.交坯标识 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+			this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GmouldtypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.TestFlagName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.Groutingcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.NoGroutingRreason = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GMOULDSTATUS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Slurry_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -117,8 +119,6 @@
 			this.SecurityCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.交坯标识 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-			this.DeliverTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.MONITORCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -164,17 +164,19 @@
             this.GoodsName,
             this.UserCode,
             this.STAFFNAME,
-            this.GroutingBatchNo,
-            this.gmouldstatusname,
             this.GroutingMouldCode,
             this.Barcode,
-            this.SCRAPFLAG,
-            this.GROUTINGFLAG,
+            this.Groutingcount,
             this.GroutingDate,
+            this.GroutingBatchNo,
+            this.gmouldstatusname,
+            this.GROUTINGFLAG,
+            this.SCRAPFLAG,
+            this.交坯标识,
+            this.DeliverTime,
             this.MONITORName,
             this.GmouldtypeName,
             this.TestFlagName,
-            this.Groutingcount,
             this.NoGroutingRreason,
             this.GMOULDSTATUS,
             this.Slurry_Weight,
@@ -192,8 +194,6 @@
             this.SecurityCode,
             this.LogoCodeName,
             this.PROCEDURENAME,
-            this.交坯标识,
-            this.DeliverTime,
             this.MONITORCODE,
             this.CreateUserCode,
             this.CreateUserName,
@@ -240,13 +240,13 @@
             | 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.txtGroutingLineCode);
+			this.gbxCondition.Controls.Add(this.lblGroutingLineCode);
 			this.gbxCondition.Controls.Add(this.chkTestMouldFlag);
 			this.gbxCondition.Controls.Add(this.chkGCTime);
 			this.gbxCondition.Controls.Add(this.c_Label5);
 			this.gbxCondition.Controls.Add(this.dtpGCTimeEnd);
 			this.gbxCondition.Controls.Add(this.dtpGCTimeBegin);
-			this.gbxCondition.Controls.Add(this.lblGroutingLine);
-			this.gbxCondition.Controls.Add(this.scbGroutingLine);
 			this.gbxCondition.Controls.Add(this.lblGMouldType);
 			this.gbxCondition.Controls.Add(this.scbGMouldType);
 			this.gbxCondition.Controls.Add(this.scbGoods);
@@ -292,6 +292,32 @@
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
 			// 
+			// txtGroutingLineCode
+			// 
+			this.txtGroutingLineCode.BackColor = System.Drawing.SystemColors.Window;
+			this.txtGroutingLineCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtGroutingLineCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtGroutingLineCode.ErrorMessage = "";
+			this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.txtGroutingLineCode.Location = new System.Drawing.Point(86, 46);
+			this.txtGroutingLineCode.MaxLength = 30;
+			this.txtGroutingLineCode.Name = "txtGroutingLineCode";
+			this.txtGroutingLineCode.Size = new System.Drawing.Size(130, 21);
+			this.txtGroutingLineCode.TabIndex = 53;
+			// 
+			// lblGroutingLineCode
+			// 
+			this.lblGroutingLineCode.AutoSize = true;
+			this.lblGroutingLineCode.BackColor = System.Drawing.Color.Transparent;
+			this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblGroutingLineCode.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblGroutingLineCode.Location = new System.Drawing.Point(15, 50);
+			this.lblGroutingLineCode.Name = "lblGroutingLineCode";
+			this.lblGroutingLineCode.Size = new System.Drawing.Size(65, 12);
+			this.lblGroutingLineCode.TabIndex = 52;
+			this.lblGroutingLineCode.Text = "成型线编码";
+			// 
 			// chkTestMouldFlag
 			// 
 			this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
@@ -354,27 +380,6 @@
 			this.dtpGCTimeBegin.Size = new System.Drawing.Size(142, 21);
 			this.dtpGCTimeBegin.TabIndex = 41;
 			// 
-			// lblGroutingLine
-			// 
-			this.lblGroutingLine.AutoSize = true;
-			this.lblGroutingLine.BackColor = System.Drawing.Color.Transparent;
-			this.lblGroutingLine.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGroutingLine.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGroutingLine.Location = new System.Drawing.Point(15, 51);
-			this.lblGroutingLine.Name = "lblGroutingLine";
-			this.lblGroutingLine.Size = new System.Drawing.Size(65, 12);
-			this.lblGroutingLine.TabIndex = 39;
-			this.lblGroutingLine.Text = "成型线编码";
-			// 
-			// scbGroutingLine
-			// 
-			this.scbGroutingLine.CheckedData = null;
-			this.scbGroutingLine.DisplayMember = "GroutingLineCode";
-			this.scbGroutingLine.Location = new System.Drawing.Point(86, 47);
-			this.scbGroutingLine.Name = "scbGroutingLine";
-			this.scbGroutingLine.Size = new System.Drawing.Size(133, 21);
-			this.scbGroutingLine.TabIndex = 38;
-			// 
 			// lblGMouldType
 			// 
 			this.lblGMouldType.AutoSize = true;
@@ -896,11 +901,51 @@
 			this.STAFFNAME.ReadOnly = true;
 			this.STAFFNAME.Width = 125;
 			// 
+			// GroutingMouldCode
+			// 
+			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+			this.GroutingMouldCode.HeaderText = "模具编号";
+			this.GroutingMouldCode.MinimumWidth = 6;
+			this.GroutingMouldCode.Name = "GroutingMouldCode";
+			this.GroutingMouldCode.ReadOnly = true;
+			this.GroutingMouldCode.Width = 125;
+			// 
+			// Barcode
+			// 
+			this.Barcode.DataPropertyName = "Barcode";
+			this.Barcode.HeaderText = "产品条码";
+			this.Barcode.MinimumWidth = 6;
+			this.Barcode.Name = "Barcode";
+			this.Barcode.ReadOnly = true;
+			this.Barcode.Width = 125;
+			// 
+			// Groutingcount
+			// 
+			this.Groutingcount.DataPropertyName = "Groutingcount";
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.Groutingcount.DefaultCellStyle = dataGridViewCellStyle3;
+			this.Groutingcount.HeaderText = "注浆次数";
+			this.Groutingcount.MinimumWidth = 6;
+			this.Groutingcount.Name = "Groutingcount";
+			this.Groutingcount.ReadOnly = true;
+			this.Groutingcount.Width = 125;
+			// 
+			// 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 = 125;
+			// 
 			// GroutingBatchNo
 			// 
 			this.GroutingBatchNo.DataPropertyName = "GroutingBatchNo";
-			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle3;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.GroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle5;
 			this.GroutingBatchNo.HeaderText = "注浆批次";
 			this.GroutingBatchNo.MinimumWidth = 6;
 			this.GroutingBatchNo.Name = "GroutingBatchNo";
@@ -916,23 +961,17 @@
 			this.gmouldstatusname.ReadOnly = true;
 			this.gmouldstatusname.Width = 125;
 			// 
-			// GroutingMouldCode
-			// 
-			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-			this.GroutingMouldCode.HeaderText = "模具编号";
-			this.GroutingMouldCode.MinimumWidth = 6;
-			this.GroutingMouldCode.Name = "GroutingMouldCode";
-			this.GroutingMouldCode.ReadOnly = true;
-			this.GroutingMouldCode.Width = 125;
-			// 
-			// Barcode
+			// GROUTINGFLAG
 			// 
-			this.Barcode.DataPropertyName = "Barcode";
-			this.Barcode.HeaderText = "产品条码";
-			this.Barcode.MinimumWidth = 6;
-			this.Barcode.Name = "Barcode";
-			this.Barcode.ReadOnly = true;
-			this.Barcode.Width = 125;
+			this.GROUTINGFLAG.DataPropertyName = "GROUTINGFLAG";
+			this.GROUTINGFLAG.FalseValue = "0";
+			this.GROUTINGFLAG.HeaderText = "注浆标识";
+			this.GROUTINGFLAG.MinimumWidth = 6;
+			this.GROUTINGFLAG.Name = "GROUTINGFLAG";
+			this.GROUTINGFLAG.ReadOnly = true;
+			this.GROUTINGFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.GROUTINGFLAG.TrueValue = "1";
+			this.GROUTINGFLAG.Width = 125;
 			// 
 			// SCRAPFLAG
 			// 
@@ -946,28 +985,29 @@
 			this.SCRAPFLAG.TrueValue = "1";
 			this.SCRAPFLAG.Width = 125;
 			// 
-			// GROUTINGFLAG
+			// 交坯标识
 			// 
-			this.GROUTINGFLAG.DataPropertyName = "GROUTINGFLAG";
-			this.GROUTINGFLAG.FalseValue = "0";
-			this.GROUTINGFLAG.HeaderText = "注浆标识";
-			this.GROUTINGFLAG.MinimumWidth = 6;
-			this.GROUTINGFLAG.Name = "GROUTINGFLAG";
-			this.GROUTINGFLAG.ReadOnly = true;
-			this.GROUTINGFLAG.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.GROUTINGFLAG.TrueValue = "1";
-			this.GROUTINGFLAG.Width = 125;
+			this.交坯标识.DataPropertyName = "DeliverFlag";
+			this.交坯标识.FalseValue = "0";
+			this.交坯标识.HeaderText = "交坯标识";
+			this.交坯标识.MinimumWidth = 6;
+			this.交坯标识.Name = "交坯标识";
+			this.交坯标识.ReadOnly = true;
+			this.交坯标识.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.交坯标识.TrueValue = "1";
+			this.交坯标识.Width = 125;
 			// 
-			// GroutingDate
+			// DeliverTime
 			// 
-			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 = 125;
+			this.DeliverTime.DataPropertyName = "DeliverTime";
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle6.Format = "yyyy-MM-dd HH:mm:ss";
+			this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle6;
+			this.DeliverTime.HeaderText = "交坯时间";
+			this.DeliverTime.MinimumWidth = 6;
+			this.DeliverTime.Name = "DeliverTime";
+			this.DeliverTime.ReadOnly = true;
+			this.DeliverTime.Width = 125;
 			// 
 			// MONITORName
 			// 
@@ -996,17 +1036,6 @@
 			this.TestFlagName.ReadOnly = true;
 			this.TestFlagName.Width = 125;
 			// 
-			// 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 = 125;
-			// 
 			// NoGroutingRreason
 			// 
 			this.NoGroutingRreason.DataPropertyName = "NoGroutingRreason";
@@ -1131,9 +1160,9 @@
 			// SCRAPTIME
 			// 
 			this.SCRAPTIME.DataPropertyName = "SCRAPTIME";
-			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle6.Format = "yyyy-MM-dd HH:mm:ss";
-			this.SCRAPTIME.DefaultCellStyle = dataGridViewCellStyle6;
+			dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
+			this.SCRAPTIME.DefaultCellStyle = dataGridViewCellStyle7;
 			this.SCRAPTIME.HeaderText = "损坯时间";
 			this.SCRAPTIME.MinimumWidth = 6;
 			this.SCRAPTIME.Name = "SCRAPTIME";
@@ -1167,30 +1196,6 @@
 			this.PROCEDURENAME.ReadOnly = true;
 			this.PROCEDURENAME.Width = 125;
 			// 
-			// 交坯标识
-			// 
-			this.交坯标识.DataPropertyName = "DeliverFlag";
-			this.交坯标识.FalseValue = "0";
-			this.交坯标识.HeaderText = "交坯标识";
-			this.交坯标识.MinimumWidth = 6;
-			this.交坯标识.Name = "交坯标识";
-			this.交坯标识.ReadOnly = true;
-			this.交坯标识.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.交坯标识.TrueValue = "1";
-			this.交坯标识.Width = 125;
-			// 
-			// DeliverTime
-			// 
-			this.DeliverTime.DataPropertyName = "DeliverTime";
-			dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
-			this.DeliverTime.DefaultCellStyle = dataGridViewCellStyle7;
-			this.DeliverTime.HeaderText = "交坯时间";
-			this.DeliverTime.MinimumWidth = 6;
-			this.DeliverTime.Name = "DeliverTime";
-			this.DeliverTime.ReadOnly = true;
-			this.DeliverTime.Width = 125;
-			// 
 			// MONITORCODE
 			// 
 			this.MONITORCODE.DataPropertyName = "MONITORCODE";
@@ -1304,29 +1309,31 @@
 		private Basics.BaseControls.C_Label lblGoods;
 		private Basics.BaseControls.C_Label lblGMouldType;
 		private Controls.SearchBox.ScbGMouldType scbGMouldType;
-		private Basics.BaseControls.C_Label lblGroutingLine;
-		private Controls.SearchBox.ScbGroutingLine scbGroutingLine;
         private Basics.BaseControls.C_CheckBox chkGCTime;
         private Basics.BaseControls.C_Label c_Label5;
         private Basics.BaseControls.C_DateTimePicker dtpGCTimeEnd;
         private Basics.BaseControls.C_DateTimePicker dtpGCTimeBegin;
         private Basics.BaseControls.C_StatusCheckBox chkTestMouldFlag;
+		private Basics.BaseControls.C_TextBox txtGroutingLineCode;
+		private Basics.BaseControls.C_Label lblGroutingLineCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode0;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
-		private System.Windows.Forms.DataGridViewTextBoxColumn gmouldstatusname;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Barcode;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn SCRAPFLAG;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn GROUTINGFLAG;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Groutingcount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn gmouldstatusname;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn GROUTINGFLAG;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn SCRAPFLAG;
+		private System.Windows.Forms.DataGridViewCheckBoxColumn 交坯标识;
+		private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GmouldtypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn TestFlagName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn Groutingcount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn NoGroutingRreason;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GMOULDSTATUS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Slurry_Weight;
@@ -1344,8 +1351,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn SecurityCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
-		private System.Windows.Forms.DataGridViewCheckBoxColumn 交坯标识;
-		private System.Windows.Forms.DataGridViewTextBoxColumn DeliverTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateUserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateUserName;

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

@@ -160,8 +160,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.txtGroutingBatchNo.Clear();
 			this.scbGoods.ClearValue();
 			this.scbGoodsType.ClearValue();
-			this.scbGroutingLine.ClearValue();
-			scbGroutingLine.SearchedPKMember = 0;
+			this.txtGroutingLineCode.Clear();
 			this.scbGMouldType.ClearValue();
 			this.dkGroutingUserCode.ClearControl();
 			this.dkOperUserCode.ClearControl();
@@ -235,7 +234,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				se.GoodsTypeIDS = scbGoodsType.SearchedValue + "";
 				se.GroutingMouldCode = this.txtGroutingMouldCode.Text.Trim();
 				//se.GroutingLineIDS = this.dkGroutingLineSearchBox.GroutingLineIDS;
-				se.GroutingLineIDS = this.scbGroutingLine.SearchedPKMember == 0 ? null : this.scbGroutingLine.SearchedPKMember.ToString();
+				se.GroutingLineCode = this.txtGroutingLineCode.Text;
 				se.GMouldTypeIDS = this.scbGMouldType.CheckedPKMember;
 				if (this.chkGroutingDateStart.Checked)
 				{

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

@@ -132,25 +132,34 @@
   <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingBatchNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="gmouldstatusname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Groutingcount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SCRAPFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingBatchNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="gmouldstatusname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="GROUTINGFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="SCRAPFLAG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="交坯标识.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DeliverTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="MONITORName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -162,9 +171,6 @@
   <metadata name="TestFlagName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Groutingcount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="NoGroutingRreason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -216,12 +222,6 @@
   <metadata name="PROCEDURENAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="交坯标识.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeliverTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="MONITORCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/ReportModule/R01/M01/F_RPT_010103.cs

@@ -165,7 +165,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		{
 			this.scbGoods.ClearValue();
 			this.scbGoodsType.ClearValue();
-			this.scbGroutingLine.ClearValue();
+			this.txtGroutingLineCode.Clear();
 			this.scbGMouldType.ClearValue();
 			this.txtGroutingMouldCode.Text = string.Empty;
 			this.dtpCreateTimeStart.Value = DateTime.Now.Date;
@@ -187,7 +187,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			try
 			{
 				RPT010103_SE se = new RPT010103_SE();
-				se.GroutingLineIDS = this.scbGroutingLine.CheckedPKMember;
+				se.GroutingLineCode = this.txtGroutingLineCode.Text;
 				se.GMouldTypeIDS = this.scbGMouldType.CheckedPKMember;
 				se.GroutingMouldCode = this.txtGroutingMouldCode.Text;
 				se.GoodsIDS = this.scbGoods.CheckedPKMember;

DK.Client/ReportModule/R01/M04/F_RPT_010401.cs

@@ -185,7 +185,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 			this.scbGoods.ClearValue();
 			scbGoodsType.ClearValue();
 			this.scbGMouldType.ClearValue();
-			this.scbGroutingLine.ClearValue();
+			this.txtGroutingLineCode.Clear();
 			this.dkProcedureSearchBox.ClearControl();
 			this.dkproductionLineSearchBox.ClearControl();
 			this.dkUserInfoSearchBox.ClearControl();
@@ -239,7 +239,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				se.ProcedureIDS = dkProcedureSearchBox.ProcedureIDS;
 				se.GoodsIDS = this.scbGoods.CheckedPKMember;
 				se.UserIDS = dkUserInfoSearchBox.UserIDS;
-				se.GroutingLineIDS = (this.scbGroutingLine.SearchedPKMember == 0 ? null : this.scbGroutingLine.SearchedPKMember.ToString());
+				se.GroutingLineCode = this.txtGroutingLineCode.Text;
 				se.GMouldTypeIDS = this.scbGMouldType.CheckedPKMember;
 				if (this.chkCreateTime.Checked == true)
 				{

DK.Client/ReportModule/R01/M04/F_RPT_010401.resx

@@ -120,61 +120,70 @@
   <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="FinishedBarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SecurityCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="delivertime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="CompleteProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="proceduretime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="goodstypename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductionLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductionLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GoodsLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductionLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CompleteProcedureID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="inscrapflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CompleteProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="delivertime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="proceduretime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ProductionLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="FinishedBarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="inscrapflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="SecurityCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ModelType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="goodstypename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProcedureModel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ProductionLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GoodsLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ProductionLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CompleteProcedureID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ModelType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ProcedureModel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="GoodsLevelTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -195,21 +204,12 @@
   <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="GROUTINGCOUNT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="GROUTINGBATCHNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="GoodsID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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

@@ -44,6 +44,8 @@
 			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.txtSTAFFNAME = new Dongke.IBOSS.PRD.Basics.BaseControls.DKTextBox();
+			this.lblSTAFFNAME = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
 			this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
@@ -70,33 +72,33 @@
 			this.tapReportModuleDetail = new System.Windows.Forms.TabPage();
 			this.dgvDetailReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.SecurityCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ProductionLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ProductionLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CompleteProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CompleteProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CompleteProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UpdateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsLevelName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GROUTINGUSERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.inscrapflag = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ProductionLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.SecurityCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ProductionLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CompleteProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ModelType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ProcedureModel = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsLevelName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsLevelTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GMouldTypeID = 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.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -112,8 +114,6 @@
 			this.UpdateUserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UpdateUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.lblSTAFFNAME = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtSTAFFNAME = new Dongke.IBOSS.PRD.Basics.BaseControls.DKTextBox();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).BeginInit();
@@ -136,7 +136,7 @@
 			this.tsrOperate.Name = "tsrOperate";
 			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
 			this.tsrOperate.ShowItemToolTips = false;
-			this.tsrOperate.Size = new System.Drawing.Size(1355, 44);
+			this.tsrOperate.Size = new System.Drawing.Size(1016, 35);
 			this.tsrOperate.TabIndex = 0;
 			this.tsrOperate.Text = "toolStrip1";
 			// 
@@ -181,26 +181,46 @@
 			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);
+			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
-			this.gbxCondition.Size = new System.Drawing.Size(1339, 76);
+			this.gbxCondition.Size = new System.Drawing.Size(1004, 61);
 			this.gbxCondition.TabIndex = 1;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
 			// 
+			// txtSTAFFNAME
+			// 
+			this.txtSTAFFNAME.BackColor = System.Drawing.SystemColors.Window;
+			this.txtSTAFFNAME.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtSTAFFNAME.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtSTAFFNAME.Location = new System.Drawing.Point(860, 21);
+			this.txtSTAFFNAME.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+			this.txtSTAFFNAME.Name = "txtSTAFFNAME";
+			this.txtSTAFFNAME.Size = new System.Drawing.Size(130, 21);
+			this.txtSTAFFNAME.TabIndex = 50;
+			// 
+			// lblSTAFFNAME
+			// 
+			this.lblSTAFFNAME.AutoSize = true;
+			this.lblSTAFFNAME.BackColor = System.Drawing.Color.Transparent;
+			this.lblSTAFFNAME.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblSTAFFNAME.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblSTAFFNAME.Location = new System.Drawing.Point(804, 24);
+			this.lblSTAFFNAME.Name = "lblSTAFFNAME";
+			this.lblSTAFFNAME.Size = new System.Drawing.Size(53, 12);
+			this.lblSTAFFNAME.TabIndex = 48;
+			this.lblSTAFFNAME.Text = "员工姓名";
+			// 
 			// lblGoodsType
 			// 
 			this.lblGoodsType.AutoSize = true;
 			this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
 			this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGoodsType.Location = new System.Drawing.Point(555, 30);
-			this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblGoodsType.Location = new System.Drawing.Point(416, 24);
 			this.lblGoodsType.Name = "lblGoodsType";
-			this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+			this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
 			this.lblGoodsType.TabIndex = 23;
 			this.lblGoodsType.Text = "产品类别";
 			// 
@@ -208,10 +228,9 @@
 			// 
 			this.scbGoodsType.CheckedData = null;
 			this.scbGoodsType.IsOnlyDisplayEnd = false;
-			this.scbGoodsType.Location = new System.Drawing.Point(631, 25);
-			this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
+			this.scbGoodsType.Location = new System.Drawing.Point(473, 20);
 			this.scbGoodsType.Name = "scbGoodsType";
-			this.scbGoodsType.Size = new System.Drawing.Size(187, 26);
+			this.scbGoodsType.Size = new System.Drawing.Size(140, 21);
 			this.scbGoodsType.TabIndex = 22;
 			// 
 			// txtGoodsCode
@@ -222,11 +241,10 @@
 			this.txtGoodsCode.ErrorMessage = "";
 			this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtGoodsCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtGoodsCode.Location = new System.Drawing.Point(904, 25);
-			this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4);
+			this.txtGoodsCode.Location = new System.Drawing.Point(678, 20);
 			this.txtGoodsCode.MaxLength = 20;
 			this.txtGoodsCode.Name = "txtGoodsCode";
-			this.txtGoodsCode.Size = new System.Drawing.Size(160, 25);
+			this.txtGoodsCode.Size = new System.Drawing.Size(121, 21);
 			this.txtGoodsCode.TabIndex = 4;
 			this.txtGoodsCode.TextValue = "";
 			// 
@@ -235,10 +253,9 @@
 			this.lblGoodsCode.AutoSize = true;
 			this.lblGoodsCode.BackColor = System.Drawing.Color.Transparent;
 			this.lblGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGoodsCode.Location = new System.Drawing.Point(825, 30);
-			this.lblGoodsCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblGoodsCode.Location = new System.Drawing.Point(619, 24);
 			this.lblGoodsCode.Name = "lblGoodsCode";
-			this.lblGoodsCode.Size = new System.Drawing.Size(67, 15);
+			this.lblGoodsCode.Size = new System.Drawing.Size(53, 12);
 			this.lblGoodsCode.TabIndex = 16;
 			this.lblGoodsCode.Text = "产品编码";
 			// 
@@ -249,10 +266,9 @@
 			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(1217, 19);
-			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4);
+			this.btnClearCondition.Location = new System.Drawing.Point(913, 15);
 			this.btnClearCondition.Name = "btnClearCondition";
-			this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
+			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
 			this.btnClearCondition.TabIndex = 6;
 			this.btnClearCondition.Text = "清空条件(&C)";
 			this.btnClearCondition.UseVisualStyleBackColor = true;
@@ -265,10 +281,9 @@
 			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(1096, 19);
-			this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
+			this.btnSearch.Location = new System.Drawing.Point(822, 15);
 			this.btnSearch.Name = "btnSearch";
-			this.btnSearch.Size = new System.Drawing.Size(113, 38);
+			this.btnSearch.Size = new System.Drawing.Size(85, 30);
 			this.btnSearch.TabIndex = 5;
 			this.btnSearch.Text = "查询(&Q)";
 			this.btnSearch.UseVisualStyleBackColor = true;
@@ -281,8 +296,8 @@
 			this.dkProcedureSearchBox.Enabled = true;
 			this.dkProcedureSearchBox.IsEnablePurview = false;
 			this.dkProcedureSearchBox.IsMustInput = false;
-			this.dkProcedureSearchBox.Location = new System.Drawing.Point(291, 25);
-			this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+			this.dkProcedureSearchBox.Location = new System.Drawing.Point(218, 20);
+			this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.dkProcedureSearchBox.ModelType = null;
 			this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
 			this.dkProcedureSearchBox.ProcedureCode = "";
@@ -292,7 +307,7 @@
 			this.dkProcedureSearchBox.Purview = null;
 			this.dkProcedureSearchBox.PurviewType = ((byte)(0));
 			this.dkProcedureSearchBox.SelectMore = true;
-			this.dkProcedureSearchBox.Size = new System.Drawing.Size(256, 26);
+			this.dkProcedureSearchBox.Size = new System.Drawing.Size(192, 21);
 			this.dkProcedureSearchBox.TabIndex = 4;
 			this.dkProcedureSearchBox.Title = "生产工序";
 			this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -304,8 +319,8 @@
 			this.dkproductionLineSearchBox.Enabled = true;
 			this.dkproductionLineSearchBox.IsEnablePurview = false;
 			this.dkproductionLineSearchBox.IsMustInput = false;
-			this.dkproductionLineSearchBox.Location = new System.Drawing.Point(16, 25);
-			this.dkproductionLineSearchBox.Margin = new System.Windows.Forms.Padding(5);
+			this.dkproductionLineSearchBox.Location = new System.Drawing.Point(12, 20);
+			this.dkproductionLineSearchBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.dkproductionLineSearchBox.Name = "dkproductionLineSearchBox";
 			this.dkproductionLineSearchBox.ProductionLineCode = "";
 			this.dkproductionLineSearchBox.ProductionLineID = null;
@@ -314,7 +329,7 @@
 			this.dkproductionLineSearchBox.Purview = null;
 			this.dkproductionLineSearchBox.PurviewType = ((byte)(0));
 			this.dkproductionLineSearchBox.SelectMore = true;
-			this.dkproductionLineSearchBox.Size = new System.Drawing.Size(256, 26);
+			this.dkproductionLineSearchBox.Size = new System.Drawing.Size(192, 21);
 			this.dkproductionLineSearchBox.TabIndex = 1;
 			this.dkproductionLineSearchBox.Title = "  生产线";
 			this.dkproductionLineSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
@@ -388,7 +403,7 @@
 			this.dgvReportModule.RowsDefaultCellStyle = dataGridViewCellStyle4;
 			this.dgvReportModule.RowTemplate.Height = 21;
 			this.dgvReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvReportModule.Size = new System.Drawing.Size(1335, 367);
+			this.dgvReportModule.Size = new System.Drawing.Size(999, 291);
 			this.dgvReportModule.SortOrderColumnName = null;
 			this.dgvReportModule.TabIndex = 29;
 			this.dgvReportModule.Tag = true;
@@ -518,22 +533,22 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.tblReportModule.Controls.Add(this.tapReportModule);
 			this.tblReportModule.Controls.Add(this.tapReportModuleDetail);
-			this.tblReportModule.Location = new System.Drawing.Point(0, 128);
+			this.tblReportModule.Location = new System.Drawing.Point(0, 102);
 			this.tblReportModule.Margin = new System.Windows.Forms.Padding(0);
 			this.tblReportModule.Name = "tblReportModule";
 			this.tblReportModule.Padding = new System.Drawing.Point(0, 0);
 			this.tblReportModule.SelectedIndex = 0;
 			this.tblReportModule.ShowToolTips = true;
-			this.tblReportModule.Size = new System.Drawing.Size(1343, 396);
+			this.tblReportModule.Size = new System.Drawing.Size(1007, 317);
 			this.tblReportModule.TabIndex = 30;
 			// 
 			// tapReportModule
 			// 
 			this.tapReportModule.Controls.Add(this.dgvReportModule);
-			this.tapReportModule.Location = new System.Drawing.Point(4, 25);
+			this.tapReportModule.Location = new System.Drawing.Point(4, 22);
 			this.tapReportModule.Margin = new System.Windows.Forms.Padding(0);
 			this.tapReportModule.Name = "tapReportModule";
-			this.tapReportModule.Size = new System.Drawing.Size(1335, 367);
+			this.tapReportModule.Size = new System.Drawing.Size(999, 291);
 			this.tapReportModule.TabIndex = 0;
 			this.tapReportModule.Text = "在产产品汇总";
 			this.tapReportModule.UseVisualStyleBackColor = true;
@@ -541,10 +556,10 @@
 			// tapReportModuleDetail
 			// 
 			this.tapReportModuleDetail.Controls.Add(this.dgvDetailReportModule);
-			this.tapReportModuleDetail.Location = new System.Drawing.Point(4, 25);
+			this.tapReportModuleDetail.Location = new System.Drawing.Point(4, 22);
 			this.tapReportModuleDetail.Margin = new System.Windows.Forms.Padding(0);
 			this.tapReportModuleDetail.Name = "tapReportModuleDetail";
-			this.tapReportModuleDetail.Size = new System.Drawing.Size(1335, 367);
+			this.tapReportModuleDetail.Size = new System.Drawing.Size(999, 291);
 			this.tapReportModuleDetail.TabIndex = 1;
 			this.tapReportModuleDetail.Text = "在产产品明细";
 			this.tapReportModuleDetail.UseVisualStyleBackColor = true;
@@ -579,33 +594,33 @@
 			this.dgvDetailReportModule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
 			this.dgvDetailReportModule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.BarCode,
-            this.SecurityCode,
-            this.LogoCodeName,
             this.dataGridViewTextBoxColumn1,
             this.GoodsName,
-            this.ProductionLineID,
-            this.ProductionLineCode,
-            this.dataGridViewTextBoxColumn2,
-            this.CompleteProcedureID,
-            this.CompleteProcedureName,
             this.CreateTime,
+            this.CompleteProcedureName,
             this.UpdateTime,
             this.dataGridViewTextBoxColumn3,
             this.STAFFNAME,
+            this.GoodsLevelName,
+            this.GROUTINGUSERCODE,
             this.inscrapflag,
+            this.GroutingMouldCode,
+            this.GroutingDate,
+            this.LogoCodeName,
+            this.ProductionLineCode,
+            this.SecurityCode,
+            this.ProductionLineID,
+            this.dataGridViewTextBoxColumn2,
+            this.CompleteProcedureID,
             this.ModelType,
             this.ProcedureModel,
-            this.GoodsLevelName,
             this.GoodsLevelTypeName,
             this.GroutingLineID,
             this.GroutingLineCode,
             this.GroutingLineName,
             this.GMouldTypeID,
             this.GMouldTypeName,
-            this.GroutingMouldCode,
-            this.GroutingDate,
             this.GROUTINGCOUNT,
-            this.GROUTINGUSERCODE,
             this.GoodsID,
             this.UserID,
             this.UserName,
@@ -635,7 +650,6 @@
 			this.dgvDetailReportModule.IsSubTotalFlag = false;
 			this.dgvDetailReportModule.IsTopDeep = false;
 			this.dgvDetailReportModule.Location = new System.Drawing.Point(0, 0);
-			this.dgvDetailReportModule.Margin = new System.Windows.Forms.Padding(4);
 			this.dgvDetailReportModule.MergeColumnNames = null;
 			this.dgvDetailReportModule.MergeDetailColumnNames = null;
 			this.dgvDetailReportModule.MergeDetailOnlyColumn = null;
@@ -650,7 +664,7 @@
 			this.dgvDetailReportModule.RowsDefaultCellStyle = dataGridViewCellStyle11;
 			this.dgvDetailReportModule.RowTemplate.Height = 21;
 			this.dgvDetailReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvDetailReportModule.Size = new System.Drawing.Size(1332, 364);
+			this.dgvDetailReportModule.Size = new System.Drawing.Size(999, 291);
 			this.dgvDetailReportModule.SortOrderColumnName = null;
 			this.dgvDetailReportModule.TabIndex = 29;
 			this.dgvDetailReportModule.Tag = true;
@@ -666,24 +680,6 @@
 			this.BarCode.ReadOnly = true;
 			this.BarCode.Width = 125;
 			// 
-			// SecurityCode
-			// 
-			this.SecurityCode.DataPropertyName = "SecurityCode";
-			this.SecurityCode.HeaderText = "防伪码";
-			this.SecurityCode.MinimumWidth = 6;
-			this.SecurityCode.Name = "SecurityCode";
-			this.SecurityCode.ReadOnly = true;
-			this.SecurityCode.Width = 125;
-			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.MinimumWidth = 6;
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			this.LogoCodeName.Width = 125;
-			// 
 			// dataGridViewTextBoxColumn1
 			// 
 			this.dataGridViewTextBoxColumn1.DataPropertyName = "GoodsCode";
@@ -702,54 +698,6 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.Width = 125;
 			// 
-			// ProductionLineID
-			// 
-			this.ProductionLineID.DataPropertyName = "ProductionLineID";
-			this.ProductionLineID.HeaderText = "生产线ID";
-			this.ProductionLineID.MinimumWidth = 6;
-			this.ProductionLineID.Name = "ProductionLineID";
-			this.ProductionLineID.ReadOnly = true;
-			this.ProductionLineID.Visible = false;
-			this.ProductionLineID.Width = 125;
-			// 
-			// ProductionLineCode
-			// 
-			this.ProductionLineCode.DataPropertyName = "ProductionLineCode";
-			this.ProductionLineCode.HeaderText = "生产线编码";
-			this.ProductionLineCode.MinimumWidth = 6;
-			this.ProductionLineCode.Name = "ProductionLineCode";
-			this.ProductionLineCode.ReadOnly = true;
-			this.ProductionLineCode.Visible = false;
-			this.ProductionLineCode.Width = 125;
-			// 
-			// dataGridViewTextBoxColumn2
-			// 
-			this.dataGridViewTextBoxColumn2.DataPropertyName = "ProductionLineName";
-			this.dataGridViewTextBoxColumn2.HeaderText = "生产线";
-			this.dataGridViewTextBoxColumn2.MinimumWidth = 6;
-			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-			this.dataGridViewTextBoxColumn2.ReadOnly = true;
-			this.dataGridViewTextBoxColumn2.Width = 125;
-			// 
-			// CompleteProcedureID
-			// 
-			this.CompleteProcedureID.DataPropertyName = "CompleteProcedureID";
-			this.CompleteProcedureID.HeaderText = "完成工序ID";
-			this.CompleteProcedureID.MinimumWidth = 6;
-			this.CompleteProcedureID.Name = "CompleteProcedureID";
-			this.CompleteProcedureID.ReadOnly = true;
-			this.CompleteProcedureID.Visible = false;
-			this.CompleteProcedureID.Width = 125;
-			// 
-			// CompleteProcedureName
-			// 
-			this.CompleteProcedureName.DataPropertyName = "CompleteProcedureName";
-			this.CompleteProcedureName.HeaderText = "完成工序";
-			this.CompleteProcedureName.MinimumWidth = 6;
-			this.CompleteProcedureName.Name = "CompleteProcedureName";
-			this.CompleteProcedureName.ReadOnly = true;
-			this.CompleteProcedureName.Width = 125;
-			// 
 			// CreateTime
 			// 
 			this.CreateTime.DataPropertyName = "CreateTime";
@@ -761,6 +709,15 @@
 			this.CreateTime.ReadOnly = true;
 			this.CreateTime.Width = 180;
 			// 
+			// CompleteProcedureName
+			// 
+			this.CompleteProcedureName.DataPropertyName = "CompleteProcedureName";
+			this.CompleteProcedureName.HeaderText = "完成工序";
+			this.CompleteProcedureName.MinimumWidth = 6;
+			this.CompleteProcedureName.Name = "CompleteProcedureName";
+			this.CompleteProcedureName.ReadOnly = true;
+			this.CompleteProcedureName.Width = 125;
+			// 
 			// UpdateTime
 			// 
 			this.UpdateTime.DataPropertyName = "UpdateTime";
@@ -791,6 +748,24 @@
 			this.STAFFNAME.ReadOnly = true;
 			this.STAFFNAME.Width = 125;
 			// 
+			// GoodsLevelName
+			// 
+			this.GoodsLevelName.DataPropertyName = "GoodsLevelName";
+			this.GoodsLevelName.HeaderText = "产品分级";
+			this.GoodsLevelName.MinimumWidth = 6;
+			this.GoodsLevelName.Name = "GoodsLevelName";
+			this.GoodsLevelName.ReadOnly = true;
+			this.GoodsLevelName.Width = 125;
+			// 
+			// GROUTINGUSERCODE
+			// 
+			this.GROUTINGUSERCODE.DataPropertyName = "GROUTINGUSERCODE";
+			this.GROUTINGUSERCODE.HeaderText = "成型工号";
+			this.GROUTINGUSERCODE.MinimumWidth = 6;
+			this.GROUTINGUSERCODE.Name = "GROUTINGUSERCODE";
+			this.GROUTINGUSERCODE.ReadOnly = true;
+			this.GROUTINGUSERCODE.Width = 125;
+			// 
 			// inscrapflag
 			// 
 			this.inscrapflag.DataPropertyName = "inscrapflag";
@@ -800,6 +775,83 @@
 			this.inscrapflag.ReadOnly = true;
 			this.inscrapflag.Width = 125;
 			// 
+			// GroutingMouldCode
+			// 
+			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
+			this.GroutingMouldCode.HeaderText = "模具编号";
+			this.GroutingMouldCode.MinimumWidth = 6;
+			this.GroutingMouldCode.Name = "GroutingMouldCode";
+			this.GroutingMouldCode.ReadOnly = true;
+			this.GroutingMouldCode.Width = 125;
+			// 
+			// GroutingDate
+			// 
+			this.GroutingDate.DataPropertyName = "GroutingDate";
+			dataGridViewCellStyle9.Format = "yyyy-MM-dd";
+			this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle9;
+			this.GroutingDate.HeaderText = "注浆日期";
+			this.GroutingDate.MinimumWidth = 6;
+			this.GroutingDate.Name = "GroutingDate";
+			this.GroutingDate.ReadOnly = true;
+			this.GroutingDate.Width = 125;
+			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.MinimumWidth = 6;
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			this.LogoCodeName.Width = 125;
+			// 
+			// ProductionLineCode
+			// 
+			this.ProductionLineCode.DataPropertyName = "ProductionLineCode";
+			this.ProductionLineCode.HeaderText = "生产线编码";
+			this.ProductionLineCode.MinimumWidth = 6;
+			this.ProductionLineCode.Name = "ProductionLineCode";
+			this.ProductionLineCode.ReadOnly = true;
+			this.ProductionLineCode.Visible = false;
+			this.ProductionLineCode.Width = 125;
+			// 
+			// SecurityCode
+			// 
+			this.SecurityCode.DataPropertyName = "SecurityCode";
+			this.SecurityCode.HeaderText = "防伪码";
+			this.SecurityCode.MinimumWidth = 6;
+			this.SecurityCode.Name = "SecurityCode";
+			this.SecurityCode.ReadOnly = true;
+			this.SecurityCode.Width = 125;
+			// 
+			// ProductionLineID
+			// 
+			this.ProductionLineID.DataPropertyName = "ProductionLineID";
+			this.ProductionLineID.HeaderText = "生产线ID";
+			this.ProductionLineID.MinimumWidth = 6;
+			this.ProductionLineID.Name = "ProductionLineID";
+			this.ProductionLineID.ReadOnly = true;
+			this.ProductionLineID.Visible = false;
+			this.ProductionLineID.Width = 125;
+			// 
+			// dataGridViewTextBoxColumn2
+			// 
+			this.dataGridViewTextBoxColumn2.DataPropertyName = "ProductionLineName";
+			this.dataGridViewTextBoxColumn2.HeaderText = "生产线";
+			this.dataGridViewTextBoxColumn2.MinimumWidth = 6;
+			this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+			this.dataGridViewTextBoxColumn2.ReadOnly = true;
+			this.dataGridViewTextBoxColumn2.Width = 125;
+			// 
+			// CompleteProcedureID
+			// 
+			this.CompleteProcedureID.DataPropertyName = "CompleteProcedureID";
+			this.CompleteProcedureID.HeaderText = "完成工序ID";
+			this.CompleteProcedureID.MinimumWidth = 6;
+			this.CompleteProcedureID.Name = "CompleteProcedureID";
+			this.CompleteProcedureID.ReadOnly = true;
+			this.CompleteProcedureID.Visible = false;
+			this.CompleteProcedureID.Width = 125;
+			// 
 			// ModelType
 			// 
 			this.ModelType.DataPropertyName = "ModelType";
@@ -820,15 +872,6 @@
 			this.ProcedureModel.Visible = false;
 			this.ProcedureModel.Width = 125;
 			// 
-			// GoodsLevelName
-			// 
-			this.GoodsLevelName.DataPropertyName = "GoodsLevelName";
-			this.GoodsLevelName.HeaderText = "产品分级";
-			this.GoodsLevelName.MinimumWidth = 6;
-			this.GoodsLevelName.Name = "GoodsLevelName";
-			this.GoodsLevelName.ReadOnly = true;
-			this.GoodsLevelName.Width = 125;
-			// 
 			// GoodsLevelTypeName
 			// 
 			this.GoodsLevelTypeName.DataPropertyName = "GoodsLevelTypeName";
@@ -887,26 +930,6 @@
 			this.GMouldTypeName.ReadOnly = true;
 			this.GMouldTypeName.Width = 125;
 			// 
-			// GroutingMouldCode
-			// 
-			this.GroutingMouldCode.DataPropertyName = "GroutingMouldCode";
-			this.GroutingMouldCode.HeaderText = "模具编号";
-			this.GroutingMouldCode.MinimumWidth = 6;
-			this.GroutingMouldCode.Name = "GroutingMouldCode";
-			this.GroutingMouldCode.ReadOnly = true;
-			this.GroutingMouldCode.Width = 125;
-			// 
-			// GroutingDate
-			// 
-			this.GroutingDate.DataPropertyName = "GroutingDate";
-			dataGridViewCellStyle9.Format = "yyyy-MM-dd";
-			this.GroutingDate.DefaultCellStyle = dataGridViewCellStyle9;
-			this.GroutingDate.HeaderText = "注浆日期";
-			this.GroutingDate.MinimumWidth = 6;
-			this.GroutingDate.Name = "GroutingDate";
-			this.GroutingDate.ReadOnly = true;
-			this.GroutingDate.Width = 125;
-			// 
 			// GROUTINGCOUNT
 			// 
 			this.GROUTINGCOUNT.DataPropertyName = "GROUTINGCOUNT";
@@ -918,15 +941,6 @@
 			this.GROUTINGCOUNT.ReadOnly = true;
 			this.GROUTINGCOUNT.Width = 125;
 			// 
-			// GROUTINGUSERCODE
-			// 
-			this.GROUTINGUSERCODE.DataPropertyName = "GROUTINGUSERCODE";
-			this.GROUTINGUSERCODE.HeaderText = "成型工号";
-			this.GROUTINGUSERCODE.MinimumWidth = 6;
-			this.GROUTINGUSERCODE.Name = "GROUTINGUSERCODE";
-			this.GROUTINGUSERCODE.ReadOnly = true;
-			this.GROUTINGUSERCODE.Width = 125;
-			// 
 			// GoodsID
 			// 
 			this.GoodsID.DataPropertyName = "GoodsID";
@@ -1087,38 +1101,15 @@
 			this.Remarks.Visible = false;
 			this.Remarks.Width = 125;
 			// 
-			// lblSTAFFNAME
-			// 
-			this.lblSTAFFNAME.AutoSize = true;
-			this.lblSTAFFNAME.BackColor = System.Drawing.Color.Transparent;
-			this.lblSTAFFNAME.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblSTAFFNAME.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblSTAFFNAME.Location = new System.Drawing.Point(1072, 30);
-			this.lblSTAFFNAME.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.lblSTAFFNAME.Name = "lblSTAFFNAME";
-			this.lblSTAFFNAME.Size = new System.Drawing.Size(67, 15);
-			this.lblSTAFFNAME.TabIndex = 48;
-			this.lblSTAFFNAME.Text = "员工姓名";
-			// 
-			// txtSTAFFNAME
-			// 
-			this.txtSTAFFNAME.BackColor = System.Drawing.SystemColors.Window;
-			this.txtSTAFFNAME.BackgroundColor = System.Drawing.SystemColors.Window;
-			this.txtSTAFFNAME.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtSTAFFNAME.Location = new System.Drawing.Point(1146, 26);
-			this.txtSTAFFNAME.Name = "txtSTAFFNAME";
-			this.txtSTAFFNAME.Size = new System.Drawing.Size(172, 25);
-			this.txtSTAFFNAME.TabIndex = 50;
-			// 
 			// F_RPT_030105
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1355, 521);
+			this.ClientSize = new System.Drawing.Size(1016, 417);
 			this.Controls.Add(this.tblReportModule);
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.tsrOperate);
-			this.Margin = new System.Windows.Forms.Padding(5);
+			this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
 			this.Name = "F_RPT_030105";
 			this.Text = "在产产品汇总表";
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_030101_1_FormClosed);
@@ -1155,34 +1146,48 @@
         private Basics.BaseControls.C_DataGridView dgvDetailReportModule;
 		private Basics.BaseControls.C_Label lblGoodsType;
 		private Controls.SearchBox.ScbGoodsType scbGoodsType;
+		private System.Windows.Forms.DataGridViewTextBoxColumn productionlinename;
+		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Usercode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAMES;
+		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodstypename2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Goodscode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn InCount;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureId;
+		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeID2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeCode2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn colgoodsid;
+		private System.Windows.Forms.DataGridViewTextBoxColumn coluserid;
+		private Basics.BaseControls.C_Label lblSTAFFNAME;
+		private Basics.BaseControls.DKTextBox txtSTAFFNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn SecurityCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineID;
-		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureID;
-		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
+		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UpdateTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsLevelName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GROUTINGUSERCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn inscrapflag;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn SecurityCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionLineID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+		private System.Windows.Forms.DataGridViewTextBoxColumn CompleteProcedureID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ModelType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureModel;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsLevelName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsLevelTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeID;
 		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 GoodsID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserName;
@@ -1198,19 +1203,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UpdateUserName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private System.Windows.Forms.DataGridViewTextBoxColumn productionlinename;
-		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
-		private System.Windows.Forms.DataGridViewTextBoxColumn Usercode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAMES;
-		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodstypename2;
-		private System.Windows.Forms.DataGridViewTextBoxColumn Goodscode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn InCount;
-		private System.Windows.Forms.DataGridViewTextBoxColumn ProcedureId;
-		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeID2;
-		private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsTypeCode2;
-		private System.Windows.Forms.DataGridViewTextBoxColumn colgoodsid;
-		private System.Windows.Forms.DataGridViewTextBoxColumn coluserid;
-		private Basics.BaseControls.C_Label lblSTAFFNAME;
-		private Basics.BaseControls.DKTextBox txtSTAFFNAME;
 	}
 }

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

@@ -233,55 +233,64 @@
   <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SecurityCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="CreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="CompleteProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductionLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="UpdateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProductionLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CompleteProcedureID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GoodsLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CompleteProcedureName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="inscrapflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="UpdateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="STAFFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="inscrapflag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ProductionLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ModelType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="SecurityCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ProcedureModel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ProductionLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GoodsLevelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CompleteProcedureID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ModelType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ProcedureModel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="GoodsLevelTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -302,18 +311,9 @@
   <metadata name="GMouldTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GroutingMouldCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="GroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="GROUTINGCOUNT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="GROUTINGUSERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="GoodsID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -154,11 +154,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                         parameters.Add(new OracleParameter(":GMouldTypeIDS", OracleDbType.NVarchar2, se.GMouldTypeIDS, ParameterDirection.Input));
                     }
 
-                    // 成型线IDS
-                    if (!string.IsNullOrEmpty(se.GroutingLineIDS))
+                    // 成型线编码
+                    if (!string.IsNullOrEmpty(se.GroutingLineCode))
                     {
-                        sql.Append("AND instr(','||:GroutingLineIDS||',',','||gdd.GroutingLineId||',')>0 ");
-                        parameters.Add(new OracleParameter(":GroutingLineIDS", OracleDbType.NVarchar2, se.GroutingLineIDS, ParameterDirection.Input));
+                        //sql.Append("  AND TP_PM_InProduction.GROUTINGLINECODE like :GROUTINGLINECODE  ");
+                        sql.Append("  AND instr(gdd.GROUTINGLINECODE,:GROUTINGLINECODE)>0   ");
+                        parameters.Add(new OracleParameter(":GROUTINGLINECODE", OracleDbType.NVarchar2, se.GroutingLineCode, ParameterDirection.Input));
                     }
 
                     // 产品IDS
@@ -505,11 +506,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
                 if (se != null)
                 {
-                    //成型线IDS
-                    if (!string.IsNullOrEmpty(se.GroutingLineIDS))
+                    // 成型线编码
+                    if (!string.IsNullOrEmpty(se.GroutingLineCode))
                     {
-                        sql.Append(" and instr(','||:GroutingLineIDS||',',','||pd.GroutingLineID||',')>0 ");
-                        parameters.Add(new OracleParameter(":GroutingLineIDS", OracleDbType.NVarchar2, se.GroutingLineIDS, ParameterDirection.Input));
+                        //sql.Append("  AND TP_PM_InProduction.GROUTINGLINECODE like :GROUTINGLINECODE  ");
+                        sql.Append("  AND instr(pd.GROUTINGLINECODE,:GROUTINGLINECODE)>0");
+                        parameters.Add(new OracleParameter(":GROUTINGLINECODE", OracleDbType.NVarchar2, se.GroutingLineCode, ParameterDirection.Input));
                     }
                     // 成型线类别
                     if (!string.IsNullOrEmpty(se.GMouldTypeIDS))
@@ -692,7 +694,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 + "inner join TP_MST_Goods g "
                 + "on pd.goodsid=g.goodsid "
                 //数据字典,TPC002为釉色类别
-                + "inner join TP_MST_DataDictionary dd "
+                + "left join TP_MST_DataDictionary dd "
                 //
                 + "on dd.DictionaryType = 'TPC002' "
                 //
@@ -706,11 +708,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 + "inner join TP_MST_GoodsType gdt "
                 + "on g.GoodsTypeID=gdt.GoodsTypeID "
 
-                 + "inner join TP_MST_logo "
+                 + "left join TP_MST_logo "
                 + "on gdd.logoid=TP_MST_logo.logoid "
 
                 // 交坯
-                + " WHERE pd.modeltype=5 "
+                + " WHERE pd.PROCEDUREID = 7"
                 // 账套
                 + " and pd.AccountID=:AccountID"
                 + " and pd.ValueFlag='" + (int)Constant.ValueFlag.Effective + "'";
@@ -1655,11 +1657,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                         parameters.Add(new OracleParameter(":UserIDS", OracleDbType.NVarchar2, se.UserIDS, ParameterDirection.Input));
                     }
 
-                    // 成型线IDS
-                    if (!string.IsNullOrEmpty(se.GroutingLineIDS))
+                    // 成型线编码
+                    if (!string.IsNullOrEmpty(se.GroutingLineCode))
                     {
-                        sql.Append("  AND instr(','||:GroutingLineIDS||',',','||TP_PM_InProduction.GroutingLineID||',')>0 ");
-                        parameters.Add(new OracleParameter(":GroutingLineIDS", OracleDbType.NVarchar2, se.GroutingLineIDS, ParameterDirection.Input));
+                        //sql.Append("  AND TP_PM_InProduction.GROUTINGLINECODE like :GROUTINGLINECODE  ");
+                        sql.Append("  AND instr(TP_PM_InProduction.GROUTINGLINECODE,:GROUTINGLINECODE)>0   ");
+                        parameters.Add(new OracleParameter(":GROUTINGLINECODE", OracleDbType.NVarchar2,se.GroutingLineCode, ParameterDirection.Input));
                     }
 
                     // 成型线类型IDS

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

@@ -22,10 +22,10 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
     public class RPT010101_SE
     {
         /// <summary>
-        /// 成型线
+        /// 成型线编码
         /// </summary>
         [DataMember]
-        public string GroutingLineIDS
+        public string GroutingLineCode
         {
             get;
             set;

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

@@ -76,10 +76,10 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
         }
 
         /// <summary>
-        /// 成型线IDS
+        /// 成型线编码
         /// </summary>
         [DataMember]
-        public string GroutingLineIDS
+        public string GroutingLineCode
         {
             get;
             set;