超节损优化

application/api/controller/OrderSuperLoss.php

@@ -1600,6 +1600,7 @@ class OrderSuperLoss extends Api
                 '印件工序产量' => $value['工序产量'],
                 '班组产量' => $value['total_cl'],
                 '班组制程废品' => $value['sczl_zcfp'],
+                '工单质检废' => $data['工单质检废'],
                 '班组质检废品' => $value['zjfp'],
                 '班组分摊质检废品' => $value['质检废'],
                 '无班组废品' => 0,
@@ -1737,7 +1738,7 @@ class OrderSuperLoss extends Api
         b.`零头处理`,  
         b.`外发废`,  
         SUM(b.`班组制程废品`) AS zcfp,  
-        SUM(b.`班组分摊质检废品`) AS 工单质检废  
+        `工单质检废` AS 工单质检废  
     ';
         $list = \db('成品入仓')
             ->alias('a')
@@ -1824,7 +1825,7 @@ class OrderSuperLoss extends Api
             `零头处理`,  
             `外发废`,  
             SUM(`班组制程废品`) AS `zcfp`,  
-            SUM(`班组分摊质检废品`) AS `班组分摊质检废品`,  
+            `工单质检废` AS `班组分摊质检废品`,  
             `订单数量`,  
             `销售订单号`
             
@@ -1835,7 +1836,6 @@ class OrderSuperLoss extends Api
             ->group('Gy0_gdbh, `印件及工序`')
             ->order('sys_rq DESC')
             ->find();
-        $list['班组分摊质检废品'] = $list['废品合计'] - $list['zcfp'];
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
         $list['target_rate'] = ($list['实际投料']-$list['计划损耗'])/$list['实际投料']*100;
@@ -1956,7 +1956,7 @@ class OrderSuperLoss extends Api
             `零头处理`,  
             `外发废`,  
             SUM(`班组制程废品`) AS `zcfp`,  
-            SUM(`班组分摊质检废品`) AS `班组分摊质检废品`,  
+            `工单质检废` AS `班组分摊质检废品`,  
             `订单数量`,  
             `销售订单号`
             
@@ -1968,7 +1968,6 @@ class OrderSuperLoss extends Api
             ->order('sys_rq DESC')
             ->find();
 
-        $list['班组分摊质检废品'] = $list['废品合计'] - $list['zcfp'];
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
         $list['target_rate'] = ($list['实际投料']-$list['计划损耗'])/$list['实际投料']*100;