刘功能优化

application/admin/controller/Feeding.php

@@ -53,6 +53,7 @@ class Feeding extends Backend
         $params = $this->request->post('row/a');
 
         $params = $this->preExcludeFields($params);
+        $tid = Db::name('task')->where('bach',$params['bach'])->order('id desc')->find();
         $arr = [];
         foreach($params['weight'] as $k=>$v){
             if($v){
@@ -64,6 +65,7 @@ class Feeding extends Backend
                 $param['nweight'] = $params['nweight'][$k];
                 $param['material'] = $params['material'][$k];
                 $param['gy_num'] = $params['gy_num'][$k];
+                $param['tid'] = $tid['id'];
                 $arr[] = $param;
             }
         }
@@ -128,7 +130,7 @@ class Feeding extends Backend
         foreach($res as &$v){
             if($process){ //已有工序,接上一次工序
                 foreach ($process as $val){
-                    if(($val['material']==$v['material'] || in_array($val['material'],explode('/',$v['material']))) && $val['t_id']==$v['id']){
+                    if(($val['material']==$v['material'] || in_array($val['material'],explode('/',$v['material']))) && $val['tid']==$v['id']){
                         $v['weight']=$val['weight'];
                         $pro = $val['gy_num'];
                     }