|
|
@@ -5810,7 +5810,24 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
|
|
|
ServiceResultEntity result = new ServiceResultEntity();
|
|
|
con.Open();
|
|
|
|
|
|
- string sqlString = @" with TB as (SELECT sp.BarCode
|
|
|
+ string sqlString = @" SELECT
|
|
|
+ GROUPING_ID (STAFFNAME,Goodscode,车间) GID,
|
|
|
+ CASE when Groutinglinecode is null AND GROUPING_ID (STAFFNAME,Goodscode,车间)=1 THEN '小计'
|
|
|
+ WHEN Groutinglinecode is null AND GROUPING_ID (STAFFNAME,Goodscode,车间)=5 THEN '合计'
|
|
|
+ WHEN Groutinglinecode is null AND GROUPING_ID (STAFFNAME,Goodscode,车间)=6 THEN TO_CHAR(车间)
|
|
|
+ WHEN Groutinglinecode is null AND GROUPING_ID (STAFFNAME,Goodscode,车间)=7 THEN '总计'
|
|
|
+ END AS 统计方式, TO_CHAR(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
|
|
|
,sp.ScrapProductID
|
|
|
,sp.GoodsID
|
|
|
,sp.Goodscode
|
|
|
@@ -5820,6 +5837,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
|
|
|
,sp.GroutingDate
|
|
|
,sp.GroutingLineID
|
|
|
,sp.Groutinglinecode
|
|
|
+ ,CASE WHEN gl.HIGHPRESSUREFLAG=1 THEN '高压车间'
|
|
|
+ ELSE TO_CHAR(SUBSTR(gl.GROUTINGLINECODE, 2, 1)||'车间')END 车间
|
|
|
,sp.Groutinglinename
|
|
|
,sp.GMouldTypeID
|
|
|
,sp.Groutingmouldcode
|
|
|
@@ -5862,19 +5881,14 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
|
|
|
,sp.OPTimeStamp
|
|
|
,STAFF.STAFFNAME
|
|
|
FROM TP_PM_GroutingScrapProduct sp
|
|
|
- INNER JOIN TP_SYS_AuditStatus status
|
|
|
- ON sp.AuditStatus = status.AuditStatusID
|
|
|
- LEFT JOIN TP_MST_USER userInfo
|
|
|
- ON sp.Auditor = userInfo.UserId
|
|
|
- LEFT JOIN TP_MST_USER createuser
|
|
|
- ON sp.createuserid = createuser.UserId
|
|
|
- LEFT JOIN TP_MST_USER responUser
|
|
|
- ON sp.ResponUserID = responUser.UserId
|
|
|
- LEFT JOIN TP_MST_ScrapReason msr
|
|
|
- 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_SYS_AuditStatus status ON sp.AuditStatus = status.AuditStatusID
|
|
|
+ LEFT JOIN TP_MST_USER userInfo ON sp.Auditor = userInfo.UserId
|
|
|
+ LEFT JOIN TP_MST_USER createuser ON sp.createuserid = createuser.UserId
|
|
|
+ LEFT JOIN TP_MST_USER responUser ON sp.ResponUserID = responUser.UserId
|
|
|
+ LEFT JOIN TP_MST_ScrapReason msr 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
|
|
|
+ LEFT JOIN TP_PC_GROUTINGLINE gl ON gl.GROUTINGLINECODE=gdd.GROUTINGLINECODE
|
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
|
D.CLASSESSETTINGID,
|
|
|
@@ -5968,46 +5982,15 @@ 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 += @" )
|
|
|
- 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,
|
|
|
+ sqlString += @" ) 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)
|
|
|
- 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)";
|
|
|
+ Remarks,AuditStatus,AuditDate,Auditopinion,Accountdate,OPTimeStamp,STAFFNAME),(Goodscode,Goodsname,Groutingusercode,STAFFNAME),(GOODSCODE,GOODSNAME),(车间),() )
|
|
|
+ ORDER BY DECODE(GROUPING_ID (STAFFNAME,Goodscode,车间), 7, 1),GOODSCODE,BARCODE,STAFFNAME,车间";
|
|
|
DataSet dsReturn = con.GetSqlResultToDs(sqlString, paraList.ToArray());
|
|
|
|
|
|
// 是否查责任员工
|
张忠帅