三个报表的 回收 调整 取复检前的最后一个质量登记

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -192,8 +192,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,0 bzgp
                                   FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (13) 
+                                          FROM TP_PM_PRODUCTIONDATA TP   LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                      
+                                         WHERE   TP.PROCEDUREID IN (13)  AND semicheck.productiondataid IS NULL
                                     --  AND tp.valueflag = 1
                                            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") + @"'
@@ -231,8 +231,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,0 bzgp
                                   FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (35) 
+                                          FROM TP_PM_PRODUCTIONDATA TP   LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                                
+                                         WHERE   TP.PROCEDUREID IN (35)  AND semicheck.productiondataid IS NULL
                                     --  AND tp.valueflag = 1
                                            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") + @"'

wwwroot/mes/rpt/rpt008/rpt_index.html

@@ -93,8 +93,8 @@
                     title: fields + '详细',
                     width: width/2,
                     height: height,
-					url: 'rpt_index_detail.html?fields=' + fields + "&index=" + index + "&gs=" + row["产品编码"]
-                        + "&db=" + $("#datebeginMaster").datetimebox("getValue") + "&de=" + $("#dateendMaster").datetimebox("getValue")
+                    url: 'rpt_index_detail.html?fields=' + fields + "&gs=" + row["产品编码"] + "&logon=" + row["商标"]
+                        + "&db=" + $("#datebeginMaster").datetimebox("getValue") + "&de=" + $("#dateendMaster").datetimebox("getValue") 
                 });
 			} 
         }		 

wwwroot/mes/rpt/rpt008/rpt_index_detail.html

@@ -82,25 +82,25 @@
         }
 
         let params = getQueryParams();
-        console.log(params); // {param1: "value1", param2: "value2"}
+        console.log('rpt_index_detail',params); // {param1: "value1", param2: "value2"}
         
         $(document).ready(function () {
             let params = getQueryParams();
-            $('#loading-mask').show();
+             $('#loading-mask').show();
             //传入的参数
             let queryParams = JSON.parse(localStorage.getItem("SearchSubmit"));
             $('#DataGridMasterGrid').datagridLoadRpt({
                 title: '',
                 idField: 'SID',
                 queryParams: queryParams,
-                url: 'rptnew_detail.ashx?fields=' + params["fields"] + "&index=" + params["index"] + "&gs=" + params["gs"]
-                    + "&db=" + params["db"] + "&de=" + params["de"],
+                url: 'rptnew_detail.ashx?fields=' + params["fields"]   + "&gs=" + params["gs"]
+                    + "&db=" + params["db"] + "&de=" + params["de"] + "&logon=" + params["logon"],
                 fixWidth: 140,
                 mergeWidth: 80,
                 pagination: false,
                 splitChar: '_',
                 onLoadSuccess: function (data) {  
-                    $('#loading-mask').hide();
+                     $('#loading-mask').hide();
                 }
             });
 

wwwroot/mes/rpt/rpt008/rptnew_detail.ashx

@@ -14,9 +14,9 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
     {
         context.Response.ContentType = "text/plain";
         string fields = context.Request["fields"].ToString();
-        int index = Convert.ToInt32(context.Request["index"] + "");
+        // int index = Convert.ToInt32(context.Request["index"] + "");
         string gs = context.Request["gs"].ToString();
-
+        string ln = context.Request["ln"]+""; //商标名称
         #region 取缺陷拼接串
         string buding = null;
         if (context.Request["buildingnoMaster"]  != null && context.Request["buildingnoMaster"].ToString() != "")
@@ -64,6 +64,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                    AND TP.CREATETIME < @DATEEND@ 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+        AND (  o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)   order by TP.Barcode";
@@ -90,6 +91,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                    AND TP.CREATETIME < @DATEEND@ 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)  order by TP.Barcode ";
@@ -131,6 +133,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                    AND RPD.Productiondataid IS NULL   and pdd.goodsleveltypeid IN (4, 5) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)  order by pdd.Barcode ";
@@ -170,19 +173,20 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                    AND RPD.Productiondataid IS NULL   and pdd.goodsleveltypeid IN (4, 5) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL) order by pdd.Barcode  ";
                         break;
                     }
-                 case "包装数_重烧回收":
+                case "包装数_重烧回收":
                 case "合格数_重烧回收":
                     {
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  pdd.Barcode  产品条码 
                                 FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (35)    AND tp.valueflag = 1
+                                          FROM TP_PM_PRODUCTIONDATA TP LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                                     
+                                         WHERE   TP.PROCEDUREID IN (35) AND semicheck.productiondataid IS NULL   --  AND tp.valueflag = 1
                                                 AND TP.createtime >= @DATEBEGIN@
                                                 AND TP.createtime < @DATEEND@ 
                                          GROUP BY TP.GROUTINGDAILYDETAILID 
@@ -213,19 +217,20 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                    AND RPD.Productiondataid IS not NULL  and pdd.goodsleveltypeid IN (4, 5) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)  order by pdd.Barcode ";
                         break;
                     }
-                         case "包装数_本烧回收":
+                case "包装数_本烧回收":
                 case "合格数_本烧回收":
                     {
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  pdd.Barcode  产品条码 
                                 FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (13)   
+                                          FROM TP_PM_PRODUCTIONDATA TP  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                                            
+                                         WHERE   TP.PROCEDUREID IN (13)   AND semicheck.productiondataid IS NULL
                                                 AND TP.createtime >= @DATEBEGIN@
                                                 AND TP.createtime < @DATEEND@                                        
                                          GROUP BY TP.GROUTINGDAILYDETAILID 
@@ -254,6 +259,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                    AND RPD.Productiondataid IS not NULL   and pdd.goodsleveltypeid IN (4, 5) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL)  order by pdd.Barcode  ";
@@ -300,6 +306,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
 								   AND rpd.GOODSCODE IN( '" + gs + @"' ) 
 								   AND  L.BUILDINGNO {BUILDINGNO}
 								   AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 								   AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 								   AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 								   AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL) 
@@ -312,9 +319,9 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                         break;
                     }
 
-                 
-               
-                    
+
+
+
                 case "包装数_改判":
                     {
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  TP_PM_ProductionData.Barcode  产品条码 
@@ -368,6 +375,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
                                     AND TP_PM_ProductionData.GOODSCODE IN( '" + gs + @"' )  
 							        AND  L.BUILDINGNO {BUILDINGNO}
 							        AND (G.LOGOID = @LOGOID@ OR @LOGOID@ IS NULL)
+  AND ( o.logoname =  @logoname@ OR @logoname@ IS NULL)
 							        AND (G.GLAZETYPEID = @GLAZETYPEID@ OR @GLAZETYPEID@ IS NULL)
 							        AND (M.GOODSMODEL = @GOODSMODEL@ OR @GOODSMODEL@ IS NULL)
 							        AND (M.GOODSNAME = @GOODSNAME@ OR @GOODSNAME@ IS NULL) order by TP_PM_ProductionData.Barcode  ";
@@ -387,6 +395,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno  and pdd.checkflag = 3
             sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["de"].ToString()).AddSeconds(1), DataType.DateTime));
             sqlPara.Add(new CDAParameter("GLAZETYPEID", context.Request["glazetypeidMaster"]));
             sqlPara.Add(new CDAParameter("LOGOID", context.Request["logoidMaster"]));
+            sqlPara.Add(new CDAParameter("logoname", context.Request["logon"]));
             sqlPara.Add(new CDAParameter("GOODSMODEL", context.Request["goodsmodelMaster"]));
             sqlPara.Add(new CDAParameter("GOODSNAME", context.Request["goodsnameMaster"]));
             DataTable dt = conn.ExecuteDatatable(sqlDetail, sqlPara.ToArray());

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -374,10 +374,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				            ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID
 										  ,PD.GOODSID,PD.BARCODE
 										  ,PD.GROUTINGDAILYDETAILID  
-							 FROM TP_PM_PRODUCTIONDATA PD 
+							 FROM TP_PM_PRODUCTIONDATA PD    LEFT JOIN tp_pm_productiondata_semicheck semicheck  ON semicheck.productiondataid = pd.productiondataid
 							  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
 								WHERE
-                           PD.PROCEDUREID = @PROCEDUREID@
+                           PD.PROCEDUREID = @PROCEDUREID@  AND semicheck.productiondataid IS NULL
                             -- AND PD.VALUEFLAG = '1'
                            -- AND PD.CHECKBATCHNO = 1  
                            AND PD.CREATETIME >= @DATEBEGIN@
@@ -532,10 +532,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										  ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID
 													  ,PD.GOODSID,PD.BARCODE
 													  ,PD.GROUTINGDAILYDETAILID  
-										 FROM TP_PM_PRODUCTIONDATA PD 
+										 FROM TP_PM_PRODUCTIONDATA PD LEFT JOIN tp_pm_productiondata_semicheck semicheck
+                    ON semicheck.productiondataid = pd.productiondataid
 										  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
 											WHERE
-									   PD.PROCEDUREID = @PROCEDUREID@
+									   PD.PROCEDUREID = @PROCEDUREID@ AND semicheck.productiondataid IS NULL
 										-- AND PD.VALUEFLAG = '1'
 									   -- AND PD.CHECKBATCHNO = 1  
 									   AND PD.CREATETIME >= @DATEBEGIN@
@@ -835,10 +836,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										  ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID
 													  ,PD.GOODSID,PD.BARCODE
 													  ,PD.GROUTINGDAILYDETAILID  
-										 FROM TP_PM_PRODUCTIONDATA PD 
+										 FROM TP_PM_PRODUCTIONDATA PD LEFT JOIN tp_pm_productiondata_semicheck semicheck
+                    ON semicheck.productiondataid = pd.productiondataid 
 										  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
 											WHERE
-									   PD.PROCEDUREID = @PROCEDUREID@
+									   PD.PROCEDUREID = @PROCEDUREID@ AND semicheck.productiondataid IS NULL
 										-- AND PD.VALUEFLAG = '1'
 									   -- AND PD.CHECKBATCHNO = 1  
 									   AND PD.CREATETIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

@@ -182,9 +182,9 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
 				            ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID
 										  ,PD.GOODSID,PD.BARCODE
 										  ,PD.GROUTINGDAILYDETAILID 
-							 FROM TP_PM_PRODUCTIONDATA PD 
+							 FROM TP_PM_PRODUCTIONDATA PD LEFT JOIN tp_pm_productiondata_semicheck semicheck  ON semicheck.productiondataid = pd.productiondataid
 							  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
-								WHERE  PD.PROCEDUREID in ( {PROCEDUREID} ) 
+								WHERE  PD.PROCEDUREID in ( {PROCEDUREID} )    AND semicheck.productiondataid IS NULL
                             -- AND PD.VALUEFLAG = '1'
                            -- AND PD.CHECKBATCHNO = 1 
                            AND PD.CREATETIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt017/rpt.ashx

@@ -71,8 +71,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
                                         (SELECT MAX(tp.productiondataid) productiondataid
                                           ,tp.groutingdailydetailid
-                                              FROM tp_pm_productiondata tp
-                                             WHERE tp.procedureid IN (13, 35) 
+                                              FROM tp_pm_productiondata tp  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid     
+                                             WHERE tp.procedureid IN (13, 35)   AND semicheck.productiondataid IS NULL  
                                                AND tp.createtime >=  @DATEBEGIN@
                                                AND tp.createtime <= @DATEEND@
                                              GROUP BY tp.groutingdailydetailid) maxp