条码排序

wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

@@ -158,16 +158,19 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL) 
                            AND PD.GOODSCODE IN( '" + gs + @"' )
                            AND GL.BUILDINGNO {BUILDINGNO} ";
+                        sqlDetail += " order by pd.Barcode ";
                         break;
                     }
                 case "U级":
                     {
                         sqlDetail += @"  where T.GOODSLEVELTYPEID = 4 and T.H_FLAG = 0";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "A级":
                     {
                         sqlDetail += @"  where T.GOODSLEVELTYPEID = 5 and T.H_FLAG = 0";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "AA级":
@@ -208,11 +211,13 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
 				            PDD.GOODSLEVELTYPEID,
 				            PDD.GOODSID,
 				            PDD.REWORKPROCEDUREID   ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  T.GOODSLEVELTYPEID IN ( 4, 5 ) AND RPD.PROCEDUREID IN ( 22, 23, 37, 20, 41 )  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "去AA":
                     {
                         sqlDetail += @"  where  T.GOODSLEVELTYPEID = 7  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "检验数":
@@ -250,6 +255,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID  where  rpd.procedureid IN (22, 23, 37, 20, 41)  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "再去AA":
@@ -281,17 +287,20 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid ,pd.checkbatchno  ) T  
                                 where mpdid > 0 and checkbatchno > 1  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "F级":
                     {
                         sqlDetail += @"  where T.GOODSLEVELTYPEID = 20   and T.H_FLAG = "
                         + ((proc == "13" || proc == "35") ? 0 : 1);
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "R级":
                     {
                         sqlDetail += @"   where T.GOODSLEVELTYPEID = 6 AND T.REWORKPROCEDUREID = 19 and T.H_FLAG = 0";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "研磨":
@@ -329,6 +338,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 20 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "直接冷补":
@@ -366,6 +376,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 22 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "研磨后冷补":
@@ -403,6 +414,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 23 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "堵漏气":
@@ -440,6 +452,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 37 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "刷洗不良":
@@ -477,6 +490,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                          GROUP BY pd.Barcode
                                  ,pd.goodsleveltypeid
                                  ,pd.goodsid  ) T  LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 41 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 default:
@@ -513,6 +527,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                             and to_char(pdp.defectgroupname || '_' || m.defectname)  =  '" + fields + @"'
                                             AND L.BUILDINGNO {BUILDINGNO} 
                                              and not  (d.defectid = 11 AND (p.goodsleveltypeid = 4 OR p.goodsleveltypeid = 5)) ";
+                                sqlDetail += " order by P.Barcode ";
                             }
                             else
                             {
@@ -588,6 +603,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
 				                            AND ( 
 									                pdp.procedureid1 = pp.procedureid OR pdp.procedureid2 = pp.procedureid
 								                )   and  to_char(pdp.defectgroupname || '_' || m.defectname)  =  '" + fields + @"' ";
+                                sqlDetail += " order by P.Barcode ";
                             }
 
                         }
@@ -595,6 +611,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                     }
 
             }
+
             sqlDetail = sqlDetail.Replace("{DEFECT}", defectStr).Replace("{BUILDINGNO}", buding).Replace("{PROCEDUREID}", proc);
             //获取查询条件
             List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt014/rptnew_detail_change.ashx

@@ -140,72 +140,86 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL) 
                            AND PD.GOODSCODE IN( '" + gs + @"' )
                            AND GL.BUILDINGNO {BUILDINGNO} ";
+                        sqlDetail += " order by pd.Barcode ";
                         break;
                     }
                 case "U级":
                     {
                         sqlDetail += @"   where T.GOODSLEVELTYPEID = 4 and T.H_FLAG = 0 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "A级":
                     {
                         sqlDetail += @"  where T.GOODSLEVELTYPEID = 5 and T.H_FLAG = 0";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "AA级":
                     {
                         sqlDetail += @"   LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  T.GOODSLEVELTYPEID IN ( 4, 5 ) AND RPD.PROCEDUREID IN ( 22, 23, 37, 20, 41 )  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "去AA":
                     {
                         sqlDetail += @"  where  T.GOODSLEVELTYPEID = 7  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "检验数":
                     {
                         sqlDetail += @"    LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID  where  rpd.procedureid IN (22, 23, 37, 20, 41)   ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "再去AA":
                     {
                         sqlDetail += @"   where mpdid > 0 and checkbatchno > 1  ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "F级":
                     {
                         sqlDetail += @"   where T.GOODSLEVELTYPEID = 20   and T.H_FLAG = "
                                     + ((proc == "13" || proc == "35") ? 0 : 1);
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "R级":
                     {
                         sqlDetail += @"   where T.GOODSLEVELTYPEID = 6 AND T.REWORKPROCEDUREID = 19 and T.H_FLAG = 0 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "研磨":
                     {
                         sqlDetail += @"   LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 20 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "直接冷补":
                     {
                         sqlDetail += @"   LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 22 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "研磨后冷补":
                     {
                         sqlDetail += @"    LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 23 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "堵漏气":
                     {
                         sqlDetail += @"    LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 37 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 case "刷洗不良":
                     {
                         sqlDetail += @"   LEFT JOIN TP_PM_PRODUCTIONDATA RPD ON RPD.PRODUCTIONDATAID = T.MPDID where  rpd.procedureid = 41 ";
+                        sqlDetail += " order by T.Barcode ";
                         break;
                     }
                 default:
@@ -243,6 +257,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                             and to_char(pdp.defectgroupname || '_' || m.defectname)  =  '" + fields + @"'
                                             AND L.BUILDINGNO {BUILDINGNO} 
                                              and not  (d.defectid = 11 AND (p.goodsleveltypeid = 4 OR p.goodsleveltypeid = 5)) ";
+                                sqlDetail += " order by P.Barcode ";
                             }
                             else
                             {
@@ -318,6 +333,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
 				                            AND ( 
 									                pdp.procedureid1 = pp.procedureid OR pdp.procedureid2 = pp.procedureid
 								                )   and  to_char(pdp.defectgroupname || '_' || m.defectname)  =  '" + fields + @"' ";
+                                sqlDetail += " order by P.Barcode ";
                             }
                         }
                         break;