出窑数标识修改 导出execl带出查询时间

wwwroot/mes/rpt/rpt101/rpt_index.html

@@ -112,15 +112,15 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成型月度结算表).xls',
-                workSheet: '导出数据(成型月度结算表)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成型月度结算表).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成型月度结算表)'
             });
 
             //导出多sheet
             //$.dataGridToExcel(
             //    ['DataGridMaster', 'DataGridDetail'],
             //    ['page1', 'page2'],
-            //    "导出数据（产量产值报表).xls"
+            //    "  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'（产量产值报表).xls"
             //);
         }
 

wwwroot/mes/rpt/rpt102/rpt_index.html

@@ -87,8 +87,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(生产日进度报表).xls',
-                workSheet: '导出数据(生产日进度报表)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(生产日进度报表).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(生产日进度报表)'
             });
         }
 

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -131,7 +131,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                 }
                 sqlStr += @" 
-                                    AND PD.CHECKBATCHNO = 1
+                                    AND PD.valueflag = 1
                                  GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -203,7 +203,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     }
 
                 }
-                sqlStr += @"  AND PD.CHECKBATCHNO = 1
+                sqlStr += @"  AND PD.VALUEFLAG = 1
 																		) ORDER BY GID";
 
                 //获取查询条件

wwwroot/mes/rpt/rpt201/rpt_index.html

@@ -163,8 +163,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(成型)).xls',
-                workSheet: '导出数据(成品质量分析日报表(成型))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(成型)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(成型))'
             });
         }
 

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                   GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -116,7 +116,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@  
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 												
 

wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(半检)).xls',
-                workSheet: '导出数据(成品质量分析日报表(半检))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检))'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -81,7 +81,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            MDF.DEFECTCODE FROM TP_MST_INHERITANCEDEFECTS MDF  WHERE DEFECTPROCEDUREID=4  )
                                 WHERE PD.PROCEDUREID IN (16)  
 	                                AND PD.CREATETIME >= @DATEBEGIN@ AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                 GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -115,7 +115,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@  
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt203/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(打磨)).xls',
-                workSheet: '导出数据(成品质量分析日报表(打磨))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(打磨)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(打磨))'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -88,7 +88,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                   GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -126,7 +126,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@ 
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt204/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(擦洗)).xls',
-                workSheet: '导出数据(成品质量分析日报表(擦洗))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue")+ '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(擦洗)).xls',
+                workSheet:'  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(擦洗))'
             });
         }
 

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -81,7 +81,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                  GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -114,7 +114,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@ 
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt205/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(施釉)).xls',
-                workSheet: '导出数据(成品质量分析日报表(施釉))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(施釉)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(施釉))'
             });
         }
 

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -84,7 +84,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                 GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -117,7 +117,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@  
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt206/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(擦坯)).xls',
-                workSheet: '导出数据(成品质量分析日报表(擦坯))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(擦坯)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(擦坯))'
             });
         }
 

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -82,7 +82,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                 GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -115,7 +115,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@  
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt207/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(装窑)).xls',
-                workSheet: '导出数据(成品质量分析日报表(装窑))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(装窑)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(装窑))'
             });
         }
 

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                   GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -116,7 +116,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@ 
-												     AND PD.CHECKBATCHNO = 1
+												     AND PD.VALUEFLAG = 1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 
 				//获取查询条件

wwwroot/mes/rpt/rpt208/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(出窑)).xls',
-                workSheet: '导出数据(成品质量分析日报表(出窑))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(出窑)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(出窑))'
             });
         }
 

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -81,7 +81,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                PD.PROCEDUREID IN ( 16) 
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
-	                               AND PD.CHECKBATCHNO=1
+	                               AND PD.VALUEFLAG=1
                                   GROUP BY
 												Grouping sets ( (GD.GOODSCODE ,
 	                                                    GD.GOODSNAME,
@@ -114,7 +114,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 												     PD.PROCEDUREID IN ( 16) 
 												      AND PD.CREATETIME >= @DATEBEGIN@
 												     AND PD.CREATETIME < @DATEEND@  
-												     AND PD.CHECKBATCHNO=1
+												     AND PD.VALUEFLAG=1
 																		) ORDER BY GID".Replace("{DEFECTSUM}",sumdefect).Replace("{DEFECT}", defect);
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt209/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(出窑)).xls',
-                workSheet: '导出数据(成品质量分析日报表(出窑))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(出窑)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(出窑))'
             });
         }
         function tbHelp() {

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -64,7 +64,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
 	                                
-	                                AND PD.CHECKBATCHNO = 1
+	                                AND PD.VALUEFLAG = 1
                                 GROUP BY
 												Grouping sets ( ( TO_CHAR( PD.CREATETIME, 'yyyy-mm-dd' ),GD.GOODSCODE,
 	                                                    GD.GOODSNAME,
@@ -97,7 +97,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                AND PD.CREATETIME >= @DATEBEGIN@
                                     AND PD.CREATETIME < @DATEEND@ 
 	                                
-	                                AND PD.CHECKBATCHNO = 1) ORDER BY GID ";
+	                                AND PD.VALUEFLAG = 1) ORDER BY GID ";
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt210/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(成品质量分析日报表(原料)).xls',
-                workSheet: '导出数据(成品质量分析日报表(原料))'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(原料)).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(原料))'
             });
         }
 

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -112,7 +112,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                         }
                 }
                 sqlStr +=@"  
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 							GROUP BY 		GDL.GROUTINGLINEID,
                                         	us.USERCODE ,
                                         	us.USERNAME,

wwwroot/mes/rpt/rpt211/rpt_index.html

@@ -142,8 +142,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(注浆工个人质量分析报表（成型车间）).xls',
-                workSheet: '导出数据(注浆工个人质量分析报表（成型车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(注浆工个人质量分析报表（成型车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(注浆工个人质量分析报表（成型车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt212/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE ,

wwwroot/mes/rpt/rpt212/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(打磨工个人质量分析报表（精修车间）).xls',
-                workSheet: '导出数据(打磨工个人质量分析报表（精修车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(打磨工个人质量分析报表（精修车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(打磨工个人质量分析报表（精修车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt213/rpt.ashx

@@ -82,7 +82,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,

wwwroot/mes/rpt/rpt213/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(刷洗工个人质量分析报表（精修车间）).xls',
-                workSheet: '导出数据(刷洗工个人质量分析报表（精修车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(刷洗工个人质量分析报表（精修车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(刷洗工个人质量分析报表（精修车间）)'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt214/rpt.ashx

@@ -88,7 +88,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,

wwwroot/mes/rpt/rpt214/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(半检工个人质量分析报表（半检车间）).xls',
-                workSheet: '导出数据(半检工个人质量分析报表（半检车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(半检工个人质量分析报表（半检车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(半检工个人质量分析报表（半检车间）)'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(施釉工个人质量分析报表（施釉车间）).xls',
-                workSheet: '导出数据(施釉工个人质量分析报表（施釉车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(施釉工个人质量分析报表（施釉车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(施釉工个人质量分析报表（施釉车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(擦坯工个人质量分析报表（施釉车间）).xls',
-                workSheet: '导出数据(擦坯工个人质量分析报表（施釉车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(擦坯工个人质量分析报表（施釉车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(擦坯工个人质量分析报表（施釉车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 																					GROUP BY GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -91,8 +91,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(装窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(装窑工个人质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(装窑工个人质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(装窑工个人质量分析报表（烧成车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											AND PD.CREATETIME >= @DATEBEGIN@
 											AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1 
+                                        	AND PD.VALUEFLAG = 1 
 									GROUP BY  PD.BARCODE,
                                         	GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,

wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -93,8 +93,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工个人质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工个人质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工个人质量分析报表（烧成车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -83,7 +83,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME < @DATEEND@ 
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
 																					GROUP BY  PD.BARCODE,
                                         	GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,

wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工个人质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工个人质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工个人质量分析报表（烧成车间）)'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt220/rpt.ashx

@@ -84,7 +84,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME <= @DATEEND@
                                         	 
-                                           AND PD.CHECKBATCHNO = 1 
+                                           AND PD.VALUEFLAG = 1 
 																					GROUP BY  PD.BARCODE,
                                         	GDL.GROUTINGLINEID,
                                         	PDC.USERCODE ,

wwwroot/mes/rpt/rpt220/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt221/rpt.ashx

@@ -66,7 +66,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 														AND PD.CREATETIME >= @DATEBEGIN@
 														AND PD.CREATETIME <= @DATEEND@
 														 
-														AND PD.CHECKBATCHNO = 1
+														AND PD.VALUEFLAG = 1
 													GROUP BY
 														GDL.GROUTINGLINEID,
 														PDC.USERCODE,

wwwroot/mes/rpt/rpt221/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧成车间出窑工质量分析报表).xls',
-                workSheet: '导出数据(烧成车间出窑工质量分析报表)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧成车间出窑工质量分析报表).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧成车间出窑工质量分析报表)'
             });
         }
 

wwwroot/mes/rpt/rpt223/rpt.ashx

@@ -77,7 +77,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										  AND ( INSTR(GDL.GROUTINGLINECODE, @GROUTINGLINECODE@) > 0 OR @GROUTINGLINECODE@ IS NULL)
 										  AND ( PD.GROUTINGUSERCODE=@USERCODE@ OR @USERCODE@ IS NULL)
 									      
-									      AND PD.CHECKBATCHNO = 1
+									      AND PD.VALUEFLAG = 1
 									GROUP BY Grouping sets ( ( TO_CHAR( PD.CREATETIME, 'yyyy-mm' ) ), ( ) ) )";
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt223/rpt_index.html

@@ -100,8 +100,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）)'
             });
         }
         //帮助事件

wwwroot/mes/rpt/rpt224/rpt.ashx

@@ -95,7 +95,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                       AND PD.CREATETIME <= @DATEEND@
                                                       AND (INSTR(PD.KILNCODE, @KILNCODE@) > 0 OR @KILNCODE@ IS NULL)
 	                                                  
-	                                                  AND PD.CHECKBATCHNO = 1  ";
+	                                                  AND PD.VALUEFLAG = 1  ";
 				if (context.Request["Kiln"] == "入窑")
 				{
 					sqlStr += " AND pds.PROCEDUREID in(39,57,58,30)";

wwwroot/mes/rpt/rpt224/rpt_index.html

@@ -100,8 +100,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt225/rpt.ashx

@@ -88,7 +88,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                             AND PD.CREATETIME <= @DATEEND@
                                                              AND (INSTR(PD.KILNCODE, @KILNCODE@) > 0 OR @KILNCODE@ IS NULL)
 	                                                        
-	                                                        AND PD.CHECKBATCHNO = 1
+	                                                        AND PD.VALUEFLAG = 1
 													  GROUP BY   Grouping sets ( ( TO_CHAR( PD.CREATETIME, 'yyyy-mm' ) ), ( ) ) )";
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt225/rpt_index.html

@@ -97,8 +97,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '导出数据(烧窑工质量分析报表（烧成车间）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(烧窑工质量分析报表（烧成车间）)'
             });
         }
 

wwwroot/mes/rpt/rpt226/rpt.ashx

@@ -63,7 +63,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND PD.CREATETIME >= @DATEBEGIN@
                                            AND PD.CREATETIME <= @DATEEND@
                                         	 
-                                        	AND PD.CHECKBATCHNO = 1
+                                        	AND PD.VALUEFLAG = 1
                                         )
                                         
                                         SELECT

wwwroot/mes/rpt/rpt226/rpt_index.html

@@ -94,8 +94,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '导出数据(个人质量分析日报表（回烧修补工）).xls',
-                workSheet: '导出数据(个人质量分析日报表（回烧修补工）)'
+                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(个人质量分析日报表（回烧修补工）).xls',
+                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(个人质量分析日报表（回烧修补工）)'
             });
         }
 

wwwroot/mes/rpt/rpt303/rpt_index.html

@@ -116,18 +116,18 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-					fileName: '导出数据(产品统计表).xls',
-                    workSheet: '导出数据(产品统计表)'
+                    fileName: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(产品统计表).xls',
+                    workSheet: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(产品统计表)'
 				});
 		}
         //帮助事件

wwwroot/mes/rpt/rpt304/rpt_index.html

@@ -40,7 +40,7 @@
 		</div>
 		<!--表格-->
 		<!--<table class="easyui-datagrid"
-			   id="DataGridBurnish"
+			   id="DataGridMaster"
 			   data-options="toolbar: '#tb',method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
 
 			<thead>-->
@@ -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").datetimebox("setValue", beginDate);
-			$("#dateendMaster").datetimebox("setValue", endDate);
+            $("#datebeginMaster").datebox("setValue", beginDate);
+            $("#dateendMaster").datebox("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").datetimebox("setValue", beginDate);
-			$("#dateendMaster").datetimebox("setValue", endDate);
+            $("#datebeginMaster").datebox("setValue", beginDate);
+            $("#dateendMaster").datebox("setValue", endDate);
 		}
 
         //搜索提交
@@ -225,18 +225,18 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-					fileName: '导出数据(卫生陶瓷欠点).xls',
-					workSheet: '导出数据(卫生陶瓷欠点)'
+					fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(卫生陶瓷欠点).xls',
+					workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(卫生陶瓷欠点)'
 				});
 		}
         //帮助事件

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"]);
+			DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
 			//主表
 			string sqlStr = "";
 			if (context.Request["m"].ToString() == "master")

wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -28,9 +28,9 @@
 				<form id="ffMaster">
 					<div>
 						开始日期：
-						<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="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-datebox" 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;">-->
 						<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>
@@ -56,20 +56,20 @@
 		}
 		$(document).ready(function () {
 			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);
+			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);
 
 			//tbSearchSubmit();
 
 		});
 		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);
+			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);
 		}
 
         //搜索提交
@@ -92,18 +92,18 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据(成品质量分析汇总表).xls',
-                    workSheet: '导出数据(成品质量分析汇总表)'
+                    fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析汇总表).xls',
+                    workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析汇总表)'
 				});
 		}
 

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -55,7 +55,7 @@
 		$(document).ready(function () {
 			var ctime = new Date();
 			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 00:00:00";
-			$("#datebeginMaster").datetimebox("setValue", beginDate);
+            $("#datebeginMaster").datebox("setValue", beginDate);
 
 			//tbSearchSubmit();
 
@@ -104,7 +104,7 @@
 			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);
+            $("#datebeginMaster").datebox("setValue", beginDate);
 		}
 
         //搜索提交
@@ -127,18 +127,18 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据(成型注浆报表).xls',
-                    workSheet: '导出数据(成型注浆报表)'
+                    fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '(成型注浆报表).xls',
+                    workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '(成型注浆报表)'
 				});
 		}
 

wwwroot/mes/rpt/rpt307/rpt_index.html

@@ -56,8 +56,7 @@
 			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);
+            $("#datebeginMaster").datebox("setValue", beginDate);
 
 			//tbSearchSubmit();
 
@@ -106,8 +105,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").datetimebox("setValue", beginDate);
-			$("#dateendMaster").datetimebox("setValue", endDate);
+            $("#datebeginMaster").datebox("setValue", beginDate);
+            $("#dateendMaster").datebox("setValue", endDate);
 		}
 
         //搜索提交
@@ -130,18 +129,18 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据(施釉精坯存量报表).xls',
-                    workSheet: '导出数据(施釉精坯存量报表)'
+                    fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '(施釉精坯存量报表).xls',
+                    workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '(施釉精坯存量报表)'
 				});
 		}
         //帮助事件

wwwroot/mes/rpt/rpt308/rpt_index.html

@@ -54,20 +54,18 @@
 		}
 		$(document).ready(function () {
 			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);
+			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) ;
+			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) ;
+            $("#datebeginMaster").datebox("setValue", beginDate);
 
 			//tbSearchSubmit();
 
 		});
 		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);
+			var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) ;
+			var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1);
+            $("#datebeginMaster").datebox("setValue", beginDate);
 		}
         $(function () {
             $('#datebeginMaster').datebox({
@@ -128,18 +126,19 @@
 		//导出
 		function tbExport() {
 			//加载表头
-			var fields1 = $('#DataGridBurnish').datagrid('getColumnFields');
-			var fields2 = $('#DataGridBurnish').datagrid('getColumnFields', true);
+			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
+			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
 			var fields = fields2.concat(fields1);
 			var headers = [];
 			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridBurnish').datagrid('getColumnOption', fields[i])['title']);
+				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
 				headers.push(fields[i]);
 			}
-				$('#DataGridBurnish').datagridExport({
+          
+				$('#DataGridMaster').datagridExport({
 					headers: headers,
-                    fileName: '导出数据(烧成釉坯存量报表).xls',
-                    workSheet: '导出数据(烧成釉坯存量报表)'
+                    fileName: '    导出数据' + $("#datebeginMaster").datebox("getValue") + '(烧成釉坯存量报表).xls',
+                    workSheet: '   导出数据' + $("#datebeginMaster").datebox("getValue") + '(烧成釉坯存量报表)'
 				});
 		}
         //帮助事件