فهرست منبع

欠点表和 成品质量汇总的 产品编码和名称 多条 因为生产的数据中产品名称已经更改了

姜永辉 7 ماه پیش
والد
کامیت
aefa1034e4
3فایلهای تغییر یافته به همراه49 افزوده شده و 54 حذف شده
  1. 42 47
      wwwroot/mes/rpt/rpt304/rpt.ashx
  2. 6 6
      wwwroot/mes/rpt/rpt305/rpt.ashx
  3. 1 1
      wwwroot/mes/rpt/rpt309/rpt.ashx

+ 42 - 47
wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -232,16 +232,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     sqlStr += @"GROUP BY Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,good.GOODSSPECIFICATION,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()) 
 											),
 											产品明细缺陷 AS (
-											SELECT			GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
-								 CASE WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
-														ELSE to_char(GD.GOODSCODE) END AS GOODSCODE,
-									GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
-								gd.GOODSNAME,
-								CASE WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
-										 WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
+											SELECT			GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
+								 CASE WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
+														ELSE to_char(good.GOODSCODE) END AS GOODSCODE,
+									GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
+								good.GOODSNAME,
+								CASE WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
+										 WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
 										 ELSE TO_CHAR(gtp.GOODSTYPENAME )END GOODSTYPENAME,
 								SUBSTR(gtp.GOODSTYPECODE, 0, 6)  AS GOODSTYPECODE,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '01' )  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 成型半检缺陷_坯脏,
@@ -391,9 +391,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '98' )   THEN (pd.productiondataid
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '100' )  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 其他_隧道窑其他试验不良,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 其他_梭式窑其他试验不良
 							FROM
-								TP_PM_DEFECT df
-									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON  df.BARCODE = gd.BARCODE 
-									
+								TP_PM_DEFECT df									 
 								LEFT JOIN ( TMP_PM_PRODUCTIONDATA_CHECKDT ) pd
 								  ON   (df.productiondataid  = pd.productiondataid or df.productiondataid  = pd.fproductiondataid)
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
@@ -404,7 +402,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 												AND PD.CREATETIME >= @DATEBEGIN@
 												AND PD.CREATETIME <=  @DATEEND@   AND DF.PROCEDUREID NOT IN " + notInproc;
                     sqlStr += @"	GROUP BY
-												Grouping sets ( ( gd.GOODSCODE, gd.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) , ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
+												Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) , ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
 								),
 								检验数 AS (	SELECT GROUPING_ID(GOODSCODE,GOODSTYPENAME,GOODSTYPECODESIX),
 										 CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME,GOODSTYPECODESIX) =5   THEN '小计'
@@ -440,8 +438,8 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 													,createtime
 											  -- ,row_number() over(PARTITION BY barcode ORDER BY createtime DESC) AS rownums
 												FROM (SELECT DISTINCT pd.barcode
-																	 ,pd.goodscode
-																	 ,pd.goodsname
+																	 ,good.goodscode
+																	 ,good.goodsname
 																	 ,pd.groutinguserid
 																	 ,pd.groutingusercode
 																	 ,gtp.goodstypecode
@@ -1088,16 +1086,16 @@ ORDER BY 产品类别,产品编码";
 												Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,good.GOODSSPECIFICATION,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()) 
 											),
 											产品明细缺陷 AS (
-											SELECT			GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
-								 CASE WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
-														ELSE to_char(GD.GOODSCODE) END AS GOODSCODE,
-									GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
-								gd.GOODSNAME,
-								CASE WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
-										 WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
+											SELECT			GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
+								 CASE WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
+														ELSE to_char(good.GOODSCODE) END AS GOODSCODE,
+									GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
+								good.GOODSNAME,
+								CASE WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
+										 WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
 										 ELSE TO_CHAR(gtp.GOODSTYPENAME )END GOODSTYPENAME,
 								SUBSTR(gtp.GOODSTYPECODE, 0, 6)  AS GOODSTYPECODE,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '01' )  THEN (pd.productiondataid || DF.BARCODE || df.DEFECTCODE) ELSE NULL END ) AS 成型半检缺陷_坯脏,
@@ -1264,8 +1262,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '100' )  THEN (pd.productiondataid
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '099' )  THEN (pd.productiondataid || DF.BARCODE || df.DEFECTCODE) ELSE NULL END ) AS 成型半检缺陷_梭式窑其他蹦脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid || DF.BARCODE || df.DEFECTCODE) ELSE NULL END ) AS 其他_梭式窑其他试验不良
 							FROM
-								TP_PM_DEFECT df
-									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON  df.BARCODE = gd.BARCODE 
+								TP_PM_DEFECT df 
 									LEFT JOIN (TMP_PM_PRODUCTIONDATA_CHECKDT) pd
 								  ON   (df.productiondataid  = pd.productiondataid or df.productiondataid  = pd.fproductiondataid)
 									INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE=PD.BARCODE AND pds.valueflag = 1
@@ -1277,7 +1274,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 												AND PD.CREATETIME >= @DATEBEGIN@
 												AND PD.CREATETIME <=  @DATEEND@   AND DF.PROCEDUREID NOT IN " + notInproc;
                     sqlStr += @"	GROUP BY
-												Grouping sets ( ( gd.GOODSCODE, gd.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
+												Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
 								),
 								检验数 AS (	SELECT
 GROUPING_ID(GOODSCODE,GOODSTYPENAME,GOODSTYPECODESIX),
@@ -1315,8 +1312,8 @@ SELECT
 													,createtime
 											  -- ,row_number() over(PARTITION BY barcode ORDER BY createtime DESC) AS rownums
 												FROM (SELECT DISTINCT pd.barcode
-																	 ,pd.goodscode
-																	 ,pd.goodsname
+																	 ,good.goodscode
+																	 ,good.goodsname
 																	 ,pd.groutinguserid
 																	 ,pd.groutingusercode
 																	 ,gtp.goodstypecode
@@ -1947,16 +1944,16 @@ ORDER BY 产品类别,产品编码
 												Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,good.GOODSSPECIFICATION,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()) 
 											),
 											产品明细缺陷 AS (
-											SELECT			GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
-								 CASE WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
-											WHEN  GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
-														ELSE to_char(GD.GOODSCODE) END AS GOODSCODE,
-									GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
-								gd.GOODSNAME,
-								CASE WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
-										 WHEN GROUPING_ID(GD.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
+											SELECT			GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)),
+								 CASE WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =5   THEN '小计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =6   AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件合计'
+											WHEN  GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6)) =7   THEN '总计'
+														ELSE to_char(good.GOODSCODE) END AS GOODSCODE,
+									GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME) AS GID,
+								good.GOODSNAME,
+								CASE WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001001' THEN '大件' 
+										 WHEN GROUPING_ID(good.GOODSCODE,gtp.GOODSTYPENAME,SUBSTR(gtp.GOODSTYPECODE, 0, 6))=6 AND SUBSTR(gtp.GOODSTYPECODE, 0, 6)='001002' THEN '小件'
 										 ELSE TO_CHAR(gtp.GOODSTYPENAME )END GOODSTYPENAME,
 								SUBSTR(gtp.GOODSTYPECODE, 0, 6)  AS GOODSTYPECODE,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '01' )  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 成型半检缺陷_坯脏,
@@ -2123,9 +2120,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '100' )  THEN (pd.productiondataid
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '099' )  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 成型半检缺陷_梭式窑其他蹦脏,
 count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid || df.barcode ||  df.DEFECTCODE) ELSE NULL END ) AS 其他_梭式窑其他试验不良
 							FROM
-								TP_PM_DEFECT df
-									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON  df.BARCODE = gd.BARCODE 
-									 
+								TP_PM_DEFECT df									 
 					LEFT JOIN (TMP_PM_PRODUCTIONDATA_CHECKDT) pd
 						  ON (df.productiondataid  = pd.productiondataid or df.productiondataid  = pd.fproductiondataid)
 									LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
@@ -2137,7 +2132,7 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN (pd.productiondataid
 												AND PD.CREATETIME >= @DATEBEGIN@
 												AND PD.CREATETIME <=  @DATEEND@   AND DF.PROCEDUREID NOT IN " + notInproc;
                     sqlStr += @"	GROUP BY
-												Grouping sets ( ( gd.GOODSCODE, gd.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) , ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
+												Grouping sets ( ( good.GOODSCODE, good.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) , ( gtp.GOODSTYPENAME) ,(SUBSTR(gtp.GOODSTYPECODE, 0, 6)),()    ) 
 								),
 								检验数 AS (	SELECT
 GROUPING_ID(GOODSCODE,GOODSTYPENAME,GOODSTYPECODESIX),
@@ -2173,8 +2168,8 @@ SELECT distinct
                         ,lusterwareweight
                         ,createtime 
                     FROM (SELECT DISTINCT pd.barcode
-                                         ,pd.goodscode
-                                         ,pd.goodsname
+                                         ,good.goodscode
+                                         ,good.goodsname
                                          ,pd.groutinguserid
                                          ,pd.groutingusercode
                                          ,gtp.goodstypecode

+ 6 - 6
wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -93,8 +93,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                  FROM (SELECT DISTINCT pd.barcode
                                                                  ,pd.reworkprocedureid
                                                                  ,pd.groutinglinecode
-                                                                 ,pd.goodscode
-                                                                 ,pd.goodsname
+                                                                 ,good.goodscode
+                                                                 ,good.goodsname
                                                                  ,pd.groutinguserid
                                                                  ,pd.groutingusercode
                                                                  ,logo.logoname
@@ -410,8 +410,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                FROM (SELECT DISTINCT pd.barcode
                                                                  ,pd.reworkprocedureid
                                                                  ,pd.groutinglinecode
-                                                                 ,pd.goodscode
-                                                                 ,pd.goodsname
+                                                                 ,good.goodscode
+                                                                 ,good.goodsname
                                                                  ,pd.groutinguserid
                                                                  ,pd.groutingusercode
                                                                  ,logo.logoname
@@ -726,8 +726,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 FROM (SELECT DISTINCT pd.barcode
                                                          ,pd.reworkprocedureid
                                                          ,pd.groutinglinecode
-                                                         ,pd.goodscode
-                                                         ,pd.goodsname
+                                                         ,good.goodscode
+                                                         ,good.goodsname
                                                          ,pd.groutinguserid
                                                          ,pd.groutingusercode
                                                          ,logo.logoname

+ 1 - 1
wwwroot/mes/rpt/rpt309/rpt.ashx

@@ -262,7 +262,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			//sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
 			//获取分页参数
 			int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-			int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+			int rows =   10000;
 			string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 			string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";