增加产品规格列

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -89,6 +89,8 @@
 			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.collogo = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -107,7 +109,6 @@
 			this.MONITORName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Slurry_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.collogo = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.TestFlagName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GMouldTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -757,6 +758,8 @@
             this.GroutingLineCode,
             this.GoodsCode,
             this.GoodsName,
+            this.GOODSSPECIFICATION,
+            this.collogo,
             this.UserCode,
             this.STAFFNAME,
             this.NUMS,
@@ -775,7 +778,6 @@
             this.MONITORName,
             this.GroutingLineName,
             this.Slurry_Weight,
-            this.collogo,
             this.TestFlagName,
             this.GMouldTypeName,
             this.CreateTime,
@@ -894,6 +896,22 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.Width = 125;
 			// 
+			// GOODSSPECIFICATION
+			// 
+			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.HeaderText = "产品规格";
+			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.ReadOnly = true;
+			// 
+			// collogo
+			// 
+			this.collogo.DataPropertyName = "logonamecode";
+			this.collogo.HeaderText = "产品商标";
+			this.collogo.MinimumWidth = 6;
+			this.collogo.Name = "collogo";
+			this.collogo.ReadOnly = true;
+			this.collogo.Width = 125;
+			// 
 			// UserCode
 			// 
 			this.UserCode.DataPropertyName = "UserCode";
@@ -1072,15 +1090,6 @@
 			this.Slurry_Weight.ReadOnly = true;
 			this.Slurry_Weight.Width = 125;
 			// 
-			// collogo
-			// 
-			this.collogo.DataPropertyName = "logonamecode";
-			this.collogo.HeaderText = "产品商标";
-			this.collogo.MinimumWidth = 6;
-			this.collogo.Name = "collogo";
-			this.collogo.ReadOnly = true;
-			this.collogo.Width = 125;
-			// 
 			// TestFlagName
 			// 
 			this.TestFlagName.DataPropertyName = "TestFlagName";
@@ -1216,6 +1225,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
+		private System.Windows.Forms.DataGridViewTextBoxColumn collogo;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
@@ -1234,7 +1245,6 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Slurry_Weight;
-		private System.Windows.Forms.DataGridViewTextBoxColumn collogo;
 		private System.Windows.Forms.DataGridViewTextBoxColumn TestFlagName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GMouldTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;

DK.Client/PMModule/F_PM_0101.resx

@@ -500,6 +500,12 @@
   <metadata name="GoodsName.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="collogo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -554,9 +560,6 @@
   <metadata name="Slurry_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="collogo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="TestFlagName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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

@@ -89,6 +89,8 @@
 			this.GroutingLineCode0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.STAFFNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.NUMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -117,12 +119,10 @@
 			this.GLAZE2_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.FINISHED_WEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LUSTERWAREWEIGHT = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.DICTIONARYVALUE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SCRAPTIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.SecurityCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.MONITORCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -168,6 +168,8 @@
             this.GroutingLineCode0,
             this.GoodsCode,
             this.GoodsName,
+            this.GOODSSPECIFICATION,
+            this.LogoCodeName,
             this.UserCode,
             this.STAFFNAME,
             this.NUMS,
@@ -196,12 +198,10 @@
             this.GLAZE2_WEIGHT,
             this.FINISHED_WEIGHT,
             this.LUSTERWAREWEIGHT,
-            this.GOODSSPECIFICATION,
             this.DICTIONARYVALUE,
             this.GoodsTypeName,
             this.SCRAPTIME,
             this.SecurityCode,
-            this.LogoCodeName,
             this.PROCEDURENAME,
             this.MONITORCODE,
             this.CreateUserCode,
@@ -909,6 +909,24 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.Width = 125;
 			// 
+			// GOODSSPECIFICATION
+			// 
+			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.HeaderText = "产品规格";
+			this.GOODSSPECIFICATION.MinimumWidth = 6;
+			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.ReadOnly = true;
+			this.GOODSSPECIFICATION.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;
+			// 
 			// UserCode
 			// 
 			this.UserCode.DataPropertyName = "UserCode";
@@ -1174,16 +1192,6 @@
 			this.LUSTERWAREWEIGHT.ReadOnly = true;
 			this.LUSTERWAREWEIGHT.Width = 125;
 			// 
-			// GOODSSPECIFICATION
-			// 
-			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
-			this.GOODSSPECIFICATION.HeaderText = "规格";
-			this.GOODSSPECIFICATION.MinimumWidth = 6;
-			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
-			this.GOODSSPECIFICATION.ReadOnly = true;
-			this.GOODSSPECIFICATION.Visible = false;
-			this.GOODSSPECIFICATION.Width = 125;
-			// 
 			// DICTIONARYVALUE
 			// 
 			this.DICTIONARYVALUE.DataPropertyName = "DICTIONARYVALUE";
@@ -1225,15 +1233,6 @@
 			this.SecurityCode.ReadOnly = true;
 			this.SecurityCode.Width = 125;
 			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.MinimumWidth = 6;
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			this.LogoCodeName.Width = 125;
-			// 
 			// PROCEDURENAME
 			// 
 			this.PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
@@ -1368,6 +1367,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode0;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn STAFFNAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn NUMS;
@@ -1396,12 +1397,10 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GLAZE2_WEIGHT;
 		private System.Windows.Forms.DataGridViewTextBoxColumn FINISHED_WEIGHT;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LUSTERWAREWEIGHT;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn DICTIONARYVALUE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SCRAPTIME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn SecurityCode;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn PROCEDURENAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn MONITORCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateUserCode;

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

@@ -129,6 +129,12 @@
   <metadata name="GoodsName.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="LogoCodeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -213,9 +219,6 @@
   <metadata name="LUSTERWAREWEIGHT.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="DICTIONARYVALUE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -228,9 +231,6 @@
   <metadata name="SecurityCode.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>