SESSION 时长60分钟 新每窑的 标题重贴

wwwroot/Web.config

@@ -24,6 +24,7 @@
     <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" validateRequest="false"/>   
     <httpRuntime/>
     <!--<sessionState mode="StateServer" stateConnectionString="tcpip=127.0.0.1:42424" cookieless="false" timeout="1440"/>-->
+	<sessionState mode="InProc" timeout="60"/>
   </system.web>
   <system.data>
     <DbProviderFactories>

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -107,14 +107,16 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,0 OUT_K_R
                                       ,0 OUT_K_ALL
                                       ,CASE
-                                         WHEN P.PROCEDUREID = 13 AND
-                                              RPD.Productiondataid IS NULL THEN
+                                         WHEN P.PROCEDUREID = 13 AND 
+                                              RPD.Productiondataid IS NULL  AND pdd.checktime >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd")+@"'
+                                           AND pdd.checktime <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd")+@"' THEN
                                           1
                                          ELSE
                                           0
                                        END OK_B
                                       ,CASE
-                                         WHEN P.PROCEDUREID = 35 THEN
+                                         WHEN P.PROCEDUREID = 35  AND pdd.checktime >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd")+@"'
+                                           AND pdd.checktime <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd")+@"' THEN
                                           1
                                          ELSE
                                           0
@@ -146,14 +148,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND TP.PROCEDUREID IN (13, 35)
                                            AND TP.CREATETIME >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd")+@"'
                                            AND TP.CREATETIME <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd")+@"'
-                                        AND TP.checktime >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd")+@"'
-                                           AND TP.checktime <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd")+@"'
+                                       
                                          GROUP BY TP.PRODUCTIONDATAID
                                                  ,TP.GROUTINGDAILYDETAILID
                                                  ,TP.PROCEDUREID) P
                                   LEFT JOIN TP_PM_PRODUCTIONDATA RPD
                                     ON RPD.PRODUCTIONDATAID = P.MAXPRODUCTIONDATAID
                                    AND RPD.Procedureid IN (20, 22, 23, 37)
+                                   inner JOIN tp_pm_productiondata pdd ON pdd.productiondataid = p.productiondataid
                                 UNION ALL
                                 SELECT 3 FLAG
                                       ,TP_PM_ProductionData.groutingdailydetailid

wwwroot/mes/rpt/rpt014/rpt_index_new.html

@@ -264,12 +264,13 @@
     </script>
 
     <style type="text/css">
-        #DataGridMasterGrid th:first-child, td:not([field="原料缺陷_铁脏"]):first-child {
+        #DataGridMasterGrid th:first-child, td:not([field="原料缺陷_铁脏"]):not([field="研磨_检验数"]):first-child {
             position: sticky;
             left: 0;
             z-index: 100;
             background-color: gray;
         }
+        
     </style>
 </body>
 </html>