1

wwwroot/mes/rpt/rpt141/rpt.ashx

@@ -414,7 +414,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                   LEFT JOIN tp_mst_logo logo
                     ON pd.logoid = logo.logoid
                  WHERE pmd.valueflag = '1' 
-                   AND pd.ModelType = -1
+                   AND pd.ModelType in(-1,-4,-5)
                    AND pmd.AccountID = @AccountID@");
                     
                 if (!string.IsNullOrWhiteSpace(barcode))
@@ -567,7 +567,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                   LEFT JOIN tp_mst_logo logo
                     ON pd.logoid = logo.logoid
                  WHERE pmd.valueflag = '1' 
-                   AND pd.ModelType = -1
+                   AND pd.ModelType in (-1,-4,-5) 
                    AND pmd.AccountID = @AccountID@");
                     
 
@@ -675,7 +675,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     ON pmd.DefectFine = mstdf.DefectFineID
                   LEFT JOIN tp_mst_logo logo ON pd.logoid = logo.logoid
                  WHERE pmd.valueflag = '1' 
-                   AND pd.ModelType = -1
+                   AND pd.ModelType in(-1,-4,-5)
                    AND pmd.AccountID = @AccountID@
                 ");
                     
                //生产工序
                string completeprocedure = context.Request["completeprocedure"] + context.Request["completeprocedure[]"];
                sqlPara.Add(new CDAParameter("ProProcedureIDS", !string.IsNullOrEmpty(completeprocedure) ? completeprocedure : null));