Sfoglia il codice sorgente

生产数据表 列调整

张忠帅 2 anni fa
parent
commit
e69a46b21d

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

@@ -64,6 +64,7 @@
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -82,7 +83,6 @@
 			this.ModelType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -441,6 +441,7 @@
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -458,8 +459,7 @@
             this.ProcedureModel,
             this.ModelType,
             this.PieceType,
-            this.Remarks,
-            this.LogoCodeName});
+            this.Remarks});
 			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 = "";
@@ -516,6 +516,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -662,13 +669,6 @@
 			this.Remarks.ReadOnly = true;
 			this.Remarks.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_0301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -722,6 +722,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -740,6 +741,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ModelType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -203,6 +203,9 @@
   <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">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -257,9 +260,6 @@
   <metadata name="Remarks.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">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

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

@@ -64,6 +64,7 @@
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -82,7 +83,6 @@
 			this.ModelType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
 			this.gbxCondition.SuspendLayout();
 			this.tsrOperate.SuspendLayout();
@@ -119,6 +119,7 @@
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -136,8 +137,7 @@
             this.ProcedureModel,
             this.ModelType,
             this.PieceType,
-            this.Remarks,
-            this.LogoCodeName});
+            this.Remarks});
 			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 = "";
@@ -517,6 +517,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -663,13 +670,6 @@
 			this.Remarks.ReadOnly = true;
 			this.Remarks.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_0401
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -723,6 +723,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -741,6 +742,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ModelType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

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

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

@@ -72,6 +72,7 @@
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -97,7 +98,6 @@
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Kilncarbatchno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -554,6 +554,7 @@
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -578,8 +579,7 @@
             this.KilnCarName,
             this.KilnCarPosition,
             this.KilnCarPositionName,
-            this.Kilncarbatchno,
-            this.LogoCodeName});
+            this.Kilncarbatchno});
 			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 = "";
@@ -636,6 +636,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -834,13 +841,6 @@
 			this.Kilncarbatchno.Name = "Kilncarbatchno";
 			this.Kilncarbatchno.ReadOnly = true;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_0501
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -902,6 +902,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -927,6 +928,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPositionName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Kilncarbatchno;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -194,6 +194,9 @@
         NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -245,9 +248,6 @@
   <metadata name="Kilncarbatchno.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">
-    <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

@@ -73,6 +73,8 @@
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.inprocedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -97,7 +99,6 @@
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPositionName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Kilncarbatchno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvProduction)).BeginInit();
@@ -556,6 +557,8 @@
             this.GoodsCode,
             this.GoodsName,
             this.GoodsTypeName,
+            this.LogoCodeName,
+            this.GOODSSPECIFICATION,
             this.inprocedurename,
             this.UserCode,
             this.STAFNAME,
@@ -579,8 +582,7 @@
             this.KilnCarName,
             this.KilnCarPosition,
             this.KilnCarPositionName,
-            this.Kilncarbatchno,
-            this.LogoCodeName});
+            this.Kilncarbatchno});
 			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 = "";
@@ -644,6 +646,20 @@
 			this.GoodsTypeName.Name = "GoodsTypeName";
 			this.GoodsTypeName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
+			// GOODSSPECIFICATION
+			// 
+			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.HeaderText = "产品规格";
+			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.ReadOnly = true;
+			// 
 			// inprocedurename
 			// 
 			this.inprocedurename.DataPropertyName = "inprocedurename";
@@ -835,13 +851,6 @@
 			this.Kilncarbatchno.Name = "Kilncarbatchno";
 			this.Kilncarbatchno.ReadOnly = true;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_0601
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -903,6 +912,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn inprocedurename;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFNAME;
@@ -927,6 +938,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPositionName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Kilncarbatchno;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

+ 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="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="inprocedurename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -275,7 +281,4 @@
   <metadata name="Kilncarbatchno.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">
-    <value>True</value>
-  </metadata>
 </root>

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

@@ -80,6 +80,7 @@
 			this.ProductionDataID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -101,7 +102,6 @@
 			this.KilnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -486,6 +486,7 @@
             this.ProductionDataID,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -506,8 +507,7 @@
             this.Remarks,
             this.KilnName,
             this.KilnCarName,
-            this.KilnCarPosition,
-            this.LogoCodeName});
+            this.KilnCarPosition});
 			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;
@@ -713,6 +713,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -883,13 +890,6 @@
 			this.KilnCarPosition.ReadOnly = true;
 			this.KilnCarPosition.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_0901
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -961,6 +961,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDataID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -982,6 +983,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -206,6 +206,9 @@
   <metadata name="ProductionDataID.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">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -245,9 +248,6 @@
   <metadata name="KilnCarPosition.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">
-    <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>

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

@@ -91,6 +91,7 @@
 			this.ProductionDataID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -114,7 +115,6 @@
 			this.KilnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -575,6 +575,7 @@
             this.ProductionDataID,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -597,8 +598,7 @@
             this.Remarks,
             this.KilnName,
             this.KilnCarName,
-            this.KilnCarPosition,
-            this.LogoCodeName});
+            this.KilnCarPosition});
 			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;
@@ -831,6 +831,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -1017,13 +1024,6 @@
 			this.KilnCarPosition.ReadOnly = true;
 			this.KilnCarPosition.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_1201
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1104,6 +1104,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDataID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -1127,6 +1128,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -209,6 +209,9 @@
   <metadata name="ProductionDataID.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">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -254,9 +257,6 @@
   <metadata name="KilnCarPosition.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">
-    <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>

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

@@ -85,6 +85,7 @@
 			this.ProductionDataID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -106,7 +107,6 @@
 			this.KilnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvDefect)).BeginInit();
@@ -664,6 +664,7 @@
             this.ProductionDataID,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -684,8 +685,7 @@
             this.Remarks,
             this.KilnName,
             this.KilnCarName,
-            this.KilnCarPosition,
-            this.LogoCodeName});
+            this.KilnCarPosition});
 			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;
@@ -793,6 +793,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -963,13 +970,6 @@
 			this.KilnCarPosition.ReadOnly = true;
 			this.KilnCarPosition.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// F_PM_1301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1047,6 +1047,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDataID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -1068,6 +1069,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -209,6 +209,9 @@
   <metadata name="ProductionDataID.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">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -248,9 +251,6 @@
   <metadata name="KilnCarPosition.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">
-    <value>True</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 10 - 10
DK.Client/PMModule/F_PM_2001.Designer.cs

@@ -64,6 +64,7 @@
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -81,7 +82,6 @@
 			this.ModelType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
@@ -441,6 +441,7 @@
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -458,7 +459,6 @@
             this.ModelType,
             this.PieceType,
             this.Remarks,
-            this.LogoCodeName,
             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)));
@@ -516,6 +516,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -653,13 +660,6 @@
 			this.Remarks.ReadOnly = true;
 			this.Remarks.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// procedurename
 			// 
 			this.procedurename.DataPropertyName = "procedurename";
@@ -720,6 +720,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -737,7 +738,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ModelType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
 	}
 }

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

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

+ 10 - 10
DK.Client/PMModule/F_PM_2501.Designer.cs

@@ -64,6 +64,7 @@
 			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -81,7 +82,6 @@
 			this.ModelType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PieceType = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
@@ -441,6 +441,7 @@
             this.BarCode,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -458,7 +459,6 @@
             this.ModelType,
             this.PieceType,
             this.Remarks,
-            this.LogoCodeName,
             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)));
@@ -516,6 +516,13 @@
 			this.GoodsName.Name = "GoodsName";
 			this.GoodsName.ReadOnly = true;
 			// 
+			// LogoCodeName
+			// 
+			this.LogoCodeName.DataPropertyName = "LogoCodeName";
+			this.LogoCodeName.HeaderText = "商标";
+			this.LogoCodeName.Name = "LogoCodeName";
+			this.LogoCodeName.ReadOnly = true;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -653,13 +660,6 @@
 			this.Remarks.ReadOnly = true;
 			this.Remarks.Visible = false;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
 			// procedurename
 			// 
 			this.procedurename.DataPropertyName = "procedurename";
@@ -720,6 +720,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn BarCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -737,7 +738,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ModelType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PieceType;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn procedurename;
 	}
 }

+ 13 - 13
DK.Client/PMModule/F_PM_3201.Designer.cs

@@ -91,6 +91,7 @@
 			this.ProductionDataID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -112,7 +113,6 @@
 			this.KilnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KilnCarPosition = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -575,6 +575,7 @@
             this.ProductionDataID,
             this.GoodsCode,
             this.GoodsName,
+            this.LogoCodeName,
             this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
@@ -595,8 +596,7 @@
             this.Remarks,
             this.KilnName,
             this.KilnCarName,
-            this.KilnCarPosition,
-            this.LogoCodeName});
+            this.KilnCarPosition});
 			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;
@@ -866,6 +866,15 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.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;
+			// 
 			// GOODSSPECIFICATION
 			// 
 			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
@@ -1072,15 +1081,6 @@
 			this.KilnCarPosition.Visible = false;
 			this.KilnCarPosition.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;
-			// 
 			// F_PM_3201
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1162,6 +1162,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDataID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
@@ -1183,6 +1184,5 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KilnCarPosition;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 	}
 }

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

@@ -209,6 +209,9 @@
   <metadata name="ProductionDataID.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">
+    <value>True</value>
+  </metadata>
   <metadata name="GOODSSPECIFICATION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -248,9 +251,6 @@
   <metadata name="KilnCarPosition.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">
-    <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>