验厂服务器的报表

wwwroot/mes/rpt/rpt023/rpt.ashx

@@ -3,12 +3,9 @@
 using System;
 using System.Web;
 using System.Web.SessionState;
-using System.Data;
-using System.Text;
-using System.Collections;
+using System.Data; 
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Configuration;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
 
@@ -17,7 +14,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
+        using (IDataAccess conn = DataAccess.Create())
         {
             //主表
             if (context.Request["m"].ToString() == "master")
@@ -140,6 +139,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEEND@, 'mm')
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @"  
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -221,6 +221,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEBEGIN@, 'mm')
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -309,6 +310,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                     T.PROCEDUREID = 26
                     OR T.PROCEDUREID = 38
@@ -404,6 +406,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                     T.PROCEDUREID = 26
                     OR T.PROCEDUREID = 38
@@ -458,6 +461,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.PROCEDUREID = 7
            AND T.KILNID IN (1, 2) AND GL.BUILDINGNO = '2#' AND tt.PROCEDUREID=21
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
@@ -507,6 +511,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.PROCEDUREID = 7
            AND T.KILNID IN (1, 2) AND GL.BUILDINGNO = '2#' AND tt.PROCEDUREID=21
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
@@ -573,6 +578,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CHECKTIME >= @DATEBEGIN@
            AND T.CHECKTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CHECKTIME >= thc.DAY_YMD_START and T.CHECKTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.VALUEFLAG = '1'
            AND T.PROCEDUREID = 13
            AND T.CHECKBATCHNO =1
@@ -662,6 +668,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
            AND T.GOODSLEVELTYPEID IN (8, 9)
            AND T.AUDITDATE >= @DATEBEGIN@
            AND T.AUDITDATE < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.AUDITDATE >= thc.DAY_YMD_START and T.AUDITDATE < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -748,6 +755,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
            AND T.GOODSLEVELTYPEID = 8
            AND T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -837,6 +845,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
          WHERE T.DATATYPE IN (11, 12)
            AND T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -964,6 +973,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEEND@, 'mm')
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1045,6 +1055,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEBEGIN@, 'mm')
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1133,6 +1144,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                  T.PROCEDUREID = 3
                 OR T.PROCEDUREID = 39
@@ -1228,6 +1240,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                  T.PROCEDUREID = 3
                 OR T.PROCEDUREID = 39
@@ -1282,6 +1295,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.PROCEDUREID = 7
            AND T.KILNID IN (1, 2) AND GL.BUILDINGNO = '2#' AND tt.PROCEDUREID=21
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
@@ -1331,6 +1345,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.PROCEDUREID = 7
            AND T.KILNID IN (1, 2) AND GL.BUILDINGNO = '2#' AND tt.PROCEDUREID=21
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
@@ -1397,6 +1412,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CHECKTIME >= @DATEBEGIN@
            AND T.CHECKTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CHECKTIME >= thc.DAY_YMD_START and T.CHECKTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.VALUEFLAG = '1'
            AND T.PROCEDUREID = 13
            AND T.CHECKBATCHNO = 1
@@ -1486,6 +1502,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
            AND T.GOODSLEVELTYPEID IN (8, 9)
            AND T.AUDITDATE >= @DATEBEGIN@
            AND T.AUDITDATE < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.AUDITDATE >= thc.DAY_YMD_START and T.AUDITDATE < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1572,6 +1589,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
            AND T.GOODSLEVELTYPEID = 8
            AND T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1663,6 +1681,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
          WHERE T.DATATYPE IN (11, 12)
            AND T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1730,6 +1749,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEEND@, 'mm')
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1771,6 +1791,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          INNER JOIN TP_MST_GOODS G
             ON T.GOODSID = G.GOODSID
          WHERE t.backupmonth = trunc(@DATEBEGIN@, 'mm')
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
            AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
            --研发产品
            AND NOT EXISTS (SELECT 1
@@ -1813,6 +1834,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          --   ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
            AND T.CREATETIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                 T.PROCEDUREID = 3
                 OR T.PROCEDUREID = 26
@@ -1863,6 +1885,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          --   ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.BACKOUTTIME >= @DATEBEGIN@
            AND T.BACKOUTTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.BACKOUTTIME >= thc.DAY_YMD_START and T.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND (
                 T.PROCEDUREID = 3
                 OR T.PROCEDUREID = 26
@@ -1898,6 +1921,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
          --   ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CHECKTIME >= @DATEBEGIN@
            AND T.CHECKTIME < @DATEEND@
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CHECKTIME >= thc.DAY_YMD_START and T.CHECKTIME < thc.DAY_YMD_END )  " : " ") + @" 
            AND T.VALUEFLAG = '1'
            AND T.PROCEDUREID = 13
            AND T.CHECKBATCHNO = 1
@@ -1933,7 +1957,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
 
                 //清除0数据行 第0列是 产品型号 之后全是数据
                 int row = 0;
-                while(row < dt.Rows.Count)
+                while (row < dt.Rows.Count)
                 {
                     bool rowZero = true;
                     //第0列是产品型号 从第1列开始全是数据
@@ -1961,7 +1985,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -1979,8 +2003,8 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = dt.Rows.Count}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
@@ -2037,7 +2061,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
                     ) last 
                     left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMODEL";
                 }
-                if  (flag == "二期")
+                if (flag == "二期")
                 {
                     sqlStr = @"select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL 产品型号, last.* from (
                        SELECT DECODE(GOODSCODE,NULL,'合计',GOODSCODE) AS 产品编码

wwwroot/mes/rpt/rpt033/rpt.ashx

@@ -3,9 +3,7 @@
 using System;
 using System.Web;
 using System.Web.SessionState;
-using System.Data;
-using System.Text;
-using System.Collections;
+using System.Data; 
 using System.Collections.Generic;
 using System.Configuration;
 using Curtain.DataAccess;

wwwroot/mes/rpt/rpt034/rpt.ashx

@@ -162,7 +162,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						AND P1.姓名 = P2.姓名s 
 						AND P1.产品 = P2.产品s
 						AND P1.日期 = P2.日期s
-                ".Replace("{PROCEDUREID}", procedureId);
+                ";sqlStr=sqlStr.Replace("{PROCEDUREID}", procedureId);
 
 
                 //获取查询条件

wwwroot/mes/rpt/rpt035/rpt.ashx

@@ -142,13 +142,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                    ) QX ON CY.产品 = QX.cp 
 	                    AND ( CY.工号 = QX.gh OR CY.工号 IS NULL ) 
                     ORDER BY
-	                    CY.产品
-                "
-            .Replace("{PROCEDUREID}", procedureId)
-            .Replace("{CHECKPROCEDUREID}", checkProcedureId)
-            .Replace("{CHECKUSERCODE}", checkUserCode)
-            .Replace("{GROUPNAME}", groupName)
-            .Replace("{DEFECTSTR}", defectStr);
+	                    CY.产品 ";
+                sqlStr = sqlStr.Replace("{PROCEDUREID}", procedureId)
+                 .Replace("{CHECKPROCEDUREID}", checkProcedureId)
+                 .Replace("{CHECKUSERCODE}", checkUserCode)
+                 .Replace("{GROUPNAME}", groupName)
+                 .Replace("{DEFECTSTR}", defectStr);
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt036/rpt.ashx

@@ -79,6 +79,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                  INNER JOIN TP_MST_GOODS G
                                     ON T.GOODSID = G.GOODSID
                                  WHERE t.backupmonth = trunc(@DATEEND@, 'mm')
+     " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @" 
                                    AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
                                    GROUP BY G.GOODSCODE
                                 UNION ALL
@@ -117,6 +118,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                  INNER JOIN TP_MST_GOODS G
                                     ON T.GOODSID = G.GOODSID
                                  WHERE t.backupmonth = trunc(@DATEBEGIN@, 'mm')
+    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.backupmonth >= thc.DAY_YMD_START and T.backupmonth < thc.DAY_YMD_END )  " : " ") + @"
                                    AND (G.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
                                  GROUP BY G.GOODSCODE
                                 UNION ALL
@@ -241,7 +243,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                     ON T.GOODSID = G.GOODSID
                                  WHERE T.CHECKTIME >= @DATEBEGIN@
                                    AND T.CHECKTIME < @DATEEND@
-     " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @"  
+     " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CHECKTIME >= thc.DAY_YMD_START and T.CHECKTIME < thc.DAY_YMD_END )  " : " ") + @"  
                                    AND T.VALUEFLAG = '1'
                                    AND T.PROCEDUREID = 13
                                    AND T.CHECKBATCHNO = 1

wwwroot/mes/rpt/rpt037/rpt.ashx

@@ -6,6 +6,7 @@ using System.Web.SessionState;
 using System.Data;
 using System.Collections.Generic;
 using Curtain.DataAccess;
+using System.Configuration;
 using DK.XuWei.WebMes;
 
 public class rpt : IHttpHandler, IReadOnlySessionState
@@ -13,6 +14,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         using (IDataAccess conn = DataAccess.Create())
         {
             //读取报表数据
@@ -65,23 +68,27 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 AND pmax.checkflag IS NOT NULL
                                 AND pmax.procedureid = tp.procedureid
                                 WHERE tp.checkflag <> 1                           
-                                AND to_char(pmax.createtime, 'yyyy-mm-dd') <  to_char(tp.createtime, 'yyyy-mm-dd')" ;
-                    //获取查询条件       
-                    if ((!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEBEGIN"]))&&(!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEEND"])))
-                    {
-                        //改判时间
-                        sqlStr += "AND tp.CREATETIME >= @TAMPERCREATETIMEBEGI@ AND tp.CREATETIME < @TAMPERCREATETIMEEN@ "; 
-                    }           
-                    
-                    if (!string.IsNullOrEmpty(context.Request["TAMPERUSERCODE"]))
-                    {
-                        sqlStr += "AND (tp.USERCODE LIKE @TAMPERUSERCODE@ OR @TAMPERUSERCODE@ IS NULL)"; 
-                    }
-                    if (!string.IsNullOrEmpty(context.Request["goodscodeMaster"]))
-                    {
-                        sqlStr += "AND (tp.GOODSNAME LIKE @goodscodeMaster@ OR @goodscodeMaster@ IS NULL)"; 
-                    }                    
-						 sqlStr += @"	 GROUP BY pmax.groutingdailydetailid ) PD3 
+                                AND to_char(pmax.createtime, 'yyyy-mm-dd') <  to_char(tp.createtime, 'yyyy-mm-dd')  
+
+                  " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where tp.CREATETIME >= thc.DAY_YMD_START and tp.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
+
+                    ";
+            //获取查询条件       
+            if ((!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEBEGIN"])) && (!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEEND"])))
+            {
+                //改判时间
+                sqlStr += "AND tp.CREATETIME >= @TAMPERCREATETIMEBEGI@ AND tp.CREATETIME < @TAMPERCREATETIMEEN@ ";
+            }
+
+            if (!string.IsNullOrEmpty(context.Request["TAMPERUSERCODE"]))
+            {
+                sqlStr += "AND (tp.USERCODE LIKE @TAMPERUSERCODE@ OR @TAMPERUSERCODE@ IS NULL)";
+            }
+            if (!string.IsNullOrEmpty(context.Request["goodscodeMaster"]))
+            {
+                sqlStr += "AND (tp.GOODSNAME LIKE @goodscodeMaster@ OR @goodscodeMaster@ IS NULL)";
+            }
+            sqlStr += @"	 GROUP BY pmax.groutingdailydetailid ) PD3 
 						 INNER JOIN TP_PM_PRODUCTIONDATA PD4 ON PD4.groutingdailydetailid=PD3.groutingdailydetailid AND PD3.CREATETIME=PD4.CREATETIME AND   pd4.checkflag IS NOT NULL
 	                    ) PD2 ON PD.groutingdailydetailid = PD2.groutingdailydetailid
 	                    LEFT JOIN TP_SYS_GOODSLEVELTYPE TSGL2 ON PD2.GOODSLEVELTYPEID = TSGL2.GOODSLEVELTYPEID
@@ -90,7 +97,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     WHERE  PD.CHECKFLAG <> 1  and not exists ( select 1 from tp_pm_productiondata rpd where  rpd.groutingdailydetailid = pd.groutingdailydetailid
    AND rpd.procedureid IN (20, 22, 23, 37, 35) AND rpd.productiondataid < pd.productiondataid
    AND pd2.productiondataid < rpd.productiondataid AND rpd.valueflag = '1' AND rpd.createtime < pd.createtime
-   AND pd2.createtime < rpd.createtime) AND to_char( PD2.CREATETIME, 'yyyy-mm-dd' ) < to_char( PD.CREATETIME, 'yyyy-mm-dd' )   ";
+   AND pd2.createtime < rpd.createtime) AND to_char( PD2.CREATETIME, 'yyyy-mm-dd' ) < to_char( PD.CREATETIME, 'yyyy-mm-dd' )  
+
+                  " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where PD2.CREATETIME >= thc.DAY_YMD_START and PD2.CREATETIME < thc.DAY_YMD_END )  " : " ") + @"
+                    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where PD.CREATETIME >= thc.DAY_YMD_START and PD.CREATETIME < thc.DAY_YMD_END )  " : " ") + @"
+
+        ";
 
             #endregion
             //获取查询条件
@@ -102,39 +114,39 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("CHECKCREATETIMEBEGIN", Convert.ToDateTime(context.Request["CHECKCREATETIMEBEGIN"]), DataType.DateTime));
                 sqlPara.Add(new CDAParameter("CHECKCREATETIMEEND", Convert.ToDateTime(context.Request["CHECKCREATETIMEEND"]), DataType.DateTime));
             }
-            if ((!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEBEGIN"]))&&(!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEEND"])))
+            if ((!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEBEGIN"])) && (!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEEND"])))
             {
                 //改判时间
                 sqlStr += "AND PD.CREATETIME >= @TAMPERCREATETIMEBEGI@ AND PD.CREATETIME < @TAMPERCREATETIMEEN@ ";
-                sqlPara.Add(new CDAParameter("TAMPERCREATETIMEBEGI", Convert.ToDateTime(context.Request["TAMPERCREATETIMEBEGIN"]),DataType.DateTime));
-                sqlPara.Add(new CDAParameter("TAMPERCREATETIMEEN", Convert.ToDateTime(context.Request["TAMPERCREATETIMEEND"]),DataType.DateTime));
+                sqlPara.Add(new CDAParameter("TAMPERCREATETIMEBEGI", Convert.ToDateTime(context.Request["TAMPERCREATETIMEBEGIN"]), DataType.DateTime));
+                sqlPara.Add(new CDAParameter("TAMPERCREATETIMEEN", Convert.ToDateTime(context.Request["TAMPERCREATETIMEEND"]), DataType.DateTime));
             }
             if (!string.IsNullOrEmpty(context.Request["workshopcodeMaster"]))
             {
                 sqlStr += " AND GRO.BUILDINGNO in (@workshopcodeMaster@)";
-                sqlPara.Add(new CDAParameter("workshopcodeMaster",context.Request["workshopcodeMaster"]));
+                sqlPara.Add(new CDAParameter("workshopcodeMaster", context.Request["workshopcodeMaster"]));
             }
             if (!string.IsNullOrEmpty(context.Request["CHECKUSERCODE"]))
             {
                 sqlStr += "AND (PD2.USERCODE LIKE @CHECKUSERCODE@ OR @CHECKUSERCODE@ IS NULL)";
-                sqlPara.Add(new CDAParameter("CHECKUSERCODE",context.Request["CHECKUSERCODE"]));
+                sqlPara.Add(new CDAParameter("CHECKUSERCODE", context.Request["CHECKUSERCODE"]));
             }
             if (!string.IsNullOrEmpty(context.Request["TAMPERUSERCODE"]))
             {
                 sqlStr += "AND (PD.USERCODE LIKE @TAMPERUSERCODE@ OR @TAMPERUSERCODE@ IS NULL)";
-                sqlPara.Add(new CDAParameter("TAMPERUSERCODE",context.Request["TAMPERUSERCODE"]));
+                sqlPara.Add(new CDAParameter("TAMPERUSERCODE", context.Request["TAMPERUSERCODE"]));
             }
             if (!string.IsNullOrEmpty(context.Request["goodscodeMaster"]))
             {
                 sqlStr += "AND (PD.GOODSNAME LIKE @goodscodeMaster@ OR @goodscodeMaster@ IS NULL)";
-                sqlPara.Add(new CDAParameter("goodscodeMaster",context.Request["goodscodeMaster"]));
+                sqlPara.Add(new CDAParameter("goodscodeMaster", context.Request["goodscodeMaster"]));
             }
 
             int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
             int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 100000000;
             int total = 0;
             DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-            string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+            string jsonStr = new JsonResult(dt) { total = total }.ToJson();
             context.Response.Write(jsonStr);
         }
     }

wwwroot/mes/rpt/rpt038/rpt.ashx

@@ -7,8 +7,7 @@ using System.Data;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Configuration;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
 
@@ -17,6 +16,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+            // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         using(IDataAccess conn = DataAccess.Create())
         {
             //主表
@@ -55,6 +56,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                    WHERE 
 	                     PD.CREATETIME>= @DATEBEGIN@
                        AND PD.CREATETIME<=@DATEEND@
+     " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where PD.CREATETIME >= thc.DAY_YMD_START and PD.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
 	                     AND PD.PROCEDUREID = 34 
                     ) T
 	                    LEFT JOIN TP_PM_PRODUCTIONDATA PD ON PD.BARCODE = T.BARCODE
@@ -188,6 +190,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                        WHERE
 												PD.CREATETIME >=@DATEBEGIN@
 												AND PD.CREATETIME <=@DATEEND@	
+     " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where PD.CREATETIME >= thc.DAY_YMD_START and PD.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
 		                                        AND PD.PROCEDUREID = 34 
 	                                        ) T
 	                                        LEFT JOIN TP_PM_PRODUCTIONDATA PD ON PD.BARCODE = T.BARCODE

wwwroot/mes/rpt/rpt039/rpt.ashx

@@ -5,17 +5,21 @@ using System.Web.SessionState;
 using System.Data;
 using System.Collections.Generic;
 using Curtain.DataAccess;
+using System.Configuration;
 using DK.XuWei.WebMes;
-public class rpt : IHttpHandler, IReadOnlySessionState{
+public class rpt : IHttpHandler, IReadOnlySessionState
+{
 
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         using (IDataAccess conn = DataAccess.Create())
         {
             if (context.Request["m"].ToString() == "master")
             {
-							string sqlStr = @"SELECT
+                string sqlStr = @"SELECT
 									grouping_id(T.GOODSNAME) gid ,
 									DECODE(T.BARCODE,null,'-', T.BARCODE),
 									DECODE(T.BARCODE,NULL,'小计：'||T.GOODSNAME, T. GOODSNAME) 产品名称,
@@ -112,7 +116,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState{
 										INNER JOIN TP_PM_PRODUCTIONDATA FP ON GWS.BARCODE = FP.BARCODE
 										INNER JOIN TP_PC_PROCEDURE TP ON TP.PROCEDUREID = FP.PROCEDUREID
 										WHERE  tp.PROCEDUREID =35  --重烧质量登记ID
-										) )T WHERE  1=1 ";
+										) )T WHERE  1=1  
+					" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.CREATETIME >= thc.DAY_YMD_START and T.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
+
+				";
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 if ((!string.IsNullOrEmpty(context.Request["CHECKCREATETIMEBEGIN"])) && (!string.IsNullOrEmpty(context.Request["CHECKCREATETIMEEND"])))
                 {
@@ -125,7 +132,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState{
                     sqlStr += " AND T.allcheck in (@workshopcodeMaster@)";
                     sqlPara.Add(new CDAParameter("workshopcodeMaster", Convert.ToString(context.Request["workshopcodeMaster"]), DataType.NVarChar));
                 }
-                sqlStr +=  @" GROUP BY  grouping sets((t.GOODSNAME,T. GOODSCODE,
+                sqlStr += @" GROUP BY  grouping sets((t.GOODSNAME,T. GOODSCODE,
 								T. GOODSSPECIFICATION,
 								T. GOODSMODEL,
 								T. GOODSTYPENAME,
@@ -149,8 +156,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState{
             }
         }
     }
-    public bool IsReusable {
-        get {
+    public bool IsReusable
+    {
+        get
+        {
             return false;
         }
     }

wwwroot/mes/rpt/rpt040/rpt.ashx

@@ -5,12 +5,15 @@ using System.Web.SessionState;
 using System.Data;
 using System.Collections.Generic;
 using Curtain.DataAccess;
+using System.Configuration;
 using DK.XuWei.WebMes;
 public class rpt : IHttpHandler, IReadOnlySessionState{
 
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+			// 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         using (IDataAccess conn = DataAccess.Create())
         {
             if (context.Request["m"].ToString() == "master")
@@ -123,7 +126,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState{
 												AND TMG.VALUEFLAG = 1
 												AND TPGD.VALUEFLAG = 1
 												AND FP.GOODSLEVELID IN ( 4, 5 ) --35重烧质量登记ID  4,5正品副品
-												) P WHERE P.CHECKBATCHNO = 1"; 
+												) P WHERE P.CHECKBATCHNO = 1 
+							" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CREATETIME >= thc.DAY_YMD_START and P.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
+
+				"; 
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
 				//日期
                 if ((!string.IsNullOrEmpty(context.Request["CHECKCREATETIMEBEGIN"])) && (!string.IsNullOrEmpty(context.Request["CHECKCREATETIMEEND"])))

wwwroot/mes/rpt/rpt041/rpt.ashx

@@ -7,8 +7,7 @@ using System.Data;
 using System.Collections.Generic;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
-using System.Linq;
-using System.Linq.Expressions;
+using System.Configuration;
 
 
 public class rpt : IHttpHandler, IReadOnlySessionState
@@ -16,6 +15,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         using (IDataAccess conn = DataAccess.Create())
         {
             //获取查询条件
@@ -63,7 +64,11 @@ CASE
 			LEFT JOIN tp_pm_groutingdailydetail g ON g.groutingdailydetailid = pfirst.groutingdailydetailid
 			LEFT JOIN tp_mst_datadictionary d ON g.glazetypeid = d.dictionaryid 
 		WHERE
-			sec.valueflag = 1 AND pd.VALUEFLAG=1";
+			sec.valueflag = 1 AND pd.VALUEFLAG = 1 
+         " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where pfirst.CREATETIME >= thc.DAY_YMD_START and pfirst.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
+        " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where sec.CREATETIME >= thc.DAY_YMD_START and sec.CREATETIME < thc.DAY_YMD_END )  " : " ") + @" 
+
+            ";
             if (context.Request["firstdatebeginMaster"].ToString() != "")
             {
                 sqlStr += " and pfirst.CREATETIME>=@firstdatebeginMaster@";
@@ -115,8 +120,8 @@ CASE
             //首检质量
             if (!string.IsNullOrWhiteSpace(context.Request["pfirstgoodleve[]"]) && context.Request["pfirstgoodleve[]"].ToString() != "")
             {
-                string[] items = context.Request["pfirstgoodleve[]"].Split(','); 
-                sqlStr += " AND pfirst.goodsleveltypeid IN ("; 
+                string[] items = context.Request["pfirstgoodleve[]"].Split(',');
+                sqlStr += " AND pfirst.goodsleveltypeid IN (";
                 for (int i = 0; i < items.Length; i++)
                 {
                     sqlStr += items[i];

wwwroot/mes/rpt/rpt042/rpt.ashx

@@ -7,8 +7,7 @@ using System.Data;
 using System.Collections.Generic;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
-using System.Linq;
-using System.Linq.Expressions;
+using System.Configuration;
 
 
 public class rpt : IHttpHandler, IReadOnlySessionState
@@ -16,9 +15,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
+        if ("true".Equals(strFactoryInspectionFlag))
+        {
+            string jsonStr = new JsonResult(new DataTable()) { total = 0 }.ToJson();
+            context.Response.Write(jsonStr);
+        }
         using (IDataAccess conn = DataAccess.Create())
         {
-            int accountId =   1;
+            int accountId = 1;
 
             if (context.Request["m"].ToString() == "master" && context.Request["BARCODE"] != "")
             {