unknown 4 сар өмнө
parent
commit
6343bd9f2b

+ 30 - 28
application/api/controller/OrderSuperLoss.php

@@ -1910,26 +1910,27 @@ class OrderSuperLoss extends Api
             ->where('Gy0_yjno', $param['yjno'])
             ->field('CONCAT(rtrim(Gy0_gxmc),"[",rtrim(Add_gxmc),"]") as 工序名称,Gy0_ls as 联数')
             ->select();
-        $number1 = $number2 = 1;
-        foreach ($processDetail as $k => $v) {
-            if (strpos($v['工序名称'],'分切') !== false) {
-                $number1 = $v['联数'];
-            }
-            if (strpos($v['工序名称'],'分切') === false && $v['联数'] > 1) {
-                $number2 = $v['联数'];
-            }
-        }
-        $Multiple = $number1/$number2;
-        if (is_int($Multiple) === false) {
-            $Multiple = 1;
-        }
+//        $number1 = $number2 = 1;
+//        foreach ($processDetail as $k => $v) {
+//            if (strpos($v['工序名称'],'分切') !== false) {
+//                $number1 = $v['联数'];
+//            }
+//            if (strpos($v['工序名称'],'分切') === false && $v['联数'] > 1) {
+//                $number2 = $v['联数'];
+//            }
+//        }
+//        $Multiple = $number1/$number2;
+//        if (is_int($Multiple) === false) {
+//            $Multiple = 1;
+//        }
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
         $list['target_rate'] = ($list['实际投料']-$list['计划损耗'])/$list['实际投料']*100;
         $list['target_rate'] = number_format($list['target_rate'],2);
         $list['target_rate'] = $list['target_rate'].'%';
         //实际合格率
-        $list['real_rate'] = $list['warehousing_num']/($list['实际投料']*$Multiple)*100;
+//        $list['real_rate'] = $list['warehousing_num']/($list['实际投料']*$Multiple)*100;
+        $list['real_rate'] = $list['warehousing_num']/($list['实际投料'])*100;
         $list['real_rate'] = number_format($list['real_rate'],2);
         $list['real_rate'] = $list['real_rate'].'%';
 
@@ -2062,19 +2063,19 @@ class OrderSuperLoss extends Api
             ->where('Gy0_yjno', $param['yjno'])
             ->field('CONCAT(rtrim(Gy0_gxmc),"[",rtrim(Add_gxmc),"]") as 工序名称,Gy0_ls as 联数')
             ->select();
-        $number1 = $number2 = 1;
-        foreach ($processDetail as $k => $v) {
-            if (strpos($v['工序名称'],'分切') !== false) {
-                $number1 = $v['联数'];
-            }
-            if (strpos($v['工序名称'],'分切') === false && $v['联数'] > 1) {
-                $number2 = $v['联数'];
-            }
-        }
-        $Multiple = $number1/$number2;
-        if (is_int($Multiple) === false) {
-            $Multiple = 1;
-        }
+//        $number1 = $number2 = 1;
+//        foreach ($processDetail as $k => $v) {
+//            if (strpos($v['工序名称'],'分切') !== false) {
+//                $number1 = $v['联数'];
+//            }
+//            if (strpos($v['工序名称'],'分切') === false && $v['联数'] > 1) {
+//                $number2 = $v['联数'];
+//            }
+//        }
+//        $Multiple = $number1/$number2;
+//        if (is_int($Multiple) === false) {
+//            $Multiple = 1;
+//        }
 
         $list['实际投料'] = $list['实际投料']*10000;
         //目标合格率
@@ -2082,7 +2083,8 @@ class OrderSuperLoss extends Api
         $list['target_rate'] = number_format($list['target_rate'],2);
         $list['target_rate'] = $list['target_rate'].'%';
         //实际合格率
-        $list['real_rate'] = $list['warehousing_num']/($list['实际投料']*$Multiple)*100;
+//        $list['real_rate'] = $list['warehousing_num']/($list['实际投料']*$Multiple)*100;
+        $list['real_rate'] = $list['warehousing_num']/($list['实际投料'])*100;
         $list['real_rate'] = number_format($list['real_rate'],2);
         $list['real_rate'] = $list['real_rate'].'%';
         //班组数据