|
@@ -4586,10 +4586,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
if (se.RptSProcedureID == 58)
|
|
if (se.RptSProcedureID == 58)
|
|
|
{
|
|
{
|
|
|
selSql.Append(" and pd.procedureid IN(58) ");
|
|
selSql.Append(" and pd.procedureid IN(58) ");
|
|
|
|
|
+ // 首检标识和重烧标识都不对,这里先用窑炉ID限制一下
|
|
|
|
|
+ selSql.Append(" AND PD.KILNID IN(3,4,6) ");
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
selSql.Append(" and pd.procedureid IN(11,104) ");
|
|
selSql.Append(" and pd.procedureid IN(11,104) ");
|
|
|
|
|
+ // 首检标识和重烧标识都不对,这里先用窑炉ID限制一下
|
|
|
|
|
+ selSql.Append(" AND PD.KILNID IN(1,2,5) ");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -4677,7 +4681,20 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
//" and pd.AccountID = :in_AccountID\n" +
|
|
//" and pd.AccountID = :in_AccountID\n" +
|
|
|
//" and length(pd.kilncarbatchno) > 0\n";
|
|
//" and length(pd.kilncarbatchno) > 0\n";
|
|
|
selSql.Append(sqlString);
|
|
selSql.Append(sqlString);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (se.RptSProcedureID == 58)
|
|
|
|
|
+ {
|
|
|
|
|
+ selSql.Append(" and pd.procedureid IN(58) ");
|
|
|
|
|
+ // 首检标识和重烧标识都不对,这里先用窑炉ID限制一下
|
|
|
|
|
+ selSql.Append(" AND PD.KILNID IN(3,4,6) ");
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ selSql.Append(" and pd.procedureid IN(11,104) ");
|
|
|
|
|
+ // 首检标识和重烧标识都不对,这里先用窑炉ID限制一下
|
|
|
|
|
+ selSql.Append(" AND PD.KILNID IN(1,2,5) ");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 试验标识
|
|
// 试验标识
|
|
|
if (!string.IsNullOrEmpty(se.TestMouldFlag))
|
|
if (!string.IsNullOrEmpty(se.TestMouldFlag))
|
|
|
{
|
|
{
|