改判清单 每窑的固定列

wwwroot/mes/rpt/rpt014/rpt.ashx

@@ -127,10 +127,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 {
                     //读取报表数据
                     sqlStr = @"
-            SELECT
-	            DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
-	            --TA.GOODSCODE AS 产品编码,
-	            TA.GOODSNAME AS 产品名称,
+            SELECT 	            
+				--TA.GOODSCODE AS 产品编码,
+				TA.GOODSNAME AS 产品名称,
+				DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
 	            DECODE( TA.OUT_K, 0, NULL, TA.OUT_K ) AS 出窑数,
 	            --DECODE( TA.COUNT_U4 + TA.COUNT_U5 + TA.COUNT_AB, 0, NULL, TA.COUNT_U4 + TA.COUNT_U5 + TA.COUNT_AB ) 合格123,
 	            DECODE( TA.COUNT_U4, 0, NULL, TA.COUNT_U4 ) AS U级,
@@ -381,9 +381,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     //读取报表数据
                     sqlStr = @"
             SELECT
-	            DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
+	            
 	            --TA.GOODSCODE AS 产品编码,
 	            TA.GOODSNAME AS 产品名称,
+DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
 	            DECODE( TA.OUT_K, 0, NULL, TA.OUT_K ) AS 出窑数,
 	            --DECODE( TA.COUNT_U4 + TA.COUNT_U5 + TA.COUNT_AB, 0, NULL, TA.COUNT_U4 + TA.COUNT_U5 + TA.COUNT_AB ) 合格123,
 	            DECODE( TA.COUNT_U4, 0, NULL, TA.COUNT_U4 ) AS U级,
@@ -736,10 +737,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     }
                 }
                 //获取分页参数
-                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"]) : 10;
-                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"] : "";
+                //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"]) : 10;
+                //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"] : "";
                 //获取分页数据
                 int total = 0;
                 //dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
@@ -766,8 +767,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 }
                 string sqlStr = @"
 					SELECT
-		                DECODE(产品类别, null, '合计',产品类别) 产品类别,
+		                
 						产品名称 ,
+						DECODE(产品类别, null, '合计',产品类别) 产品类别,
 						SUM(出窑数) AS 出窑数,
 						SUM(U级) AS U级,
 						SUM(A级) AS A级,

wwwroot/mes/rpt/rpt014/rpt_index.html

@@ -49,7 +49,7 @@
         </div>
         <!--表格-->
         <table class="easyui-datagrid"
-               id="DataGridMaster"
+               id="DataGridMasterGrid"
                data-options="toolbar: '#tb',method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
             <thead>
             </thead>
@@ -122,7 +122,7 @@
 			}
             if ($('#ffMaster').form("validate")) {
                 if ($('#chkMonitor').checkbox('options').checked) {
-					$('#DataGridMaster').datagridLoadRpt({
+                    $('#DataGridMasterGrid').datagridLoadRpt({
                         title: '',
                         idField: 'SID',
                         queryParams: $('#ffMaster').serializeJson(),
@@ -134,7 +134,7 @@
                     t=1
                 }
                 else {
-                    $('#DataGridMaster').datagridLoadRpt({
+                    $('#DataGridMasterGrid').datagridLoadRpt({
                         title: '',
                         idField: 'SID',
                         queryParams: $('#ffMaster').serializeJson(),
@@ -161,7 +161,7 @@
 
         //导出
         function tbExport() {
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
+            var fields = $('#DataGridMasterGrid').datagrid('getColumnFields');
             var headers = [];
             for (var i = 0; i < fields.length; i++) {
                 //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
@@ -169,14 +169,14 @@
             }
 
             if (t == 1) {
-                $('#DataGridMaster').datagridExport({
+                $('#DataGridMasterGrid').datagridExport({
                     headers: headers,
                     fileName: '导出数据(每窑质量总缺陷统计表-结转).xls',
                     workSheet: '导出数据(每窑质量总缺陷统计表-结转)'
                 });
             }
             else {
-                $('#DataGridMaster').datagridExport({
+                $('#DataGridMasterGrid').datagridExport({
                     headers: headers,
                     fileName: '导出数据(每窑质量总缺陷统计表).xls',
                     workSheet: '导出数据(每窑质量总缺陷统计表)'
@@ -187,7 +187,7 @@
         //搜索按钮
         function tbSearch() {
             $('#tbSearchDiv').toggle();
-            $('#DataGridMaster').datagrid('resize');
+            $('#DataGridMasterGrid').datagrid('resize');
         }
 
         //刷新
@@ -198,7 +198,7 @@
 
         //帮助事件
         function tbHelp() {
-            $('#DataGridMaster').datagridDialog({
+            $('#DataGridMasterGrid').datagridDialog({
                 title: '帮助',
                 width: 640,
                 height: 480,
@@ -207,5 +207,14 @@
         }
 
     </script>
+
+     <style type="text/css"> 
+         #DataGridMasterGrid th:first-child, td:not([field="原料缺陷_铁脏"]):first-child {
+             position: sticky;
+             left: 0;
+             z-index: 100;
+             background-color: gray;
+         } 
+     </style>
 </body>
 </html>

wwwroot/mes/rpt/rpt037/rpt.ashx

@@ -20,7 +20,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             #region 
             //没有发生等级改变的数据不展示 2022-11-14 张庭莲
             sqlStr = @"
-   SELECT DISTINCT
+                SELECT DISTINCT
 	                    pd.BARCODE AS 产品条码,
 	                    ( CASE WHEN GRO.BUILDINGNO = '1#' THEN '一期' WHEN GRO.BUILDINGNO = '2#' THEN '二期' ELSE '其他' END ) AS 楼号,
 	                    PD.GOODSNAME AS 产品名称,
@@ -52,31 +52,42 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 		                    PD4.USERCODE,
 		                    PD4.USERNAME,
 		                    PD4.BARCODE,
-												PD4.CHECKFLAG,
-												PD4.GOODSLEVELTYPEID
+							PD4.CHECKFLAG,
+							PD4.GOODSLEVELTYPEID
 	                    FROM
 		                    (
-											SELECT 		
-		                    MIN(CREATETIME) CREATETIME,
-		                    BARCODE,
-												CHECKFLAG
-												FROM TP_PM_PRODUCTIONDATA 
-												WHERE CHECKFLAG = 1 
-												GROUP BY BARCODE,CHECKFLAG
-												) PD3
-		                    LEFT JOIN TP_PM_DEFECT DEFECT2 ON DEFECT2.BARCODE = PD3.BARCODE 
-												INNER JOIN TP_PM_PRODUCTIONDATA PD4 ON PD4.BARCODE=PD3.BARCODE AND PD3.CREATETIME=PD4.CREATETIME AND PD3.CHECKFLAG=PD4.CHECKFLAG
+                                SELECT pmax.barcode
+                                    ,MAX(pmax.createtime) AS createtime
+                                FROM tp_pm_productiondata tp
+                                LEFT JOIN tp_pm_productiondata pmax
+                                    ON pmax.groutingdailydetailid = tp.groutingdailydetailid
+                                AND pmax.productiondataid < tp.productiondataid
+                                AND pmax.checkflag IS NOT NULL
+                                AND pmax.procedureid = tp.procedureid
+                                WHERE tp.checkflag <> 1                           
+                                AND to_char(pmax.createtime, 'yyyy-mm-dd') <>  to_char(tp.createtime, 'yyyy-mm-dd')" ;
+                    //获取查询条件       
+                    if ((!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEBEGIN"]))&&(!string.IsNullOrEmpty(context.Request["TAMPERCREATETIMEEND"])))
+                    {
+                        //改判时间
+                        sqlStr += "AND tp.CREATETIME >= @TAMPERCREATETIMEBEGI@ AND tp.CREATETIME < @TAMPERCREATETIMEEN@ "; 
+                    }           
+                    
+                    if (!string.IsNullOrEmpty(context.Request["TAMPERUSERCODE"]))
+                    {
+                        sqlStr += "AND (tp.USERCODE LIKE @TAMPERUSERCODE@ OR @TAMPERUSERCODE@ IS NULL)"; 
+                    }
+                    if (!string.IsNullOrEmpty(context.Request["goodscodeMaster"]))
+                    {
+                        sqlStr += "AND (tp.GOODSNAME LIKE @goodscodeMaster@ OR @goodscodeMaster@ IS NULL)"; 
+                    }                    
+						 sqlStr += @"	 GROUP BY pmax.barcode ) PD3 
+						 INNER JOIN TP_PM_PRODUCTIONDATA PD4 ON PD4.BARCODE=PD3.BARCODE AND PD3.CREATETIME=PD4.CREATETIME AND   pd4.checkflag IS NOT NULL
 	                    ) PD2 ON PD.BARCODE = PD2.BARCODE
 	                    LEFT JOIN TP_SYS_GOODSLEVELTYPE TSGL2 ON PD2.GOODSLEVELTYPEID = TSGL2.GOODSLEVELTYPEID
 	                    LEFT JOIN TP_PC_GROUTINGLINE GRO ON GRO.GROUTINGLINEID = PD.GROUTINGLINEID
 	                    LEFT JOIN TP_PM_DEFECT DEFECT ON DEFECT.BARCODE = PD.BARCODE 
-                    WHERE  PD.CHECKFLAG <> 1  AND to_char( PD2.CREATETIME, 'yyyy-mm-dd' ) <> to_char( PD.CREATETIME, 'yyyy-mm-dd' ) 
-											
-
-			
-
-			
-";
+                    WHERE  PD.CHECKFLAG <> 1  AND to_char( PD2.CREATETIME, 'yyyy-mm-dd' ) <> to_char( PD.CREATETIME, 'yyyy-mm-dd' )   ";
 
             #endregion
             //获取查询条件