交坯明细表增加产品规格 并修改分组统计方式

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

@@ -64,12 +64,12 @@
 			this.LogoCodeName = 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.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingLineCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GmouldtypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GOODSSPECIFICATION = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GlazeTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingMouldCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GroutingDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -118,12 +118,12 @@
             this.LogoCodeName,
             this.GoodsCode,
             this.GoodsName,
+            this.GOODSSPECIFICATION,
             this.GoodsTypeName,
             this.UserCode,
             this.CreateTime,
             this.GroutingLineCode,
             this.GmouldtypeName,
-            this.GOODSSPECIFICATION,
             this.GlazeTypeName,
             this.GroutingMouldCode,
             this.GroutingDate,
@@ -518,6 +518,14 @@
 			this.GoodsName.ReadOnly = true;
 			this.GoodsName.Width = 80;
 			// 
+			// GOODSSPECIFICATION
+			// 
+			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.HeaderText = "产品规格";
+			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
+			this.GOODSSPECIFICATION.ReadOnly = true;
+			this.GOODSSPECIFICATION.Width = 60;
+			// 
 			// GoodsTypeName
 			// 
 			this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
@@ -560,15 +568,6 @@
 			this.GmouldtypeName.ReadOnly = true;
 			this.GmouldtypeName.Width = 80;
 			// 
-			// GOODSSPECIFICATION
-			// 
-			this.GOODSSPECIFICATION.DataPropertyName = "GOODSSPECIFICATION";
-			this.GOODSSPECIFICATION.HeaderText = "规格";
-			this.GOODSSPECIFICATION.Name = "GOODSSPECIFICATION";
-			this.GOODSSPECIFICATION.ReadOnly = true;
-			this.GOODSSPECIFICATION.Visible = false;
-			this.GOODSSPECIFICATION.Width = 60;
-			// 
 			// GlazeTypeName
 			// 
 			this.GlazeTypeName.DataPropertyName = "GlazeTypeName";
@@ -706,12 +705,12 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn LogoCodeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CreateTime;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingLineCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GmouldtypeName;
-		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSSPECIFICATION;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GlazeTypeName;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingMouldCode;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDate;

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

@@ -129,6 +129,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="GoodsTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,9 +147,6 @@
   <metadata name="GmouldtypeName.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="GlazeTypeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -397,7 +397,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 			testflagname,
 			STAFFNAME 
 		),
-		( SUBSTR( GROUTINGLINECODE, 1, 3 ), SUBSTR( GROUTINGLINECODE, 1, 2 ), GROUTINGLINECODE, GOODSCODE, UserCode ),
+		( SUBSTR( GROUTINGLINECODE, 1, 3 ), SUBSTR( GROUTINGLINECODE, 1, 2 ), GROUTINGLINECODE, GOODSCODE, UserCode,GoodsName,GOODSSPECIFICATION,STAFFNAME,LogoCodeName  ),
 		( SUBSTR( GROUTINGLINECODE, 1, 3 ), SUBSTR( GROUTINGLINECODE, 1, 2 ) ),
 		( SUBSTR( GROUTINGLINECODE, 1, 2 ) ),
 		( ) 
@@ -747,7 +747,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 	                                                    pd.ISPUBLICBODY,
 	                                                    gdd.GROUTINGCOUNT,
 	                                                     TP_MST_Logo.Logocode,TP_MST_Logo.Logoname,uc.usercode
-	                                                                ),(pd.GroutingUserCode,tp_mst_user.USERNAME,pd.goodscode,pd.GOODSNAME),(pd.GroutingUserCode),())
+	                                                                ),(pd.GroutingUserCode,tp_mst_user.USERNAME,pd.goodscode,
+	                                                    pd.goodsname,g.GoodsSpecification,TP_MST_Logo.Logoname,pd.GroutingLineCode
+																											),(pd.GroutingUserCode),())
 	                                                     ORDER BY DECODE(GROUPING_ID(pd.GroutingUserCode,pd.goodscode), 3, 1), pd.GroutingUserCode");
                 DataTable data = conn.GetSqlResultToDt(sql.ToString(), parameters.ToArray());
 
@@ -782,9 +784,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         private static string GetRPT010103SSQL()
         {
             string selSql = @"SELECT
-                         CASE when GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME) =0 AND pd.CreateTime is null  THEN '小件'
-			WHEN GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME)=1 THEN '合计' 
-			WHEN GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME)=3 THEN '总计'
+                          CASE when GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME) =0 AND pd.CreateTime is null  THEN '小计'
+			WHEN GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME)=7 THEN '总计' 
+			WHEN GROUPING_ID(pd.GroutingUserCode,pd.goodscode,pd.GOODSNAME)=3 THEN '合计'
 			ELSE TO_CHAR(pd.barcode) end AS BARCODE,
 	        pd.groutingdate,
 	        pd.CreateTime,