成型报损添加车间合计

DK.Client/PMModule/F_PM_2701.resx

@@ -197,6 +197,9 @@
   <metadata name="GoodsID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="COM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GroutingLineCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -5810,23 +5810,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                 ServiceResultEntity result = new ServiceResultEntity();
                 con.Open();
 
-                string sqlString = @"SELECT
-                                                GROUPING_ID (STAFFNAME,Goodscode) GID,
-                                                CASE when Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=0 THEN '小计'
-                                                     WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=2 THEN '合计'
-		                                                 WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=3 THEN '总计'
-		                                                 ELSE TO_CHAR(Groutinglinecode) END AS Groutinglinecode,ScrapProductID,
-		                                                 BARCODE,ResponUserCode,ResponUserName,STAFFNAME,
-		                                                 SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
-                                                GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
-                                                GroutingDate,GroutingLineID,Groutinglinename,GMouldTypeID,
-                                                Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
-                                                ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
-                                                AuditStatusName,createuser,ResponUserID,
-                                                BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
-                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp
-                                            FROM(
-                                            SELECT sp.BarCode
+                string sqlString = @" with TB as  (SELECT sp.BarCode
                                                   ,sp.ScrapProductID
                                                   ,sp.GoodsID
                                                   ,sp.Goodscode
@@ -5890,7 +5874,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                                                 ON sp.ScrapRreasonID = msr.ScrapReasonID
                                               LEFT JOIN TP_MST_USER backOutUser
                                                 ON sp.BackOutUserID = backOutUser.UserId
-                                                INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID
+                                                INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = SP.GROUTINGDAILYDETAILID 
                                                 LEFT JOIN (
                                                 SELECT
                                                 D.CLASSESSETTINGID,
@@ -5902,9 +5886,10 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                                                 )	STAFF ON GDD.CLASSESSETTINGID = STAFF.CLASSESSETTINGID
                                              WHERE sp.ValueFlag = 1
                                                AND sp.AccountID = :in_AccountID ";
-
+                
                 List<OracleParameter> paraList = new List<OracleParameter>();
                 paraList.Add(new OracleParameter(":in_AccountID", OracleDbType.Int32, userInfo.AccountID, ParameterDirection.Input));
+
                 // 成型报损ID
                 if (!string.IsNullOrWhiteSpace(cre.Properties["ScrapProductID"] + ""))
                 {
@@ -5983,15 +5968,46 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                     sqlString += " AND sp.GroutingDate <= :in_GroutingDateEnd";
                     paraList.Add(new OracleParameter(":in_GroutingDateEnd", OracleDbType.Date, Convert.ToDateTime(cre.Properties["GroutingDateEnd"]), ParameterDirection.Input));
                 }
-                sqlString += @" ) GROUP BY GROUPING SETS ( (BARCODE,ScrapProductID,
+                sqlString += @" ) 
+																							 select  * from (SELECT GROUPING_ID (STAFFNAME,Goodscode) GID,
+                                                CASE when Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=0 THEN '小计'
+                                                     WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=2 THEN '合计'
+		                                                 WHEN Groutinglinecode is null  AND GROUPING_ID (STAFFNAME,Goodscode)=3 THEN '总计'
+		                                                 ELSE '' END AS com,Groutinglinecode,ScrapProductID,
+		                                                 BARCODE,ResponUserCode,ResponUserName,STAFFNAME,
+		                                                 SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
+                                                GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
+                                                GroutingDate,GroutingLineID,Groutinglinename,GMouldTypeID,
+                                                Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
+                                                ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
+                                                AuditStatusName,createuser,ResponUserID,
+                                                BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
+                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp
+                                            FROM( TB
+                                            ) GROUP BY GROUPING SETS ( (BARCODE,ScrapProductID,
                                                 GoodsID,Goodscode,Goodsname,GroutingDailyID,Groutingdailydetailid,
                                                 GroutingDate,GroutingLineID,Groutinglinecode,Groutinglinename,GMouldTypeID,
                                                 Groutingmouldcode,Mouldcode,Groutinguserid,Groutingusercode,Groutingnum,Scraptype,
                                                 ScrapTypeName,ResponType,ScrapDate,ScrapRreasonID,ScrapReason,UName,UCode,
                                                 AuditStatusName,createuser,ResponUserName,ResponUserCode,ResponUserID,
                                                 BackOutFlag,BackOutTime,BackOutUserID,BackOutUserCode,BackOutUserName,
-                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp,STAFFNAME),(Goodscode,Goodsname,Groutingusercode,STAFFNAME),(GOODSCODE,GOODSNAME),() )
-                                                ORDER BY DECODE(GROUPING_ID (Groutingusercode,Goodscode), 3, 1),GOODSCODE,BARCODE,STAFFNAME ";
+                                                Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp,STAFFNAME),(Goodscode,Goodsname,Groutingusercode,STAFFNAME),(GOODSCODE,GOODSNAME),() )																								
+                                                ORDER BY DECODE(GROUPING_ID (Groutingusercode,Goodscode), 3, 1),GOODSCODE,BARCODE,STAFFNAME)
+																								union all 
+																							SELECT
+                                                null,
+                                               DECODE(substr(Groutinglinecode,2,1) , '-','高压', substr(Groutinglinecode,2,1))||'车间合计',null, null,
+		                                                 null,null,null,null,
+		                                                 SUM(CASE WHEN BARCODE IS NOT NULL THEN 1 ELSE 0 END) AS NUMS,
+                                                null,null,null,null,null,
+                                                null,null,null,null,
+                                                null,null,null,null,null,null,
+                                                null,null,null,null,null,null,null,
+                                                null,null,null,
+                                                null,null,null,null,null,
+                                                null,null,null,null,null,null
+																								
+																								from TB GROUP BY substr(Groutinglinecode,2,1)";
                 DataSet dsReturn = con.GetSqlResultToDs(sqlString, paraList.ToArray());
 
                 // 是否查责任员工