工艺计划产量优化，实际合格率优化

application/api/controller/OrderSuperLoss.php

@@ -1831,7 +1831,7 @@ class OrderSuperLoss extends Api
             if ($value['实际投料'] !== null){
                 $actualMaterial = $value['实际投料'] * 10000;
                 $list[$key]['target_rate'] = $this->calculateRate($actualMaterial, $value['工单计划损耗']);
-                $list[$key]['real_rate'] = $value['warehousing_num']/($value['实际投料']*10000*$Multiple)*100;
+                $list[$key]['real_rate'] = $value['warehousing_num']/($value['实际投料']*10000)*100;
                 $list[$key]['real_rate'] = number_format($list[$key]['real_rate'], 2).'%';
             }else{
                 $list[$key]['target_rate'] = null;

application/api/controller/WorkOrder.php

@@ -2721,12 +2721,19 @@ class WorkOrder extends Api
         }
         //计算损耗定额和计划产量
         $production = [];
-        $i = 0;
+        $i = $m = 0;
         foreach ($processList as $key=>$value){
+            if (strpos($v['工序名称'],'分切') !== false) {
+                $m = $key;
+            }
             if ($key === 0){
                 array_push($production,$feed);
             }else{
-                $production[$key] = $production[$key]/$value['Gy0_ls'];
+                if ($key === $m+1){
+                    $production[$key] = $production[$key]/$value['Gy0_ls']/$Multiple;
+                }else{
+                    $production[$key] = $production[$key]/$value['Gy0_ls'];
+                }
             }
             $wastage = 0;
             if ($value['损耗率'] !== 0 && !empty($value['损耗率'])){
@@ -2735,7 +2742,7 @@ class WorkOrder extends Api
             if ($value['Gy0_ms'] >0 && !empty($value['Gy0_ms'])){
                 $wastage = round($wastage * $value['Gy0_ms']);
             }
-            array_push($production,ceil($production[$key]-$wastage)*$value['Gy0_ls']/$Multiple);
+            array_push($production,ceil($production[$key]-$wastage)*$value['Gy0_ls']);
             $processSql = \db('工单_工艺资料')
                 ->where('UniqId',$value['UniqId'])
                 ->fetchSql(true)