修改排序

wwwroot/mes/rpt/rpt026/rpt.ashx

@@ -851,7 +851,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
          GROUP BY G.goodscode) TT
  GROUP BY GROUPING SETS((TT.GOODS_CODE),())
 ) last 
-left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMODEL".Replace("{goodsCodes}", goodsStr);
+left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY 产品编码".Replace("{goodsCodes}", goodsStr);
                     #endregion
                 }
                 else if (flag == "二期")
@@ -860,7 +860,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
                     #region 二期
                     sqlStr = @"
 select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL 产品型号, last.* from (
-SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品编码
+SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品编码
       ,SUM(TT.A_J_2) AS 精坯期初_二期
       ,SUM(TT.A_J_1) AS 精坯期初_一期
       ,SUM(TT.A_Y_2) AS 釉坯期初_二期
@@ -1633,7 +1633,7 @@ INNER join TP_PM_PRODUCTIONDATA TT ON tt.groutingdailydetailID = t.groutingdaily
 ) TT
  GROUP BY GROUPING SETS((TT.GOODS_CODE),())
 ) last 
-left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMODEL
+left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY 产品编码
 ".Replace("{goodsCodes}", goodsStr);
                     #endregion
                 }
@@ -1643,7 +1643,7 @@ left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMOD
                     #region 
                     sqlStr = @"
 select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL 产品型号, last.* from (
-SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品编码
+SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品编码
       ,SUM(TT.A_J) AS 精坯期初
       ,SUM(TT.A_Y) AS 釉坯期初
       ,SUM(TT.A_S) AS 装窑期初
@@ -1854,7 +1854,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '合计', TT.GOODS_CODE) AS 产品
  GROUP BY GROUPING SETS((TT.GOODS_CODE),())
 
 ) last 
-left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY g.GOODSMODEL
+left join tp_mst_goods g on g.goodscode = last.产品编码  ORDER BY 产品编码
 ".Replace("{goodsCodes}", goodsStr);
                     #endregion
                 }