Ver código fonte

增加员工姓名列

忠帅 张 2 anos atrás
pai
commit
0ce6c1e2e5

+ 10 - 0
DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -93,6 +93,7 @@
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -758,6 +759,7 @@
             this.STAFFNAME,
             this.GroutingMouldCode,
             this.BarCode,
+            this.PROCEDURENAME,
             this.GroutingCount,
             this.GroutingDate,
             this.GroutingBatchNo,
@@ -925,6 +927,13 @@
 			this.BarCode.ReadOnly = true;
 			this.BarCode.Width = 125;
 			// 
+			// PROCEDURENAME
+			// 
+			this.PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
+			this.PROCEDURENAME.HeaderText = "当前工序";
+			this.PROCEDURENAME.Name = "PROCEDURENAME";
+			this.PROCEDURENAME.ReadOnly = true;
+			// 
 			// GroutingCount
 			// 
 			this.GroutingCount.DataPropertyName = "GroutingCount";
@@ -1201,6 +1210,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingCount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingBatchNo;

+ 3 - 0
DK.Client/PMModule/F_PM_0101.resx

@@ -512,6 +512,9 @@
   <metadata name="BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="PROCEDURENAME.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>

+ 21 - 11
DK.Client/PMModule/F_PM_0301.Designer.cs

@@ -66,6 +66,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -80,7 +82,6 @@
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -441,6 +442,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -454,8 +457,7 @@
             this.ModelType,
             this.PieceType,
             this.Remarks,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -526,6 +528,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -644,13 +660,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_0301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -706,6 +715,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -720,6 +731,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_0301.resx

@@ -209,6 +209,12 @@
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="OrganizationID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -251,9 +257,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 21 - 11
DK.Client/PMModule/F_PM_0401.Designer.cs

@@ -66,6 +66,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -80,7 +82,6 @@
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
 			this.gbxCondition.SuspendLayout();
 			this.tsrOperate.SuspendLayout();
@@ -119,6 +120,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -132,8 +135,7 @@
             this.ModelType,
             this.PieceType,
             this.Remarks,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -527,6 +529,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -645,13 +661,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_0401
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -707,6 +716,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -721,6 +732,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_0401.resx

@@ -132,6 +132,12 @@
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="OrganizationID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -174,9 +180,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

+ 21 - 11
DK.Client/PMModule/F_PM_0501.Designer.cs

@@ -74,6 +74,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -95,7 +97,6 @@
 			this.KilnCarPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Kilncarbatchno = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -554,6 +555,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -574,8 +577,7 @@
             this.KilnCarPosition,
             this.KilnCarPositionName,
             this.Kilncarbatchno,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -646,6 +648,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -816,13 +832,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_0501
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -886,6 +895,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -907,6 +918,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPositionName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Kilncarbatchno;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_0501.resx

@@ -197,6 +197,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -239,9 +245,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>46</value>
   </metadata>

+ 21 - 11
DK.Client/PMModule/F_PM_0601.Designer.cs

@@ -74,6 +74,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -95,7 +97,6 @@
 			this.KilnCarPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Kilncarbatchno = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -555,6 +556,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -575,8 +578,7 @@
             this.KilnCarPosition,
             this.KilnCarPositionName,
             this.Kilncarbatchno,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -647,6 +649,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -817,13 +833,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_0601
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -886,6 +895,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -907,6 +918,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPositionName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Kilncarbatchno;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_0601.resx

@@ -227,6 +227,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -269,7 +275,4 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

+ 20 - 11
DK.Client/PMModule/F_PM_0901.Designer.cs

@@ -82,6 +82,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -99,7 +101,6 @@
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -486,6 +487,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -502,8 +505,7 @@
             this.KilnName,
             this.KilnCarName,
             this.KilnCarPosition,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -723,6 +725,19 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -866,13 +881,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_0901
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -946,6 +954,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -963,6 +973,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_0901.resx

@@ -209,6 +209,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -239,9 +245,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="DefectFine.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 21 - 11
DK.Client/PMModule/F_PM_1201.Designer.cs

@@ -93,6 +93,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -110,7 +112,6 @@
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -573,6 +574,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -589,8 +592,7 @@
             this.KilnName,
             this.KilnCarName,
             this.KilnCarPosition,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -837,6 +839,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -981,13 +997,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_1201
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1070,6 +1079,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -1087,6 +1098,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_1201.resx

@@ -212,6 +212,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -242,9 +248,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="DefectFine.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 21 - 11
DK.Client/PMModule/F_PM_1301.Designer.cs

@@ -87,6 +87,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -104,7 +106,6 @@
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvDefect)).BeginInit();
@@ -664,6 +665,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -680,8 +683,7 @@
             this.KilnName,
             this.KilnCarName,
             this.KilnCarPosition,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -803,6 +805,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -945,13 +961,6 @@
 			this.LogoCodeName.Name = "LogoCodeName";
 			this.LogoCodeName.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_1301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1031,6 +1040,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -1048,6 +1059,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_1301.resx

@@ -212,6 +212,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -242,9 +248,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 21 - 11
DK.Client/PMModule/F_PM_2001.Designer.cs

@@ -66,6 +66,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -80,7 +82,6 @@
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -441,6 +442,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -454,8 +457,7 @@
             this.PieceType,
             this.Remarks,
             this.LogoCodeName,
-            this.procedurename,
-            this.NUMS});
+            this.procedurename});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -526,6 +528,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -642,13 +658,6 @@
 			this.procedurename.Name = "procedurename";
 			this.procedurename.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_2001
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -704,6 +713,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -718,6 +729,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_2001.resx

@@ -209,6 +209,12 @@
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="OrganizationID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -251,9 +257,6 @@
   <metadata name="procedurename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 21 - 11
DK.Client/PMModule/F_PM_2501.Designer.cs

@@ -66,6 +66,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -80,7 +82,6 @@
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -441,6 +442,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -454,8 +457,7 @@
             this.PieceType,
             this.Remarks,
             this.LogoCodeName,
-            this.procedurename,
-            this.NUMS});
+            this.procedurename});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.DynamicColumnName = "";
@@ -526,6 +528,20 @@
 			this.UserCode.Name = "UserCode";
 			this.UserCode.ReadOnly = true;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -642,13 +658,6 @@
 			this.procedurename.Name = "procedurename";
 			this.procedurename.ReadOnly = true;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_2501
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -704,6 +713,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -718,6 +729,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 3 - 0
DK.Client/PMModule/F_PM_2501.resx

@@ -194,6 +194,9 @@
         NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 22 - 12
DK.Client/PMModule/F_PM_3201.Designer.cs

@@ -93,6 +93,8 @@
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -110,7 +112,6 @@
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -575,6 +576,8 @@
             this.GoodsName,
             this.GoodsTypeName,
             this.UserCode,
+            this.STAFNAME,
+            this.NUMS,
             this.OrganizationID,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -591,8 +594,7 @@
             this.KilnName,
             this.KilnCarName,
             this.KilnCarPosition,
-            this.LogoCodeName,
-            this.NUMS});
+            this.LogoCodeName});
 			this.dgvProduction.ColumnTreeView = null;
 			this.dgvProduction.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvProduction.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -880,6 +882,20 @@
 			this.UserCode.ReadOnly = true;
 			this.UserCode.Width = 125;
 			// 
+			// STAFNAME
+			// 
+			this.STAFNAME.DataPropertyName = "STAFNAME";
+			this.STAFNAME.HeaderText = "员工姓名";
+			this.STAFNAME.Name = "STAFNAME";
+			this.STAFNAME.ReadOnly = true;
+			// 
+			// NUMS
+			// 
+			this.NUMS.DataPropertyName = "NUMS";
+			this.NUMS.HeaderText = "数量";
+			this.NUMS.Name = "NUMS";
+			this.NUMS.ReadOnly = true;
+			// 
 			// OrganizationID
 			// 
 			this.OrganizationID.DataPropertyName = "OrganizationName";
@@ -1056,13 +1072,6 @@
 			this.LogoCodeName.ReadOnly = true;
 			this.LogoCodeName.Width = 125;
 			// 
-			// NUMS
-			// 
-			this.NUMS.DataPropertyName = "NUMS";
-			this.NUMS.HeaderText = "数量";
-			this.NUMS.Name = "NUMS";
-			this.NUMS.ReadOnly = true;
-			// 
 			// F_PM_3201
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1072,7 +1081,7 @@
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.tsrOperate);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.Margin = new System.Windows.Forms.Padding(4);
 			this.Name = "F_PM_3201";
 			this.Text = "半检一览";
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PM_3201_FormClosed);
@@ -1146,6 +1155,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;
@@ -1163,6 +1174,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
 	}
 }

+ 6 - 3
DK.Client/PMModule/F_PM_3201.resx

@@ -212,6 +212,12 @@
   <metadata name="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="STAFNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NUMS.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>
@@ -242,9 +248,6 @@
   <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="NUMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="DefectFine.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>