Merge branch 'master' of http://dev.ccwin-in.com:3000/Adient/CD-MES

APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs

@@ -321,7 +321,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan
                 }
                 if (workcellcode == "BRIM_WELDING_BC316")
                 {
-                    sql.AppendFormat(" ORDER BY	W.[PLAN_DATE]) A  ");
+                    sql.AppendFormat(" ORDER BY	W.ORDER_TYPE, W.[PLAN_DATE]) A  ");
                     sql.AppendFormat(" ORDER BY A.[UPDATEDATE],A.[PRI],A.[PLAN_DATE],A.PLAN_SEQ,A.[SEQ],A.[MATERIAL_CODE] ");
                 }
                 else
@@ -842,7 +842,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan
      
                 if (workcellcode == "BRIM_WELDING_BC316")
                 {
-                    sql.AppendFormat(" ORDER BY	W.[PLAN_DATE]) A  ");
+                    sql.AppendFormat(" ORDER BY	W.ORDER_TYPE, W.[PLAN_DATE]) A  ");
                     sql.AppendFormat(" ORDER BY A.[UPDATEDATE],A.[PRI],A.[PLAN_DATE],A.PLAN_SEQ,A.[SEQ],A.[MATERIAL_CODE] ");
                 }
                 else