优化扩单功能

application/admin/controller/Feeding.php

@@ -179,12 +179,12 @@ class Feeding extends Backend
         if($num){//如果有,批次号重复,需精确查找
             $res = Db::name('task')->alias('t')
                 ->join('formula_detail f','f.pid=t.fid','left')
-                ->field('f.material,f.percentage,f.gy_name,f.gy_num,t.number,t.id')
+                ->field('f.material,f.percentage,f.gy_name,f.gy_num,t.number,t.id,t.kuodan')
                 ->where('t.bach',$bach)->where('t.number',$num)->select();
         }else{//如果没有,,批次号未重复,直接差出数据
             $res = Db::name('task')->alias('t')
                 ->join('formula_detail f','t.fid = f.pid','left')
-                ->field('f.material,f.percentage,f.gy_name,f.gy_num,t.number,t.id')
+                ->field('f.material,f.percentage,f.gy_name,f.gy_num,t.number,t.id,t.kuodan')
                 ->where('t.bach',$bach)->select();
         }
         $pro = 0;
@@ -218,12 +218,21 @@ class Feeding extends Backend
                 $total[$key] = decode($value);
             }
             $num = array_sum($total);
-            if($v['percentage']){
-//                $v['nweight'] = number_format(decode($v['percentage']) / $num * $v['number'],3);
-                $number = ceil(decode($v['percentage']) / $num * $v['number'] *1000);
-                $v['nweight'] = number_format($number/1000,3);
+            if($v['kuodan']){
+                $kd_sum = $v['number']+$v['kuodan'];
+                if($v['percentage']){
+                    $number = ceil(decode($v['percentage']) / $num * $kd_sum *1000);
+                    $v['nweight'] = number_format($number/1000,3);
+                }else{
+                    $v['nweight']='';
+                }
             }else{
-                $v['nweight']='';
+                if($v['percentage']){
+                    $number = ceil(decode($v['percentage']) / $num * $v['number'] *1000);
+                    $v['nweight'] = number_format($number/1000,3);
+                }else{
+                    $v['nweight']='';
+                }
             }
         }
         $row['total']=$num;

application/admin/controller/Task.php

@@ -152,7 +152,8 @@ class Task extends Backend
             $gyinfo[$key]['percentage'] =  decode($value['percentage']);
             if($task['kuodan']){
                 if (!empty($value['percentage'])){
-                    $number = ceil($gyinfo[$key]['percentage'] / $num * $task['number']+$task['number'] *1000);
+                    $kd_sum = $task['number']+$task['kuodan'];
+                    $number = ceil($gyinfo[$key]['percentage'] / $num * $kd_sum *1000);
                 }
             }else{
                 if (!empty($value['percentage'])){

public/assets/js/backend/formula.js

@@ -460,8 +460,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
                                     $.each(data.data,function (key,value){
                                         if (id == value.id){
+                                            console.log(value2);
                                             var kd_number = Math.ceil(value.percentage / value.numm * (Number(number)+Number(value2)) * 1000);
                                             var kd_num = (kd_number / 1000).toFixed(3);
+                                            console.log(kd_number);
+                                            console.log(kd_num);
                                             if(isNaN(kd_num)){
                                                 kd_num = '';
                                             }