超节损实际合格率优化

application/api/controller/OrderSuperLoss.php

@@ -1732,7 +1732,8 @@ class OrderSuperLoss extends Api
 
             $actualMaterial = $value['实际投料'] * 10000;
             $list[$key]['target_rate'] = $this->calculateRate($actualMaterial, $value['工单计划损耗']);
-            $list[$key]['real_rate'] = $this->calculateRate($actualMaterial, $value['废品合计']);
+            $list[$key]['real_rate'] = $value['warehousing_num']/$value['实际投料']*100;
+            $list[$key]['real_rate'] = number_format($list[$key]['real_rate'], 2).'%';
             $list[$key]['reward_rate'] = '1'; // or some logic if needed
         }
 
@@ -1806,7 +1807,7 @@ class OrderSuperLoss extends Api
         $list['target_rate'] = number_format($list['target_rate'],2);
         $list['target_rate'] = $list['target_rate'].'%';
         //实际合格率
-        $list['real_rate'] = ($list['实际投料']-$list['废品合计'])/$list['实际投料']*100;
+        $list['real_rate'] = $list['warehousing_num']/$list['实际投料']*100;
         $list['real_rate'] = number_format($list['real_rate'],2);
         $list['real_rate'] = $list['real_rate'].'%';
 
@@ -1838,27 +1839,12 @@ class OrderSuperLoss extends Api
             $gy_data[$key]['total_waste'] = $value['Gy0_无形损'] + $value['total_fp'] + $value['waste_quality'];
             //工序实际报废率
             $gy_data[$key]['actual_loss_rate'] = ((number_format($gy_data[$key]['total_waste']/$list['实际投料'],4))*100).'%';
-            //占投料报废率
-            $gy_data[$key]['loss_rate'] = ((number_format(($value['Gy0_计划损耗']-$gy_data[$key]['total_waste'])/$list['实际投料'],4))*100).'%';
             //工序目标报废率
             $gy_data[$key]['target_loss_rate'] = ((number_format($value['Gy0_计划损耗']/$list['实际投料'],4))*100).'%';
+            //占投料报废率
+            $gy_data[$key]['loss_rate'] = ((number_format(($value['Gy0_计划损耗']-$gy_data[$key]['total_waste'])/$list['实际投料'],4))*100).'%';
         }
         $list['gy_data'] = $gy_data;
-        //工单节损数据
-//        $total_field = '
-//            `班组分摊质检废品` as total_waste,
-//            SUM(`班组质检废品`) as total_zjfp,
-//            SUM(`班组制程废品`) as total_fp,
-//            SUM(DISTINCT `计划损耗`) AS plan_loss,
-//            `材料废`,
-//            `印件无形损` as waste_intangible,
-//            SUM(CjsSl) as loss,
-//            SUM(CjsJe) as reward
-//        ';
-//        $total = \db('工单_质量考核汇总')
-//            ->where($where)
-//            ->field($total_field)
-//            ->find();
         $total = [
             'total_waste' => 0,
             'total_zjfp' => 0,
@@ -1953,7 +1939,7 @@ class OrderSuperLoss extends Api
         $list['target_rate'] = number_format($list['target_rate'],2);
         $list['target_rate'] = $list['target_rate'].'%';
         //实际合格率
-        $list['real_rate'] = ($list['实际投料']-$list['废品合计'])/$list['实际投料']*100;
+        $list['real_rate'] = $list['warehousing_num']/$list['实际投料']*100;
         $list['real_rate'] = number_format($list['real_rate'],2);
         $list['real_rate'] = $list['real_rate'].'%';
         //班组数据