姜永辉 пре 6 месеци
родитељ
комит
bf18236fd3
1 измењених фајлова са 6 додато и 2 уклоњено
  1. 6 2
      wwwroot/main/ProductCheck/api/GetCompleteProcedureIDPDANew_WCF.ashx

+ 6 - 2
wwwroot/main/ProductCheck/api/GetCompleteProcedureIDPDANew_WCF.ashx

@@ -19,7 +19,7 @@ public class GetCompleteProcedureIDPDANew_WCF : IHttpHandler, IRequiresSessionSt
             DataTable dt = conn.ExecuteDatatable(@"
             DataTable dt = conn.ExecuteDatatable(@"
                 
                 
                 SELECT pd.productiondataid
                 SELECT pd.productiondataid
-                      ,MAX(pmax.productiondataid) pmaxproductiondataid
+                      ,pmax.productiondataid pmaxproductiondataid
                       ,pmax.procedureid COMPLETEPROCEDUREID
                       ,pmax.procedureid COMPLETEPROCEDUREID
                       ,pmax.ProcedureID 
                       ,pmax.ProcedureID 
                       ,pmax.ProductionLineID
                       ,pmax.ProductionLineID
@@ -42,6 +42,8 @@ public class GetCompleteProcedureIDPDANew_WCF : IHttpHandler, IRequiresSessionSt
                  WHERE pd.barcode = @BARCODE@
                  WHERE pd.barcode = @BARCODE@
                    AND pd.valueflag = 1
                    AND pd.valueflag = 1
                    AND pd.procedureid = 15
                    AND pd.procedureid = 15
+                 order by pmax.productiondataid desc
+                /*
                  GROUP BY pd.productiondataid
                  GROUP BY pd.productiondataid
                          ,pmax.procedureid 
                          ,pmax.procedureid 
                         ,pmax.ProductionLineID
                         ,pmax.ProductionLineID
@@ -54,7 +56,9 @@ public class GetCompleteProcedureIDPDANew_WCF : IHttpHandler, IRequiresSessionSt
                       ,pmax.OrganizationID
                       ,pmax.OrganizationID
                       ,pmax.GOODSID
                       ,pmax.GOODSID
                       ,pmax.GOODSCODE
                       ,pmax.GOODSCODE
-                      ,pmax.GOODSNAME
+                      ,pmax.GOODSNAME*/ 
+
+
                 ",
                 ",
                 new CDAParameter("BARCODE", context.Request["barcode"])
                 new CDAParameter("BARCODE", context.Request["barcode"])
                 );
                 );