验厂服务器报表修正

wwwroot/mes/rpt/rpt001/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,10 +16,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -75,6 +76,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (@GOODSCODE@ IS NULL OR INSTR(GDD.GOODSCODE, @GOODSCODE@) > 0)
 							AND (@GOODSTYPECODE@ IS NULL OR INSTR(GT.GOODSTYPECODE, @GOODSTYPECODE@) = 1)
 							AND (@DATEBEGIN@ IS NULL OR GDD.GROUTINGDATE BETWEEN to_date(@DATEBEGIN@,'yyyy-mm-dd') AND to_date(@DATEEND@,'yyyy-mm-dd'))
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where GDD.GROUTINGDATE >= thc.DAY_YMD_START and GDD.GROUTINGDATE < thc.DAY_YMD_END )  " : " ") + @"  
 						GROUP BY
 							GT.GOODSTYPECODE,
 							GT.GOODSTYPENAME,
@@ -137,14 +139,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -175,6 +177,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						AND (@GOODSCODE@ IS NULL OR INSTR(GDD.GOODSCODE, @GOODSCODE@) > 0)
 						AND (@GOODSTYPECODE@ IS NULL OR INSTR(GT.GOODSTYPECODE, @GOODSTYPECODE@) = 1)
 						AND (@DATEBEGIN@ IS NULL OR GDD.GROUTINGDATE BETWEEN @DATEBEGIN@ AND @DATEEND@)
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where GDD.GROUTINGDATE >= thc.DAY_YMD_START and GDD.GROUTINGDATE < thc.DAY_YMD_END )  " : " ") + @"  
 					ORDER BY
 						GDD.BARCODE
                 ";
@@ -187,8 +190,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeDetail"]));
                 sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeDetail"]));
                 sqlPara.Add(new CDAParameter("GOODSTYPECODE", context.Request["goodstypecodeDetail"]));
-                sqlPara.Add(new CDAParameter("DATEBEGIN",Convert.ToDateTime(context.Request["datebeginDetail"])));
-                sqlPara.Add(new CDAParameter("DATEEND",Convert.ToDateTime(context.Request["dateendDetail"])));
+                sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginDetail"])));
+                sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendDetail"])));
 
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
@@ -198,12 +201,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
-            if (context.Request["m"].ToString()=="jiezhauang")
+            if (context.Request["m"].ToString() == "jiezhauang")
             {
                 //读取报表数据
                 string sqlStr = @"SELECT 
@@ -233,8 +236,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
                 sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeMaster"]));
                 sqlPara.Add(new CDAParameter("GOODSTYPECODE", context.Request["goodstypecodeMaster"]));
-                sqlPara.Add(new CDAParameter("BEGINMONTH",  context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
-                sqlPara.Add(new CDAParameter("ENDMONTH",  context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("BEGINMONTH", context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
 
                 //if(context.Request["USERID"] is object)
                 //{
@@ -250,13 +253,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
-            if (context.Request["m"].ToString()=="jiezhuan")
+            if (context.Request["m"].ToString() == "jiezhuan")
             {
                 //读取报表数据
                 string sqlStr = @"SELECT BARCODE AS 产品条码 , 
@@ -277,8 +280,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 // sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeDetail"]));
                 //sqlPara.Add(new CDAParameter("GOODSCODE", context.Request["goodscodeDetail"]));
-                sqlPara.Add(new CDAParameter("BEGINMONTH",  context.Request["datebeginDetail"].Substring(0, context.Request["datebeginDetail"].IndexOf("-")) + context.Request["datebeginDetail"].Substring(context.Request["datebeginDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
-                sqlPara.Add(new CDAParameter("ENDMONTH",  context.Request["dateendDetail"].Substring(0, context.Request["dateendDetail"].IndexOf("-")) + context.Request["dateendDetail"].Substring(context.Request["dateendDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("BEGINMONTH", context.Request["datebeginDetail"].Substring(0, context.Request["datebeginDetail"].IndexOf("-")) + context.Request["datebeginDetail"].Substring(context.Request["datebeginDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendDetail"].Substring(0, context.Request["dateendDetail"].IndexOf("-")) + context.Request["dateendDetail"].Substring(context.Request["dateendDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
 
                 //if(context.Request["USERID"] is object)
                 //{
@@ -294,8 +297,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }

wwwroot/mes/rpt/rpt002/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;
 
@@ -19,6 +18,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using(IDataAccess conn = DataAccess.Create())
         {
+				// 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             //主表
             if(context.Request["m"].ToString()=="master")
             {
@@ -84,6 +85,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (@GOODSCODE@ IS NULL OR INSTR(GDD.GOODSCODE, @GOODSCODE@) > 0)
 							AND (@GOODSTYPECODE@ IS NULL OR INSTR(GT.GOODSTYPECODE, @GOODSTYPECODE@) = 1)
 							AND (@DATEBEGIN@ IS NULL OR GDD.GROUTINGDATE BETWEEN to_date(@DATEBEGIN@,'yyyy-mm-dd') AND to_date(@DATEEND@,'yyyy-mm-dd'))
+						 " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where GDD.GROUTINGDATE >= thc.DAY_YMD_START and GDD.GROUTINGDATE < thc.DAY_YMD_END )  " : " ") + @"  
 						GROUP BY
 							GT.GOODSTYPECODE,
 							GDD.GOODSID,
@@ -192,6 +194,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						AND (@GOODSCODE@ IS NULL OR INSTR(GDD.GOODSCODE, @GOODSCODE@) > 0)
 						AND (@GOODSTYPECODE@ IS NULL OR INSTR(GT.GOODSTYPECODE, @GOODSTYPECODE@) = 1)
 						AND (@DATEBEGIN@ IS NULL OR GDD.GROUTINGDATE BETWEEN @DATEBEGIN@ AND @DATEEND@)
+						 " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where GDD.GROUTINGDATE >= thc.DAY_YMD_START and GDD.GROUTINGDATE < thc.DAY_YMD_END )  " : " ") + @"  
 					ORDER BY
 						GDD.BARCODE
                 ";

wwwroot/mes/rpt/rpt003/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,13 +16,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //取日期参数
-                DateTime day = string.IsNullOrEmpty(context.Request["day"]) ?  System.DateTime.Today : Convert.ToDateTime(context.Request["day"].ToString());
+                DateTime day = string.IsNullOrEmpty(context.Request["day"]) ? System.DateTime.Today : Convert.ToDateTime(context.Request["day"].ToString());
 
                 DateTime day1 = Convert.ToDateTime(day).AddDays(-3);
                 DateTime day2 = Convert.ToDateTime(day).AddDays(-2);
@@ -64,6 +65,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						                    AND T.VALUEFLAG = '1' 
 						                    AND TRUNC( T.PRINTTIME ) >= @DAY1@ 
                                             AND TRUNC( T.PRINTTIME ) <= @DAY3@ 
+						 " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where T.PRINTTIME >= thc.DAY_YMD_START and T.PRINTTIME < thc.DAY_YMD_END )  " : " ") + @" 
 				                    ) P 
 			                    GROUP BY
 				                    P.GOODSID,
@@ -113,7 +115,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -131,14 +133,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
             //子表
-            if(context.Request["m"].ToString()=="jiezhauang")
+            if (context.Request["m"].ToString() == "jiezhauang")
             {
                 string q1 = context.Request["day"].ToString();
                 string q2 = q1;
@@ -147,8 +149,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 {
                     day = Convert.ToInt32(q1);
                 }
-                else { 
-                    day = Convert.ToInt32(q2.Replace("-", "0")); 
+                else
+                {
+                    day = Convert.ToInt32(q2.Replace("-", "0"));
                 }
                 //读取报表数据
                 string sqlStr = @"
@@ -177,8 +180,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }

wwwroot/mes/rpt/rpt005/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;
 
@@ -19,7 +18,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using(IDataAccess conn = DataAccess.Create())
         {
-            //主表
+             // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
+                //主表
             if(context.Request["m"].ToString()=="master")
             {
                 string sqlStr = @"
@@ -111,7 +112,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 "    on dd.dictionaryid = g.GLAZETYPEID\n" +
                 " where pd.valueflag = '1'\n" +
                 (context.Request["flag"] is object ? "   and ((pd.modeltype <> 5) or (pd.modeltype = 5 and pd.SpecialRepairFlag = '0')) \n" : "") +
-                "   and pd.accountid = @ACCOUNTID@\n";
+                "   and pd.accountid = @ACCOUNTID@\n  " + 
+                 ("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 )  " : " ");
 
                 StringBuilder sql = new StringBuilder(sqlStr);
 

wwwroot/mes/rpt/rpt006/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;
 
@@ -19,10 +18,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -58,6 +59,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							WHERE
 								C.ACCOUNTDATE >= @DATEBEGIN@ 
 								AND C.ACCOUNTDATE < @DATEEND@ 
+						 " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where C.ACCOUNTDATE  >= thc.DAY_YMD_START and C.ACCOUNTDATE  < thc.DAY_YMD_END )  " : " ") + @" 
 								AND INSTR(ORG.ORGANIZATIONCODE, @ORGCODE@)=1 
 							) T 
 						GROUP BY
@@ -77,6 +79,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							PD.VALUEFLAG = '1' 
 							AND 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 )  " : " ") + @"
 						GROUP BY
 							CD.USERID,
 							CD.STAFFID 
@@ -97,7 +100,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								T.GOODSLEVELTYPEID,
 								T.BARCODE 
 							FROM
-								( SELECT BARCODE, GOODSLEVELTYPEID FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 13 AND VALUEFLAG = '1' AND CHECKBATCHNO = 1 AND CHECKTIME >= @DATEBEGIN@ AND CHECKTIME < @DATEEND@  ) T
+								( 
+								SELECT BARCODE, GOODSLEVELTYPEID FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 13 AND VALUEFLAG = '1' AND CHECKBATCHNO = 1 AND CHECKTIME >= @DATEBEGIN@ AND CHECKTIME < @DATEEND@  
+						 " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where CHECKTIME  >= thc.DAY_YMD_START and CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @"
+								) T
 								INNER JOIN TP_PM_PRODUCTIONDATA PD ON T.BARCODE = PD.BARCODE
 								INNER JOIN TP_PC_CLASSESDETAIL CD ON CD.CLASSESSETTINGID = PD.CLASSESSETTINGID 
 								INNER JOIN TP_MST_USER U ON U.USERID = CD.USERID
@@ -141,14 +147,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -175,6 +181,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							WHERE 
 								S.ACCOUNTDATE >= @DATEBEGIN@
 								AND S.ACCOUNTDATE < @DATEEND@
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where S.ACCOUNTDATE  >= thc.DAY_YMD_START and S.ACCOUNTDATE  < thc.DAY_YMD_END )  " : " ") + @"
 								AND S.USERID = @USERID@
 								AND CD.STAFFID = @STAFFID@
 						) CQ
@@ -199,6 +206,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							PD.VALUEFLAG = '1'
 							AND 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 )  " : " ") + @"
                                 --2021/7/29 dongyan 添加查询数据 
 								AND (CD.USERID = @USERID@  OR @USERID@ IS NULL)
 								AND (CD.STAFFID = @STAFFID@ OR @STAFFID@ IS NULL)
@@ -233,8 +241,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
@@ -263,8 +271,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					GROUP BY 
 					GROUPING SETS((USERCODE,ORGANIZATIONNAME,STAFFCODE,STAFFNAME,USERID,STAFFID))";
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
-                sqlPara.Add(new CDAParameter("BEGINMONTH",  context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
-                sqlPara.Add(new CDAParameter("ENDMONTH",  context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("BEGINMONTH", context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
                 // sqlPara.Add(new CDAParameter("ORGCODE", context.Request["organizationcodeMaster"]));
 
                 //获取分页参数
@@ -275,13 +283,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
-            if(context.Request["m"].ToString() == "jiezhuan")
+            if (context.Request["m"].ToString() == "jiezhuan")
             {
                 //读取报表数据
                 string sqlStr = @"SELECT 
@@ -308,8 +316,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							USERCODE,
 							STAFFCODE";
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
-                sqlPara.Add(new CDAParameter("BEGINMONTH",  context.Request["datebeginDetail"].Substring(0, context.Request["datebeginDetail"].IndexOf("-")) + context.Request["datebeginDetail"].Substring(context.Request["datebeginDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
-                sqlPara.Add(new CDAParameter("ENDMONTH",  context.Request["dateendDetail"].Substring(0, context.Request["dateendDetail"].IndexOf("-")) + context.Request["dateendDetail"].Substring(context.Request["dateendDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("BEGINMONTH", context.Request["datebeginDetail"].Substring(0, context.Request["datebeginDetail"].IndexOf("-")) + context.Request["datebeginDetail"].Substring(context.Request["datebeginDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendDetail"].Substring(0, context.Request["dateendDetail"].IndexOf("-")) + context.Request["dateendDetail"].Substring(context.Request["dateendDetail"].IndexOf("-") + 1).PadLeft(2, '0')));
                 //sqlPara.Add(new CDAParameter("STAFFID", context.Request["staffidDetail"]));
                 //sqlPara.Add(new CDAParameter("USERID", context.Request["useridDetail"]));
                 //获取分页参数
@@ -320,8 +328,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
 

wwwroot/mes/rpt/rpt007/rpt.ashx

@@ -7,12 +7,14 @@ using System.Collections.Generic;
 using System.Data;
 using System.Web;
 using System.Web.SessionState;
-using System.Collections;
+using System.Configuration;
 
 public class rpt : IHttpHandler, IReadOnlySessionState
 {
     public void ProcessRequest(HttpContext context)
     {
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
@@ -40,7 +42,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@" + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE NOT LIKE ('%" + goodsCodes[0] + "%') ";
@@ -59,7 +61,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@" + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE  LIKE '%" + goodsCodes[0] + "%' ";
@@ -122,7 +124,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				                                                PD.PROCEDUREID = @PROCEDUREID@
 				                                                AND PD.KILNID = @KILNID@
 				                                                AND KD.LOADINGTIME >= @DATEBEGIN@ 
-				                                                AND KD.LOADINGTIME <= @DATEEND@";
+				                                                AND KD.LOADINGTIME <= @DATEEND@" 
+                                                            + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where KD.LOADINGTIME  >= thc.DAY_YMD_START and KD.LOADINGTIME  < thc.DAY_YMD_END )  " : " ");
                     if (goodsParam != "" && goodsParam != null)
                     {
                         sqlSt += "   AND PD.GOODSCODE IN (" + goodsParam + ")";
@@ -139,7 +142,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                                                ) T
 		                                                     ) PIVOT (
                                                              SUM( PCOUNT ) FOR 产品编码 IN ( {GOODSCODE} )  
-	                                                ) ORDER BY  装窑时间 ASC ".Replace("{GOODSCODE}", goodsStr.Replace(" ","").Replace("\n","").Replace("\r",""));
+	                                                ) ORDER BY  装窑时间 ASC ".Replace("{GOODSCODE}", goodsStr.Replace(" ", "").Replace("\n", "").Replace("\r", ""));
                     //获取查询条件
                     List<CDAParameter> sqlPara = new List<CDAParameter>();
                     sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureId"]));
@@ -180,8 +183,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     DataView dv = dt.DefaultView;
                     dt.Columns.Remove(dt.Columns["PCODE"]);
                     dt = dv.ToTable();
-                   string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
-                    string jsonStrs = jsonStr.Replace("\r" ,"").Replace("\n" ,"").Replace("\t" ,"");
+                    string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
+                    string jsonStrs = jsonStr.Replace("\r", "").Replace("\n", "").Replace("\t", "");
                     context.Response.Write(jsonStr);
                 }
                 else
@@ -209,7 +212,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@" + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE NOT LIKE ('%" + goodsCodes[0] + "%') ";
@@ -228,7 +231,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@" + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE  LIKE '%" + goodsCodes[0] + "%' ";
@@ -291,7 +294,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				                                                PD.PROCEDUREID = 8
 				                                                AND PD.KILNID = @KILNID@
 				                                                AND KD.INTOKILNTIME >= @DATEBEGIN@ 
-				                                                AND KD.INTOKILNTIME <= @DATEEND@";
+				                                                AND KD.INTOKILNTIME <= @DATEEND@" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where KD.INTOKILNTIME  >= thc.DAY_YMD_START and KD.INTOKILNTIME  < thc.DAY_YMD_END )  " : " ");
                     if (goodsParam != "" && goodsParam != null)
                     {
                         sqlSt += "   AND PD.GOODSCODE IN (" + goodsParam + ")";
@@ -307,7 +310,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                 ( ) )
 		                                                ) T
 	                                    ) PIVOT (
-                                    SUM( PCOUNT ) FOR 产品编码 IN ( {GOODSCODE} ) )ORDER BY  入窑时间 ASC ".Replace("{GOODSCODE}", goodsStr.Replace(" ","").Replace("\n","").Replace("\r",""));
+                                    SUM( PCOUNT ) FOR 产品编码 IN ( {GOODSCODE} ) )ORDER BY  入窑时间 ASC ".Replace("{GOODSCODE}", goodsStr.Replace(" ", "").Replace("\n", "").Replace("\r", ""));
                     //获取查询条件
                     List<CDAParameter> sqlPara = new List<CDAParameter>();
                     sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
@@ -345,7 +348,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                     dt = dv.ToTable();
                     string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
-                    string jsonStrs = jsonStr.Replace("\r" ,"").Replace("\n" ,"").Replace("\t" ,"");
+                    string jsonStrs = jsonStr.Replace("\r", "").Replace("\n", "").Replace("\t", "");
                     context.Response.Write(jsonStrs);
                 }
                 else
@@ -371,7 +374,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@"  + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE NOT LIKE ('%" + goodsCodes[0] + "%') ";
@@ -390,7 +393,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                        WHERE
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@";
+			                        AND P.CREATETIME <= @DATEEND@" + ("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 )  " : " ");
                     if (goodsCodes.Length > 1 || goodsCodes[0] != "")
                     {
                         sql += @" AND P.GOODSCODE  LIKE '%" + goodsCodes[0] + "%' ";
@@ -439,7 +442,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			                        P.PROCEDUREID = @PROCEDUREID@
 			                        AND KILNID = @KILNID@ 
 			                        AND P.CREATETIME >= @DATEBEGIN@  
-			                        AND P.CREATETIME <= @DATEEND@  ";
+			                        AND P.CREATETIME <= @DATEEND@  " + ("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 )  " : " ");
                     if (goodsParam != "" && goodsParam != null)
                     {
                         sqlSt += "   AND P.GOODSCODE IN (" + goodsParam + ")";
@@ -460,7 +463,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                         ORDER BY
 
                             PCODE
-                    ".Replace("{GOODSCODE}", goodsStr.Replace(" ","").Replace("\n","").Replace("\r",""));
+                    ".Replace("{GOODSCODE}", goodsStr.Replace(" ", "").Replace("\n", "").Replace("\r", ""));
                     //获取查询条件
                     List<CDAParameter> sqlPara = new List<CDAParameter>();
                     //sqlPara.Add(new CDAParameter("ACCOUNTID", context.Session["accountId"].ToString()));
@@ -500,7 +503,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     dt.Columns.Remove(dt.Columns["PCODE"]);
                     dt = dv.ToTable();
                     string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
-                    string jsonStrs = jsonStr.Replace("\r" ,"").Replace("\n" ,"").Replace("\t" ,"");
+                    string jsonStrs = jsonStr.Replace("\r", "").Replace("\n", "").Replace("\t", "");
                     context.Response.Write(jsonStrs);
                 }
                 else

wwwroot/mes/rpt/rpt009/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,10 +16,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -163,6 +164,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			                    AND P.PROCEDUREID IN ( 13, 35 ) AND P.CHECKBATCHNO = 1
 								AND P.CREATETIME >= @DATEBEGIN@ 
 								AND P.CREATETIME <= @DATEEND@
+" + ("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 )  " : " ") + @" 
                             GROUP BY
 			                    P.CREATETIME,
 			                    P.GROUTINGLINEID,
@@ -185,6 +187,7 @@ union all
 		                    WHERE P.PROCEDUREID IN ( 13, 35 ) AND P.CHECKFLAG = 1
 								AND P.CREATETIME >= @DATEBEGIN@ 
 								AND P.CREATETIME <= @DATEEND@  
+" + ("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 )  " : " ") + @" 
 		                    ) T
 		                    LEFT JOIN TP_PC_GROUTINGLINE L ON T.GROUTINGLINEID = L.GROUTINGLINEID
 		                    LEFT JOIN TP_PM_PRODUCTIONDATA P2 ON T.MAXPRODUCTIONDATAID > 0 AND ( P2.PRODUCTIONDATAID = T.MAXPRODUCTIONDATAID AND P2.PROCEDUREID IN ( 22, 23, 37, 20 ) ) 
@@ -236,7 +239,7 @@ union all
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -254,14 +257,14 @@ union all
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
             //子表
-            if(context.Request["m"].ToString()=="jiezhauang")
+            if (context.Request["m"].ToString() == "jiezhauang")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -331,7 +334,7 @@ decode(BUILDINGNO,null,'合计', CDATE) AS 日期 ,
                 //int total = 0;
                 //DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
                 //string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
-				DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
                 string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
                 context.Response.Write(jsonStr);
             }

wwwroot/mes/rpt/rpt010/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,8 +16,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -34,7 +35,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         WHERE VALUEFLAG=1";
 
 
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -65,10 +66,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             //        goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
             //    }
             //}
-            #endregion 
+            #endregion
 
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //取缺陷拼接串
                 DataTable col = conn.ExecuteDatatable(@"
@@ -105,7 +106,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string defectStr = "";
                 for (int i = 0; i < col.Rows.Count; i++)
                 {
-                    if(defectStr.IndexOf("'"+col.Rows[i]["DEFECT"].ToString()+"'") < 0)
+                    if (defectStr.IndexOf("'" + col.Rows[i]["DEFECT"].ToString() + "'") < 0)
                     {
                         if (i > 0) defectStr += ",";
                         defectStr += "'" + col.Rows[i]["DEFECT"].ToString() + "'";
@@ -154,7 +155,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND P.PROCEDUREID = 13 AND P.CHECKBATCHNO = 1
 									AND P.GOODSLEVELTYPEID <> 4
 									AND P.CHECKTIME >= @DATEBEGIN@ 
-									AND P.CHECKTIME <= @DATEEND@
+									AND P.CHECKTIME <= @DATEEND@ 
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 									AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
 									AND (P.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                                     AND P.GOODSCODE IN({goodsCodes})
@@ -187,6 +189,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND P.PROCEDUREID = 13 AND P.CHECKBATCHNO = 1
 							AND P.CHECKTIME >= @DATEBEGIN@ 
 							AND P.CHECKTIME <= @DATEEND@
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 							AND (L.BUILDINGNO = @BUILDINGNO@ OR @BUILDINGNO@ IS NULL)
 							AND (P.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                             AND P.GOODSCODE IN({goodsCodes})
@@ -194,10 +197,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							GROUPING SETS ( ( TRUNC( P.CHECKTIME )), ( ) ) 
 						) KNUM ON DEFECT.缺陷日期 = KNUM.日期 
 					ORDER BY
-						KNUM.日期
-                ".Replace("{DEFECT}", defectStr)
-                 .Replace("{goodsCodes}", goodssql)
-                 ;
+						KNUM.日期 ";
+sqlStr = sqlStr.Replace("{DEFECT}", defectStr).Replace("{goodsCodes}", goodssql);
 
 
                 //获取查询条件
@@ -231,16 +232,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 
                 //处理列特殊字符
-                for(int c=0;c<dt.Columns.Count;c++)
+                for (int c = 0; c < dt.Columns.Count; c++)
                 {
                     //移除缺陷日期列
                     if (dt.Columns[c].ColumnName == "缺陷日期") dt.Columns.Remove(dt.Columns[c]);
-                    dt.Columns[c].ColumnName = dt.Columns[c].ColumnName.Replace("'", "").Replace("+","").Replace('/',' ');
+                    dt.Columns[c].ColumnName = dt.Columns[c].ColumnName.Replace("'", "").Replace("+", "").Replace('/', ' ');
                 }
                 //处理列空值
-                for(int i = 0; i < dt.Rows.Count; i++)
+                for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    for(int j = 0;j<dt.Columns.Count;j++)
+                    for (int j = 0; j < dt.Columns.Count; j++)
                     {
                         if (dt.Rows[i][j].ToString() == "") dt.Rows[i][j] = 0;
                     }
@@ -252,7 +253,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -270,13 +271,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
 
-            if(context.Request["m"].ToString()=="jiezhauang")
+            if (context.Request["m"].ToString() == "jiezhauang")
             {
                 //读取报表数据
                 string sqlStr = @"

wwwroot/mes/rpt/rpt011/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,8 +16,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -38,7 +39,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         WHERE VALUEFLAG=1";
 
 
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -69,24 +70,24 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             //        goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
             //    }
             //}
-            #endregion 
+            #endregion
 
             //主表
-            if(context.Request["m"].ToString()=="master")
+            if (context.Request["m"].ToString() == "master")
             {
                 //默认是 一期 + 二期
                 string procedureId = "25,26,2,3";
                 string procedureId1 = "25,2";
                 string procedureId2 = "26,3";
 
-                if(context.Request["buildingnoMaster"].ToString()=="1#")
+                if (context.Request["buildingnoMaster"].ToString() == "1#")
                 {
                     //一期 成型交坯25 精坯入库26
                     procedureId = "25,26";
                     procedureId1 = "25";
                     procedureId2 = "26";
                 }
-                if(context.Request["buildingnoMaster"].ToString()=="2#")
+                if (context.Request["buildingnoMaster"].ToString() == "2#")
                 {
                     //二期 成型交坏2 精坯入库3
                     procedureId = "2,3";
@@ -132,6 +133,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								OR 
 								(P.VALUEFLAG = '0' AND P.BACKOUTTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') AND P.BACKOUTTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss') ) 
 							)
+                            " + ("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 ) or ( P.BACKOUTTIME >= thc.DAY_YMD_START and  P.BACKOUTTIME  < thc.DAY_YMD_END ) )  " : " ") + @" 
 							AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"'  IS NULL) 
 							AND P.PROCEDUREID IN ( " + procedureId + @" ) -- 一期还是二期
 							   AND P.GOODSCODE IN(" + goodssql + @")
@@ -168,7 +170,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						) 
 					ORDER BY
 						T.MONITORCODE
-                " 
+                "
                 ;
 
                 //获取查询条件
@@ -208,7 +210,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -226,8 +228,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
@@ -262,7 +264,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //	                            GROUPING SETS (( MONITORNAME, USERCODE, GOODSNAME, GROUTING, GROUTINGLINENO,MONITORCODE,GOODSCODE ),( MONITORCODE ),()))
                 //                                    ORDER BY MONITORCODE" ;
 
-                string sqlStr =@"SELECT
+                string sqlStr = @"SELECT
 	                                组别 ,成型工号 ,物料名称,成型,成型线号,接收数量,实收数量,返修数量 
                                 FROM
 	                                (
@@ -291,7 +293,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                                GROUPING SETS ( ( MONITORCODE, MONITORNAME, USERCODE, GROUTING, GOODSCODE, GOODSNAME, GROUTINGLINENO ), ( MONITORCODE ), ( ) ) 
 	                                ORDER BY
 	                                MONITORCODE 
-	                                ) " ;
+	                                ) ";
 
 
                 //获取分页参数

wwwroot/mes/rpt/rpt012/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;
 
@@ -19,6 +18,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+				 // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -152,6 +153,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND P.GOODSLEVELTYPEID <> 4 
 									AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
 									AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 									AND P.ISREFIRE = '0' 
 									AND (L.BUILDINGNO =  '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
 									AND (D.DEFECTPROCEDUREID = " + procedureid + @" OR " + procedureid + @" IS NULL)
@@ -211,6 +213,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND P.PROCEDUREID = 13 AND P.CHECKBATCHNO = 1
 								AND P.CHECKTIME >=to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
 								AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 								AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
 								AND ( " + procedureid + @" IS NULL OR PB.PROCEDUREID = " + procedureid + @" )
 								AND P.ISREFIRE = '0' 

wwwroot/mes/rpt/rpt013/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;
 
@@ -19,6 +18,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -30,8 +31,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             string usercode = context.Request["usercodeMaster"] + "";
             string buildingno = context.Request["buildingnoMaster"] + "";
             int procedureid = Convert.ToInt32(context.Request["procedureidMaster"]);
-            DateTime  datebegin =    Convert.ToDateTime(context.Request["datebeginMaster"]);
-            DateTime  dateend  =    Convert.ToDateTime(context.Request["dateendMaster"]);
+            DateTime datebegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
             //string goodssql = @"SELECT  GOODSCODE   FROM TP_MST_GOODS WHERE 1=1";
             /*
             string goodssql = "";
@@ -66,7 +67,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }*/
 
             string goodssql = "";
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -108,7 +109,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
                 }
             }*/
-            #endregion 
+            #endregion
             //主表
             if (context.Request["m"].ToString() == "master")
             {
@@ -236,6 +237,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									AND P.GOODSLEVELTYPEID <> 4
 									AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss') 
 									AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')  
+                                    " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 									AND P.ISREFIRE = " + isRefire + @" 
 									AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
 									AND (D.DEFECTPROCEDUREID = " + procedureid + @"  OR " + procedureid + @" IS NULL) " +
@@ -293,11 +295,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								LEFT JOIN TP_MST_GOODS GS ON GS.GOODSID = P.GOODSID
 							WHERE
 								P.VALUEFLAG = '1'
-								AND P.PROCEDUREID = " + checkProcedureId + @"
-
+								AND P.PROCEDUREID = " + checkProcedureId + @"                                
 								AND P.CHECKBATCHNO = 1
 								AND P.CHECKTIME >= to_date('" + datebegin + @"', 'yyyy-MM-DD hh24:mi:ss')  
 								AND P.CHECKTIME <= to_date('" + dateend + @"', 'yyyy-mm-dd hh24:mi:ss')  
+                                " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
 								AND (L.BUILDINGNO = '" + buildingno + @"' OR '" + buildingno + @"' IS NULL)
 								AND ( " + procedureid + @" IS NULL OR PB.PROCEDUREID = " + procedureid + @" )
 								--AND P.ISREFIRE = '0'

wwwroot/mes/rpt/rpt015/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;
 
@@ -19,6 +18,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -34,7 +35,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         WHERE VALUEFLAG=1";
 
 
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -65,14 +66,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             //        goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
             //    }
             //}
-            #endregion 
+            #endregion
             //主表
             if (context.Request["m"].ToString() == "master")
             {
                 //读取报表数据
 
 
-                string sqlStr =@"SELECT DECODE(GROUPING_ID(MU.USERCODE, U.USERCODE, P.GOODSCODE)
+                string sqlStr = @"SELECT DECODE(GROUPING_ID(MU.USERCODE, U.USERCODE, P.GOODSCODE)
                                  ,7
                                  ,'合计'
                                  ,MU.USERCODE) AS 组号
@@ -98,6 +99,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                        AND P.GOODSLEVELTYPEID <> 4
                        AND P.CHECKTIME >= @DATEBEGIN@
                        AND P.CHECKTIME <= @DATEEND@
+                        " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.CHECKTIME  >= thc.DAY_YMD_START and P.CHECKTIME  < thc.DAY_YMD_END )  " : " ") + @" 
                        AND P.ISREFIRE = '0'
                        AND L.BUILDINGNO = @BUILDINGNO@
                        AND p.GOODSCODE IN({goodsCodes})
@@ -170,7 +172,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 context.Response.Write(jsonStr);
             }
-            if(context.Request["m"].ToString() == "jiezhauang")
+            if (context.Request["m"].ToString() == "jiezhauang")
             {
                 //读取报表数据
                 string sqlStr = @"

wwwroot/mes/rpt/rpt026/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,9 +16,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
-        using(IDataAccess conn = DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
-
+            // 验厂标识 true:  false：
+            string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + ""; 
             #region 产品编码
             List<CDAParameter> goodsnull = new List<CDAParameter>();
             string[] goodsCodes = new string[] { };
@@ -34,7 +34,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         WHERE 1=1";
 
 
-            if (goodsCodes.Length > 1 || goodsCodes[0]!="")
+            if (goodsCodes.Length > 1 || goodsCodes[0] != "")
             {
 
                 if (context.Request["isNotcheck"].ToString() == "1")
@@ -56,7 +56,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
             }
 
-            #endregion 
+            #endregion
             //主表
             if (context.Request["m"].ToString() == "master")
             {
@@ -336,7 +336,8 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
          INNER JOIN TP_PC_GROUTINGLINE GL
             ON GL.GROUTINGLINEID = T.GROUTINGLINEID
          WHERE T.CREATETIME >= @DATEBEGIN@
-           AND T.CREATETIME < @DATEEND@
+           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
@@ -428,6 +429,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
@@ -478,6 +480,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.GOODSCODE IN({goodsCodes})
@@ -522,6 +525,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.GOODSCODE IN({goodsCodes})
@@ -583,6 +587,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
@@ -667,6 +672,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.GOODSCODE IN({goodsCodes})
          GROUP BY G.goodscode
         UNION ALL
@@ -748,6 +754,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.GOODSCODE IN({goodsCodes})
          GROUP BY G.goodscode
         UNION ALL
@@ -832,13 +839,14 @@ 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 gdd.CREATETIME >= @DATEBEGIN@
            AND gdd.CREATETIME < @DATEEND@
           AND  G.GOODSCODE IN({goodsCodes})
          GROUP BY G.goodscode) TT
  GROUP BY GROUPING SETS((TT.GOODS_CODE),())
 ) last 
-left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY 产品编码".Replace("{goodsCodes}", goodssql);
+left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY 产品编码";
                     #endregion
                 }
                 else if (flag == "二期")
@@ -1117,6 +1125,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                  WHERE P.CREATETIME >= @DATEBEGIN@
                    AND P.CREATETIME < @DATEEND@
+            " + ("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 )  " : " ") + @"   
                    AND (
                         P.PROCEDUREID = 3                       
                         OR P.PROCEDUREID = 34
@@ -1151,6 +1160,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                         ON P.GOODSID = G.GOODSID 
                      WHERE P.CREATETIME >= @DATEBEGIN@
                        AND P.CREATETIME < @DATEEND@
+            " + ("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 )  " : " ") + @" 
                        AND (
                             P.PROCEDUREID = 21 
                             OR P.procedureid = 53
@@ -1250,6 +1260,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                  WHERE P.BACKOUTTIME >= @DATEBEGIN@
                    AND P.BACKOUTTIME < @DATEEND@
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
                    AND (
                         P.PROCEDUREID = 3                       
                         OR P.PROCEDUREID = 34
@@ -1268,6 +1279,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                     WHERE P.BACKOUTTIME >= @DATEBEGIN@
                     AND P.BACKOUTTIME < @DATEEND@
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
                     AND (
                          P.PROCEDUREID = 24
                         OR P.PROCEDUREID = 28                        
@@ -1286,6 +1298,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                         ON P.GOODSID = G.GOODSID 
                      WHERE P.BACKOUTTIME >= @DATEBEGIN@
                        AND P.BACKOUTTIME < @DATEEND@
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @" 
                        AND (
                             P.PROCEDUREID = 21 
                             OR P.procedureid = 53
@@ -1339,6 +1352,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.GOODSCODE IN({goodsCodes})
@@ -1383,6 +1397,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.GOODSCODE IN({goodsCodes})
@@ -1444,6 +1459,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
@@ -1488,6 +1504,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.VALUEFLAG = '1'
            AND T.PROCEDUREID = 53 
           AND  G.GOODSCODE IN({goodsCodes})
@@ -1571,6 +1588,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.GOODSCODE IN({goodsCodes})
          GROUP BY G.GOODSCODE
         UNION ALL
@@ -1652,6 +1670,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.GOODSCODE IN({goodsCodes})
          GROUP BY G.GOODSCODE
         UNION ALL
@@ -1740,6 +1759,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.GOODSCODE IN({goodsCodes})
          GROUP BY G.GOODSCODE
 
@@ -1778,8 +1798,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码
       OR  装窑期末_二期!=0
       OR  装窑期末_一期!=0
 
-ORDER BY 产品编码
-".Replace("{goodsCodes}", goodssql);
+ORDER BY 产品编码 ";
                     #endregion
                 }
                 else
@@ -1911,6 +1930,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                  WHERE P.CREATETIME >= @DATEBEGIN@
                    AND P.CREATETIME < @DATEEND@
+            " + ("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 )  " : " ") + @"  
                    AND (
                         P.PROCEDUREID = 3
                         OR P.PROCEDUREID = 26                       
@@ -1928,6 +1948,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                     WHERE P.CREATETIME >= @DATEBEGIN@
                     AND P.CREATETIME < @DATEEND@
+            " + ("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 )  " : " ") + @"  
                     AND (
                          P.PROCEDUREID = 24
                         OR P.PROCEDUREID = 28                        
@@ -1945,6 +1966,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                         ON P.GOODSID = G.GOODSID 
                      WHERE P.CREATETIME >= @DATEBEGIN@
                        AND P.CREATETIME < @DATEEND@
+" + ("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 )  " : " ") + @"  
                        AND (
                             P.PROCEDUREID = 21
                             OR P.PROCEDUREID = 31 
@@ -1995,6 +2017,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                  WHERE P.BACKOUTTIME >= @DATEBEGIN@
                    AND P.BACKOUTTIME < @DATEEND@
+            " + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @"  
                    AND (
                         P.PROCEDUREID = 3
                         OR P.PROCEDUREID = 26                       
@@ -2013,6 +2036,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     ON P.GOODSID = G.GOODSID 
                     WHERE P.BACKOUTTIME >= @DATEBEGIN@
                     AND P.BACKOUTTIME < @DATEEND@
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @"  
                     AND (
                          P.PROCEDUREID = 24
                         OR P.PROCEDUREID = 28                        
@@ -2031,6 +2055,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                         ON P.GOODSID = G.GOODSID 
                      WHERE P.BACKOUTTIME >= @DATEBEGIN@
                        AND P.BACKOUTTIME < @DATEEND@
+" + ("true".Equals(strFactoryInspectionFlag) ? " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where P.BACKOUTTIME >= thc.DAY_YMD_START and P.BACKOUTTIME < thc.DAY_YMD_END )  " : " ") + @"  
                        AND (
                             P.PROCEDUREID = 21
                             OR P.PROCEDUREID = 31 
@@ -2063,6 +2088,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
@@ -2087,6 +2113,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
             ON T.GOODSID = G.GOODSID 
          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.VALUEFLAG = '1'
            AND T.PROCEDUREID = 53 
           AND  G.GOODSCODE IN({goodsCodes})
@@ -2111,8 +2138,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码
     OR 精坯期末 <> 0
     OR 釉坯期末 <> 0
     OR 装窑期末 <> 0
-ORDER BY 产品编码
-".Replace("{goodsCodes}", goodssql);
+ORDER BY 产品编码   ";
                     #endregion
                 }
                 //获取查询条件
@@ -2120,12 +2146,12 @@ ORDER BY 产品编码
                 sqlPara.Add(new CDAParameter("DATEBEGIN", Convert.ToDateTime(context.Request["datebeginMaster"]), DataType.DateTime));
                 sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
                 sqlPara.Add(new CDAParameter("GOODSMODEL", context.Request["goodsmodelMaster"]));
-
+                sqlStr = sqlStr.Replace("{goodsCodes}", goodssql);
                 DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
 
                 //清除0数据行 第0列是 产品型号 之后全是数据
                 int row = 0;
-                while(row < dt.Rows.Count)
+                while (row < dt.Rows.Count)
                 {
                     bool rowZero = true;
                     //第0列是产品型号 从第1列开始全是数据
@@ -2154,7 +2180,7 @@ ORDER BY 产品编码
             }
 
             //子表
-            if(context.Request["m"].ToString()=="detail")
+            if (context.Request["m"].ToString() == "detail")
             {
                 //读取报表数据
                 string sqlStr = @"
@@ -2172,8 +2198,8 @@ ORDER BY 产品编码
 
                 //获取分页数据    
                 int total = 0;
-                DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-                string jsonStr =  new JsonResult(dt) { total = total}.ToJson();
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
                 context.Response.Write(jsonStr);
             }
@@ -2181,10 +2207,10 @@ ORDER BY 产品编码
             //2021-8-3 陈强  新增结转功能 选择结转checkbox 查询结转数据
             //将财务生产过渡表一期数据插入到 JZ_RPT026_1 并通过条件查询结转数据
             //2021-8-3 陈强 添加全条件查询
-            if (context.Request["m"].ToString()=="jiezhuan")
+            if (context.Request["m"].ToString() == "jiezhuan")
             {
                 String sqlStr1 = String.Empty;
-                if ( context.Request["workshopcodeMaster"].ToString() == "一期")
+                if (context.Request["workshopcodeMaster"].ToString() == "一期")
                 {
                     sqlStr1 = @"SELECT
 	                            DECODE( GOODS_CODE, NULL, '合计', GOODS_CODE ) AS 产品型号,
@@ -2317,7 +2343,7 @@ ORDER BY 产品编码
 
                 //清除0数据行 第0列是 产品型号 之后全是数据
                 int row = 0;
-                while(row < dt.Rows.Count)
+                while (row < dt.Rows.Count)
                 {
                     bool rowZero = true;
                     //第0列是产品型号 从第1列开始全是数据