产成品质量分析表 新增产品规格列

DK.Client/ReportModule/R04/M01/F_RPT_040104.Designer.cs

@@ -76,6 +76,7 @@
 			this.GoodsID = 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.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Qualified = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.QualifiedPercent = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -447,6 +448,7 @@
             this.GoodsID,
             this.GoodsCode,
             this.goodsname,
+            this.goodsspecification,
             this.OutKilnCount,
             this.Qualified,
             this.QualifiedPercent,
@@ -566,6 +568,13 @@
 			this.goodsname.Name = "goodsname";
 			this.goodsname.ReadOnly = true;
 			// 
+			// goodsspecification
+			// 
+			this.goodsspecification.DataPropertyName = "goodsspecification";
+			this.goodsspecification.HeaderText = "产品规格";
+			this.goodsspecification.Name = "goodsspecification";
+			this.goodsspecification.ReadOnly = true;
+			// 
 			// OutKilnCount
 			// 
 			this.OutKilnCount.DataPropertyName = "OutKilnCount";
@@ -748,6 +757,7 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn goodsname;
+		private System.Windows.Forms.DataGridViewTextBoxColumn goodsspecification;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OutKilnCount;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Qualified;
 		private System.Windows.Forms.DataGridViewTextBoxColumn QualifiedPercent;

DK.Client/ReportModule/R04/M01/F_RPT_040104.resx

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

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -3900,7 +3900,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                          ,'--') goodstypename2
                   ,decode(qdgroup.gid, 0, qdgroup.goodstypename, '--') goodstypename
                   ,decode(qdgroup.gid, 0, qdgroup.goodscode, '--') goodscode 
-                   ,decode(qdgroup.gid, 0, qdgroup.goodsname, '--') goodsname                   
+                   ,decode(qdgroup.gid, 0, qdgroup.goodsname, '--') goodsname   
+                  ,decode(qdgroup.gid, 0, qdgroup.goodsspecification, '--') goodsspecification   
                   ,qdgroup.OutKilnCount 
                   ,qdgroup.GoodCount 
                   ,decode(qdgroup.OutKilnCount 
@@ -3939,6 +3940,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                           ,mstgoodstype.goodstypename 
                           ,mstgoods.goodscode 
                           ,mstgoods.goodsname
+                          ,mstgoods.goodsspecification
                           ,nvl(sum(decode(ppcc.goodsleveltypeid, 0, 1, 0)), 0) OutKilnCount 
                           ,nvl(sum(decode(ppcc.goodsleveltypeid, 5, 1,16,1, 0)), 0) BadCount 
                           ,nvl(sum(decode(ppcc.goodsleveltypeid, 6, 1, 0)), 0) ReFireCount 
@@ -4095,7 +4097,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
             }
             sqlString =
-            "         group by grouping sets((pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode,mstgoods.goodsname),(pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, mstkiln.kilncode),(pcpl.productionlinename))\n" +
+            "         group by grouping sets((pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode,mstgoods.goodsname,mstgoods.goodsspecification),(pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, mstkiln.kilncode),(pcpl.productionlinename))\n" +
             "         order by pcpl.productionlinename\n" +
             "                 ,mstkiln.kilncode\n" +
             "                 ,mstgoodstype2.goodstypecode\n" +