新每窑 日期的时间变更

wwwroot/mes/rpt/rpt014/rpt.ashx

@@ -671,8 +671,10 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
 
                 //xuwei add 2023-12-29 ====================================
                 //=========================================================
-                sqlStr = sqlStr.Replace("@DATEBEGIN@", "DATE'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + "'");
-                sqlStr = sqlStr.Replace("@DATEEND@", "DATE'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + "'");
+                //sqlStr = sqlStr.Replace("@DATEBEGIN@", "DATE'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + "'");
+                //sqlStr = sqlStr.Replace("@DATEEND@", "DATE'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + "'");
+                sqlStr = sqlStr.Replace("@DATEBEGIN@", "to_date('" + Convert.ToDateTime(context.Request["datebeginMaster"])  + "','yyyy-mm-dd hh24:mi:ss')");
+                sqlStr = sqlStr.Replace("@DATEEND@", "to_date('" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@KILNID@", context.Request["kilnidMaster"].ToString() != "" ? context.Request["kilnidMaster"].ToString() : " NULL ");
                 sqlStr = sqlStr.Replace("@PROCEDUREID@", context.Request["procedureidMaster"].ToString() != "" ? context.Request["procedureidMaster"].ToString() : " NULL ");
                 sqlStr = sqlStr.Replace("@GOODSCODE@", " '' ");

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -111,9 +111,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 buding = "IN(" + "'1#','2#'" + ")";
             }
-           
+
             #endregion
-			 #region 可选缺陷  删除 插入
+            #region 可选缺陷  删除 插入
             //d可选缺陷  删除 插入
             string[] denames = new string[] { };
             if (context.Request["defectMaster[]"] is object)
@@ -429,7 +429,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				ORDER BY TA.GOODSTYPENAME,TA.GOODSCODE
                 ".Replace("{DEFECT}", defectStr).Replace("{BUILDINGNO}", buding).Replace("{goodsCodes}", goodssql);
                 }
-                 
+
                 else
                 {
                     //读取报表数据
@@ -725,8 +725,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 //xuwei add 2023-12-29 ====================================
                 //=========================================================
-                sqlStr = sqlStr.Replace("@DATEBEGIN@", "DATE'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + "'");
-                sqlStr = sqlStr.Replace("@DATEEND@", "DATE'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + "'");
+                //sqlStr = sqlStr.Replace("@DATEBEGIN@", "DATE'" + Convert.ToDateTime(context.Request["datebeginMaster"])  + "'");
+                //sqlStr = sqlStr.Replace("@DATEEND@", "DATE'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1) + "'");
+				sqlStr = sqlStr.Replace("@DATEBEGIN@", "to_date('" + Convert.ToDateTime(context.Request["datebeginMaster"])  + "','yyyy-mm-dd hh24:mi:ss')");
+                sqlStr = sqlStr.Replace("@DATEEND@", "to_date('" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@KILNID@", context.Request["kilnidMaster"].ToString() != "" ? context.Request["kilnidMaster"].ToString() : " NULL ");
                 sqlStr = sqlStr.Replace("@PROCEDUREID@", context.Request["procedureidMaster"].ToString() != "" ? context.Request["procedureidMaster"].ToString() : " NULL ");
                 sqlStr = sqlStr.Replace("@GOODSCODE@", " '' ");