时间精确到时分秒

wwwroot/mes/rpt/rpt101/rpt.ashx

@@ -23,7 +23,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             if(context.Request["m"].ToString()=="master")
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 
                 //读取报表数据
                 string sqlStr = @"

wwwroot/mes/rpt/rpt101/rpt_index.html

@@ -21,13 +21,13 @@
                 <form id="ffMaster">
                     <div>
                         开始
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:false,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:false,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:false,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:false,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         工号
-                        <input class="easyui-combobox" id="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getUser&select=1',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
+                        <input class="easyui-combobox" id="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getUser&select=1',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
 
-                        <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#ffMaster').form('clear')">清空</a>
+                        <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
                 </form>
@@ -58,10 +58,10 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + (ctime.getDate()+1);
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
             //tbSearchSubmit();
 
@@ -69,7 +69,14 @@
                 this.value = this.value.toUpperCase();
             });
         });
-
+        // 清空恢复默认值
+        function toClear() {
+            var ctime = new Date();
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
+        }
         //加载子表数据
         function LoadDataGridDetail(index, row) {
             //if ($('#ffDetail').form("validate")) {
@@ -112,15 +119,15 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成型月度结算表).xls',
-                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成型月度结算表)'
+                fileName: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(成型月度结算表).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(成型月度结算表)'
             });
 
             //导出多sheet
             //$.dataGridToExcel(
             //    ['DataGridMaster', 'DataGridDetail'],
             //    ['page1', 'page2'],
-            //    "  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'（产量产值报表).xls"
+            //    "  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'（产量产值报表).xls"
             //);
         }
 

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -30,7 +30,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             if(context.Request["m"].ToString()=="master")
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
                 string defect = "";
 
                 DataTable dt = conn.ExecuteDatatable(@"SELECT DISTINCT

wwwroot/mes/rpt/rpt201/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         车间:
                         <input class="easyui-combobox" id="linecodeMaster" name="linecodeMaster" data-options="required:false,valueField:'value',textField:'text',
                                data:[{'text': '成A', 'value': 'A'}, {'text': '成B', 'value': 'B'}, {'text': '成C', 'value': 'C'}, {'text': '高压', 'value': '高压'}]" style=" width: 120px; height: 32px; ">
@@ -33,7 +33,7 @@
                         成型段号:  <input class="easyui-combobox" id="linesection" name="linesection" data-options="required:false,valueField:'value',textField:'text',
                                data:[]" style=" width: 120px; height: 32px; " >
                         成型线号
-                        <input class="easyui-combobox" id="groutinglinecodeMaster" name="groutinglinecodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'',method:'get',valueField:'GROUTINGLINECODE',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
+                        <input class="easyui-combobox" id="groutinglinecodeMaster" name="groutinglinecodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'',method:'get',valueField:'GROUTINGLINECODE',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -56,20 +56,20 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
             $('#groutinglinecodeMaster').combobox('reload', '../mes/rpt/rpt.ashx?m=getgroutingline&select=1&text=A1');
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
         $(function () {  //车间与线段 二级联动赋值 change事件
             $('#linecodeMaster').combobox({
@@ -163,7 +163,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(成型)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(成型)).xls',
                 workSheet: '成品质量分析日报表(成型)'
             });
         }

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 								DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_'+ $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(半检)).xls',
+                fileName: '导出数据_'+ $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(半检)).xls',
                 workSheet: '成品质量分析日报表(半检)'
             });
         }

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                         DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt203/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(打磨)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(打磨)).xls',
                 workSheet: '成品质量分析日报表(打磨)'
             });
         }

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                         DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt204/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue")+ '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(擦洗)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue")+ '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(擦洗)).xls',
                 workSheet:'成品质量分析日报表(擦洗)'
             });
         }

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                            DISTINCT MDF.DEFECTCODE AS DFCODE,

wwwroot/mes/rpt/rpt205/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(施釉)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(施釉)).xls',
                 workSheet: '成品质量分析日报表(施釉)'
             });
         }

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -26,7 +26,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT 
 																	DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt206/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(擦坯)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(擦坯)).xls',
                 workSheet: '成品质量分析日报表(擦坯)'
             });
         }

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                         DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt207/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(装窑)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(装窑)).xls',
                 workSheet: '成品质量分析日报表(装窑)'
             });
         }

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -26,7 +26,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                            DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt208/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
                 workSheet: '成品质量分析日报表(出窑)'
             });
         }

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -26,7 +26,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"SELECT
 	                            DISTINCT MDF.DEFECTCODE AS DC,

wwwroot/mes/rpt/rpt209/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
                 workSheet: '成品质量分析日报表(出窑)'
             });
         }

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -26,7 +26,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             if (context.Request["m"].ToString() == "master")
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 
                 string sqlStr = @"SELECT
                     * FROM(

wwwroot/mes/rpt/rpt210/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(原料)).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(原料)).xls',
                 workSheet: '成品质量分析日报表(原料)'
             });
         }

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             if (context.Request["m"].ToString() == "master")
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
                 string defect = "";
                 DataTable dt = conn.ExecuteDatatable(@"			SELECT
 														DISTINCT MDF.DEFECTCODE AS DC,	 MDF.DEFECTID,
@@ -199,7 +199,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																					基础数据.产品规格,
 																					基础数据.釉色,
 																					基础数据.商标), (基础数据.工号,基础数据.姓名,部门.部门),(部门.部门),() ))
-							WHERE GID IN (111,127) )   ORDER BY 姓名,GID,部门,工号,出窑量,产品名称,产品编码 ".Replace("{DEFECT}", defect).Replace("{sumdefect}", sumdefect);
+							WHERE GID IN (111,127) )   ORDER BY 姓名,统计方式,部门,工号,出窑量,产品名称,产品编码 ".Replace("{DEFECT}", defect).Replace("{sumdefect}", sumdefect);
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt211/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         车间:
                         <input class="easyui-combobox" id="linecodeMaster" name="linecodeMaster" data-options="required:false,valueField:'value',textField:'text',
                                data:[{'text': '成A', 'value': 'A'}, {'text': '成B', 'value': 'B'}, {'text': '成C', 'value': 'C'}, {'text': '高压', 'value': '高压'}]" style=" width: 120px; height: 32px; ">
@@ -54,10 +54,10 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
         $(function () {  //车间与线段 二级联动赋值 change事件
             $('#linecodeMaster').combobox({
@@ -108,10 +108,10 @@
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
         //搜索提交
         function tbSearchSubmit() {
@@ -142,7 +142,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(注浆工个人质量分析报表（成型车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(注浆工个人质量分析报表（成型车间）).xls',
                 workSheet: '注浆工个人质量分析报表（成型车间)'
             });
         }

wwwroot/mes/rpt/rpt212/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"		SELECT
 												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
@@ -153,7 +153,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
                                         AND MDF.DEFECTTYPEID = 1 
-		) ORDER BY 姓名,GID
+		) ORDER BY 姓名,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 

wwwroot/mes/rpt/rpt212/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(打磨工个人质量分析报表（精修车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(打磨工个人质量分析报表（精修车间）).xls',
                 workSheet: '打磨工个人质量分析报表（精修车间）'
             });
         }

wwwroot/mes/rpt/rpt213/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"		SELECT
 													 DISTINCT MDF.DEFECTCODE AS DC,		 MDF.DEFECTID,
@@ -151,7 +151,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
 											LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
 											AND MDF.DEFECTTYPEID = 1 
-			)  ORDER BY 姓名,GID
+			)  ORDER BY 姓名,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 

wwwroot/mes/rpt/rpt213/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(刷洗工个人质量分析报表（精修车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(刷洗工个人质量分析报表（精修车间）).xls',
                 workSheet: '刷洗工个人质量分析报表（精修车间)'
             });
         }

wwwroot/mes/rpt/rpt214/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
 							SELECT
@@ -160,7 +160,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
                                         AND MDF.DEFECTTYPEID = 1 
-		)  ORDER BY 姓名,GID
+		)  ORDER BY 姓名,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 

wwwroot/mes/rpt/rpt214/rpt_index.html

@@ -23,9 +23,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -48,19 +48,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -92,7 +92,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(半检工个人质量分析报表（半检车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(半检工个人质量分析报表（半检车间）).xls',
                 workSheet: '半检工个人质量分析报表（半检车间)'
             });
         }

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	SELECT
 												 DISTINCT MDF.DEFECTCODE AS DC,			 MDF.DEFECTID,
@@ -174,7 +174,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																				)
                                         WHERE GID IN (254,255)
                                         
-		) ORDER BY 姓名,工号,GID
+		) ORDER BY 姓名,工号,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(施釉工个人质量分析报表（施釉车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(施釉工个人质量分析报表（施釉车间）).xls',
                 workSheet: '施釉工个人质量分析报表（施釉车间）'
             });
         }

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
 							SELECT  DISTINCT
@@ -77,7 +77,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												WHEN  PDC.PROCEDUREID=37 THEN  '机械手单柜' 
 												WHEN  PDC.PROCEDUREID=41 THEN  '1拖4机械手'  ELSE NULL END    工序,
                                         	DF.DEFECTID 缺陷ID
-                                        FROM
+                                      FROM
                                         	TP_PM_PRODUCTIONDATA PD
                                         	LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
                                         	LEFT JOIN TP_PC_GROUTINGLINE gl ON gl.GROUTINGLINEID=gdl.GROUTINGLINEID
@@ -86,20 +86,17 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
                                         	LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID  AND DF.DEFECTID IN (
-													SELECT  DISTINCT 		 MDF.DEFECTID
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID IN (22) )
+													SELECT  DISTINCT 		 MDF.DEFECTID FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
+															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID WHERE jobs.JOBSID IN (22) )
 											INNER JOIN TP_PM_PRODUCTIONDATA PDC ON PDC.BARCODE=GDL.BARCODE AND PDC.PROCEDUREID IN (10,37,41)AND PDC.VALUEFLAG=1
 											LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PDC.CLASSESSETTINGID
-											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
+											LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID 
                                         WHERE
-                                        	PD.PROCEDUREID IN ( 16) 
-                                           AND PD.CREATETIME >= @DATEBEGIN@
-                                           AND PD.CREATETIME < @DATEEND@ 
-                                        	 
+                                        	PD.PROCEDUREID IN (16) AND STF.JOBS=22
+                                            AND PD.CREATETIME >= @DATEBEGIN@
+                                            AND PD.CREATETIME < @DATEEND@ 
                                         	AND PD.VALUEFLAG = 1
-										GROUP BY GDL.GROUTINGLINEID,
+											GROUP BY 							GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,
                                         	GD.GOODSNAME ,
@@ -169,7 +166,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																	基础数据.产品规格,
 																	基础数据.釉色,
 																	基础数据.商标), (基础数据.工号,基础数据.姓名,基础数据.工序),(基础数据.工序),()) )
-                                        WHERE GID IN (254,255)  ) ORDER BY 姓名,工号,GID ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
+                                        WHERE GID IN (254,255)  ) ORDER BY 姓名,统计方式,工号 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(擦坯工个人质量分析报表（施釉车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(擦坯工个人质量分析报表（施釉车间）).xls',
                 workSheet: '擦坯工个人质量分析报表（施釉车间）'
             });
         }

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
 							SELECT  DISTINCT
@@ -153,7 +153,7 @@ TO_CHAR(基础数据.工号) 工号,
                                         LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
                                         LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
                                         AND MDF.DEFECTTYPEID = 1 
-		) ORDER BY 姓名,GID
+		) ORDER BY 姓名,GID,统计方式
 
 ".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 				//获取查询条件

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -22,9 +22,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -47,19 +47,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -91,7 +91,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(装窑工个人质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(装窑工个人质量分析报表（烧成车间）).xls',
                 workSheet: ' 装窑工个人质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
 						SELECT  DISTINCT

wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -93,7 +93,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工个人质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	SELECT  DISTINCT
 															 MDF.DEFECTID,

wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工个人质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt220/rpt.ashx

@@ -25,7 +25,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string defect = "";
 				DataTable dt = conn.ExecuteDatatable(@"	
 						SELECT  DISTINCT

wwwroot/mes/rpt/rpt220/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt221/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 
 
 

wwwroot/mes/rpt/rpt221/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧成车间出窑工质量分析报表).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧成车间出窑工质量分析报表).xls',
                 workSheet: '烧成车间出窑工质量分析报表'
             });
         }

wwwroot/mes/rpt/rpt223/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string sqlStr = @"SELECT
 									CASE WHEN GID=1 THEN '合计' ELSE TO_CHAR(时间) END 时间,
 									出窑量,

wwwroot/mes/rpt/rpt223/rpt_index.html

@@ -25,15 +25,15 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         成型车间：
                         <input class="easyui-combobox" id="GROUTINGLINECODE" name="GROUTINGLINECODE" data-options="required:false,valueField:'value',textField:'text',
                                data:[{'text': 'A', 'value': 'A'}, {'text': 'B', 'value': 'B'}, {'text': 'C', 'value': 'C'}, {'text': '高压', 'value': '8-'}
                                , {'text': '公坯', 'value': '公坯'}],onChange:getUserCode" style=" width: 120px; height: 32px;">
                         工号:
-                        <input class="easyui-combobox" id="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
+                        <input class="easyui-combobox" id="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#ffMaster').form('clear')">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -56,10 +56,10 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         function getUserCode() {
@@ -70,10 +70,10 @@
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -105,7 +105,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt224/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 
 
 

wwwroot/mes/rpt/rpt224/rpt_index.html

@@ -25,11 +25,11 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         窑炉:
-                        <input class="easyui-combobox" id="KILNCODE" name="KILNCODE" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getKiln&select=1',method:'get',valueField:'KILNCODE',textField:'KILNNAME',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
+                        <input class="easyui-combobox" id="KILNCODE" name="KILNCODE" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getKiln&select=1',method:'get',valueField:'KILNCODE',textField:'KILNNAME',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
                         工序
                         <input class="easyui-combobox" id="Kiln" name="Kiln" data-options="required:false,valueField:'value',textField:'text',
                                data:[{'text': '入窑', 'value': '入窑'}, {'text': '卸窑', 'value': '卸窑'}]" style=" width: 120px; height: 32px;">
@@ -55,19 +55,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
             $("#KILNCODE").select.value('');
             $("#Kiln").select.value('');
         }
@@ -100,7 +100,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt225/rpt.ashx

@@ -23,7 +23,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "master")
 			{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
 				string sqlStr = @"SELECT
                                         CASE WHEN GID=1 THEN'总计' ELSE TO_CHAR(时间) END 时间,
                                         出窑量,

wwwroot/mes/rpt/rpt225/rpt_index.html

@@ -25,11 +25,11 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         窑炉:
-                        <input class="easyui-combobox" id="KILNCODE" name="KILNCODE" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getKiln&select=1',method:'get',valueField:'KILNCODE',textField:'KILNNAME',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
+                        <input class="easyui-combobox" id="KILNCODE" name="KILNCODE" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getKiln&select=1',method:'get',valueField:'KILNCODE',textField:'KILNNAME',panelHeight:'300px',editable:'true'" style="width:180px;height:32px;">
 
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#ffMaster').form('clear') ">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
@@ -53,19 +53,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -97,7 +97,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
                 workSheet: '烧窑工质量分析报表（烧成车间）'
             });
         }

wwwroot/mes/rpt/rpt226/rpt.ashx

@@ -24,7 +24,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             if (context.Request["m"].ToString() == "master")
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
              string defect = "";
                 DataTable dt = conn.ExecuteDatatable(@"SELECT  DISTINCT
 															 MDF.DEFECTID,

wwwroot/mes/rpt/rpt226/rpt_index.html

@@ -25,9 +25,9 @@
                 <form id="ffMaster">
                     <div>
                         开始日期：
-                        <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
                         截止日期：
-                        <input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
+                        <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -50,19 +50,19 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         });
 
         // 清空恢复默认值 
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
@@ -94,7 +94,7 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(个人质量分析日报表（回烧修补工）).xls',
+                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(个人质量分析日报表（回烧修补工）).xls',
                 workSheet: '个人质量分析日报表（回烧修补工）'
             });
         }

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -18,8 +18,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     {
         context.Response.ContentType = "text/plain";
         using(IDataAccess conn = DataAccess.Create())
-        {                DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-            DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+        {    DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
             //主表
             string sqlStr = "";
             if(context.Request["m"].ToString()=="master"){

wwwroot/mes/rpt/rpt304/rpt_index.html

@@ -191,8 +191,8 @@
 			var ctime = new Date();
 			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
 			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
 			//tbSearchSubmit();
 
@@ -201,8 +201,8 @@
 			var ctime = new Date();
 			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
 			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 		}
 
         //搜索提交
@@ -235,7 +235,7 @@
 			}
 				$('#DataGridMaster').datagridExport({
 					headers: headers,
-					fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(卫生陶瓷欠点).xls',
+					fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(卫生陶瓷欠点).xls',
 					workSheet: '卫生陶瓷欠点'
 				});
 		}

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -21,7 +21,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         using (IDataAccess conn = DataAccess.Create())
         {
             DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-            DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+            DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
             string test = context.Request["procedureMaster"];
             string procedure = context.Request["procedureMaster"];
             //主表

wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -28,9 +28,9 @@
 				<form id="ffMaster">
 					<div>
 						开始日期：
-						<input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
+						<input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
 						截止日期：
-						<input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
+						<input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
 						数据源:
 	<input class="easyui-combobox" id="procedureMaster" name="procedureMaster" data-options="required:true,prompt:'请选择...',tipPosition:'top',
 		   data:[
@@ -38,7 +38,7 @@
 		   {'text':'回烧','value':'回烧'},
 		   {'text':'本烧','value':'本烧'},
 		   ],valueField:'value',textField:'text',panelHeight:'200px',editable:'true'" style="width:160px;height:32px;">
-						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">-->
+						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">-->
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
 					</div>
@@ -63,10 +63,10 @@
 		}
 		$(document).ready(function () {
 			var ctime = new Date();
-			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
 			//tbSearchSubmit();
 
@@ -75,8 +75,8 @@
 			var ctime = new Date();
 			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
 			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 		}
 
         //搜索提交
@@ -111,7 +111,7 @@
 			}
 				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析汇总表).xls',
+                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析汇总表).xls',
                     workSheet: '成品质量分析汇总表'
 				});
 		}

wwwroot/mes/rpt/rpt306/rpt.ashx

@@ -23,7 +23,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		using (IDataAccess conn = DataAccess.Create())
 		{
 			DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-			DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(+1);
+			DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
 			//主表
 			string sqlStr = "";
 			if (context.Request["m"].ToString() == "Burnish")

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -31,7 +31,7 @@
                         <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
                         截止日期：
                         <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
-                        <!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">-->
+                        <!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">-->
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -59,8 +59,8 @@
             var ctime = new Date();
             var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
             //tbSearchSubmit();
 
@@ -69,13 +69,13 @@
             var ctime = new Date();
             var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 		}
 
         //搜索提交
         function tbSearchSubmit() {
-            if ($("#datebeginMaster").datebox("getValue") != null && $("#datebeginMaster").datebox("getValue") != " " && $("#datebeginMaster").datebox("getValue") != "") {
+            if ($("#datebeginMaster").datetimebox("getValue") != null && $("#datebeginMaster").datetimebox("getValue") != " " && $("#datebeginMaster").datetimebox("getValue") != "") {
             $('#DataGridMaster').datagridLoad({
                 title: '',
                 idField: 'SID',
@@ -107,7 +107,7 @@
 			}
 				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_(成型注浆报表).xls',
+                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(成型注浆报表).xls',
                     workSheet: '成型注浆报表'
 				});
 		}

wwwroot/mes/rpt/rpt307/rpt.ashx

@@ -23,7 +23,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		using (IDataAccess conn = DataAccess.Create())
 		{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(+1);
+				DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
 			//主表
 			string sqlStr = "";
 			if (context.Request["m"].ToString() == "master")

wwwroot/mes/rpt/rpt307/rpt_index.html

@@ -31,7 +31,7 @@
 						<input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
 						截止日期：
 						<input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
-						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">-->
+						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">-->
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
 					</div>
@@ -58,26 +58,26 @@
       
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
             //tbSearchSubmit();
 
         });
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
 
         //搜索提交
 		function tbSearchSubmit() {
-            if ($("#datebeginMaster").datebox("getValue") != null && $("#datebeginMaster").datebox("getValue") != " " && $("#datebeginMaster").datebox("getValue") != "") {
+            if ($("#datebeginMaster").datetimebox("getValue") != null && $("#datebeginMaster").datetimebox("getValue") != " " && $("#datebeginMaster").datetimebox("getValue") != "") {
             $('#DataGridMaster').datagridLoad({
                 title: '',
                 idField: 'SID',
@@ -109,7 +109,7 @@
 			}
 				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_(施釉精坯存量报表).xls',
+                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(施釉精坯存量报表).xls',
                     workSheet: '施釉精坯存量报表'
 				});
 		}

wwwroot/mes/rpt/rpt308/rpt.ashx

@@ -21,7 +21,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		using (IDataAccess conn = DataAccess.Create())
 		{
 				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(+1);
+				DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
 			//主表
 			string sqlStr = "";
 			if (context.Request["m"].ToString() == "master")

wwwroot/mes/rpt/rpt308/rpt_index.html

@@ -30,7 +30,7 @@
 						<input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
 						截止日期：
 						<input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
-						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">-->
+						<!--产品名称：<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:180px;height:32px;">-->
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
 					</div>
@@ -55,26 +55,26 @@
 		}
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() ;
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
 
             //tbSearchSubmit();
 
         });
         function toClear() {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate();
-            $("#datebeginMaster").datebox("setValue", beginDate);
-            $("#dateendMaster").datebox("setValue", endDate);
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
+            $("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#dateendMaster").datetimebox("setValue", endDate);
         }
 
         //搜索提交
 		function tbSearchSubmit() {
-			var test = $("#datebeginMaster").datebox("getValue");
-			if ($("#datebeginMaster").datebox("getValue") != null && $("#datebeginMaster").datebox("getValue") != " " && $("#datebeginMaster").datebox("getValue") != "") {
+			var test = $("#datebeginMaster").datetimebox("getValue");
+			if ($("#datebeginMaster").datetimebox("getValue") != null && $("#datebeginMaster").datetimebox("getValue") != " " && $("#datebeginMaster").datetimebox("getValue") != "") {
 				$('#DataGridMaster').datagridLoad({
 					title: '',
 					idField: 'SID',
@@ -108,7 +108,7 @@
           
 				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_(烧成釉坯存量报表).xls',
+                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(烧成釉坯存量报表).xls',
                     workSheet: '烧成釉坯存量报表'
 				});
 		}