Merge branch 'master' of http://pscg.dongkesoft.com:9002/r/mes/hg5020

DK.Client/ReportModule/R03/M01/F_RPT_030116.resx

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

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -14153,7 +14153,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"              1,\n" +
 				"              '合计[' || t.goodstypename2 || ']',\n" +
 				"              t.goodstypename2) goodstypename2\n" +
-				"      ,t.goodsid\n" +
+                "      ,t.goodstypename\n" +
+                "      ,t.goodsid\n" +
 				"      ,t.goodscode\n" +
 				//"      ,t.groutinglineid\n" +
 				//"      ,t.groutinglinecode\n" +
@@ -14168,11 +14169,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"              ,gt2.goodstypename goodstypename2\n" +
 				"              ,gdrd.goodsid\n" +
 				"              ,gdrd.goodscode\n" +
-				//"              ,gdrd.groutinglineid\n" +
-				//"              ,gdrd.groutinglinecode\n" +
-				//"              ,gdrd.userid\n" +
-				//"              ,gdrd.usercode\n" +
-				"              ,gdrd.gddc rdcount -- 存坯数\n" +
+                "              ,gdrd.goodstypename\n" +
+                //"              ,gdrd.groutinglineid\n" +
+                //"              ,gdrd.groutinglinecode\n" +
+                //"              ,gdrd.userid\n" +
+                //"              ,gdrd.usercode\n" +
+                "              ,gdrd.gddc rdcount -- 存坯数\n" +
 				"              ,rdd.gldcount -- 模具数\n" +
 				"              , CASE\n" +
 				"                  WHEN rdd.gldcount IS NOT NULL AND rdd.gldcount > 0 THEN\n" +
@@ -14191,7 +14193,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				//"                      ,gdd.usercode\n" +
 				"                      ,g.reserveddays\n" +
 				"                      ,substr(gt.goodstypecode, 1, 6) goodstypecode2\n" +
-				"                      ,COUNT(*) gddc\n" +
+                "                      ,gt.goodstypename\n" +
+                "                      ,COUNT(*) gddc\n" +
 				"                  FROM tp_pm_groutingdailydetail gdd\n" +
 				"                 INNER JOIN tp_mst_goods g\n" +
 				"                    ON g.goodsid = gdd.goodsid\n" +
@@ -14213,14 +14216,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				"                       instr(gt.GoodstypeCode, :GoodsTypeCode) = 1)\n" +
 				"                   AND (:DateBegin IS NULL OR\n" +
 				"                       gdd.groutingdate BETWEEN :DateBegin AND :DateEnd)\n" +
-				"                 GROUP BY gt.goodstypecode\n" +
+                "                 GROUP BY gt.goodstypecode,gt.goodstypename\n" +
 				"                         ,gdd.goodsid\n" +
 				"                         ,gdd.goodscode\n" +
-				//"                         ,gdd.groutinglineid\n" +
-				//"                         ,gdd.groutinglinecode\n" +
-				//"                         ,gdd.userid\n" +
-				//"                         ,gdd.usercode\n" +
-				"                         ,g.reserveddays) gdrd\n" +
+                //"                         ,gdd.groutinglineid\n" +
+                //"                         ,gdd.groutinglinecode\n" +
+                //"                         ,gdd.userid\n" +
+                //"                         ,gdd.usercode\n" +
+                "                         ,g.reserveddays) gdrd\n" +
 				"          LEFT JOIN (SELECT gld.goodsid\n" +
 				//"                          ,gld.groutinglineid\n" +
 				"                          ,COUNT(*) gldcount\n" +
@@ -14245,7 +14248,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 				//"                 ,gdrd.groutinglinecode\n" +
 				//"                 ,gdrd.usercode" +
 				"                 ) t\n" +
-				" GROUP BY GROUPING SETS((t.goodstypecode2, t.goodstypename2, t.goodsid, t.goodscode, t.gldcount, t.rddays, t.reserveddays),(t.goodstypecode2, t.goodstypename2),())";
+                " GROUP BY GROUPING SETS((t.goodstypecode2, t.goodstypename2,t.goodstypename, t.goodsid, t.goodscode, t.gldcount, t.rddays, t.reserveddays),(t.goodstypecode2, t.goodstypename2),())";
 
 				OracleParameter[] oracleParameter = new OracleParameter[]
 				{