出窑 等要的数据

wwwroot/mes/rpt/rpt026/rpt.ashx

@@ -1747,6 +1747,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
           FROM  (
                  SELECT DISTINCT CASE  WHEN p.procedureid = 34 THEN  26 ELSE  p.procedureid  END procedureid
                  ,p.goodsid 
+                 ,p.barcode
                  FROM TP_PM_PRODUCTIONDATA P
                  INNER JOIN TP_MST_GOODS G
                     ON P.GOODSID = G.GOODSID 
@@ -1761,8 +1762,9 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                   AND  G.GOODSCODE IN({goodsCodes})
                  UNION ALL
 
-                SELECT DISTINCT CASE  WHEN p.procedureid =24 THEN  34 ELSE  p.procedureid  END procedureid
+                SELECT DISTINCT CASE  WHEN p.procedureid = 24 THEN  34 ELSE  p.procedureid  END procedureid
                     ,p.goodsid 
+                    ,p.barcode
                     FROM TP_PM_PRODUCTIONDATA P
                     INNER JOIN TP_MST_GOODS G
                     ON P.GOODSID = G.GOODSID 
@@ -1779,6 +1781,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     UNION ALL
                     SELECT DISTINCT CASE  WHEN p.procedureid IN (21, 31) THEN  53 ELSE  p.procedureid  END procedureid
                      ,p.goodsid 
+                    ,p.barcode
                      FROM TP_PM_PRODUCTIONDATA P
                      INNER JOIN TP_MST_GOODS G
                         ON P.GOODSID = G.GOODSID 
@@ -1827,6 +1830,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
           FROM  (
                  SELECT DISTINCT CASE  WHEN p.procedureid = 34 THEN  26 ELSE  p.procedureid  END procedureid
                  ,p.goodsid 
+                 ,p.barcode
                  FROM TP_PM_PRODUCTIONDATA P
                  INNER JOIN TP_MST_GOODS G
                     ON P.GOODSID = G.GOODSID 
@@ -1843,6 +1847,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
 
                 SELECT DISTINCT CASE  WHEN p.procedureid =24 THEN  34 ELSE  p.procedureid  END procedureid
                     ,p.goodsid 
+                    ,p.barcode
                     FROM TP_PM_PRODUCTIONDATA P
                     INNER JOIN TP_MST_GOODS G
                     ON P.GOODSID = G.GOODSID 
@@ -1859,6 +1864,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     UNION ALL
                     SELECT DISTINCT CASE  WHEN p.procedureid IN (21, 31) THEN  53 ELSE  p.procedureid  END procedureid
                      ,p.goodsid 
+                    ,p.barcode
                      FROM TP_PM_PRODUCTIONDATA P
                      INNER JOIN TP_MST_GOODS G
                         ON P.GOODSID = G.GOODSID