|
|
@@ -129,8 +129,8 @@ class Formula extends Backend
|
|
|
$data[$key]['is_replace'] = 1;
|
|
|
$is_replace = 1;
|
|
|
}
|
|
|
- $data[$key]['material'] = encrypt($value[0]);
|
|
|
- $data[$key]['percentage'] = $value[1];
|
|
|
+ $data[$key]['material'] = $value[0];
|
|
|
+ $data[$key]['percentage'] = encrypt($value[1]);
|
|
|
$data[$key]['gy_name'] = $value[2];
|
|
|
$data[$key]['gy_num'] = $value[3];
|
|
|
$data[$key]['pid'] = $pid;
|
|
|
@@ -189,7 +189,7 @@ class Formula extends Backend
|
|
|
}
|
|
|
$list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
|
|
|
foreach ($list['gyinfo'] as $key=>$value){
|
|
|
- $list['gyinfo'][$key]['material'] = decode($value['material']);
|
|
|
+ $list['gyinfo'][$key]['percentage'] = decode($value['percentage']);
|
|
|
}
|
|
|
$this->view->assign('ids',$ids);
|
|
|
$this->view->assign('name',$name);
|
|
|
@@ -300,8 +300,8 @@ class Formula extends Backend
|
|
|
$data[$i]['is_replace'] = 1;
|
|
|
$is_replace = 1;
|
|
|
}
|
|
|
- $data[$i]['material'] = encrypt($formula[$i][0]);
|
|
|
- $data[$i]['percentage'] = $formula[$i][1];
|
|
|
+ $data[$i]['material'] = $formula[$i][0];
|
|
|
+ $data[$i]['percentage'] = encrypt($formula[$i][1]);
|
|
|
$data[$i]['gy_name'] = $formula[$i][2];
|
|
|
$data[$i]['gy_num'] = $formula[$i][3];
|
|
|
$data[$i]['pid'] = $ids;
|
|
|
@@ -320,7 +320,7 @@ class Formula extends Backend
|
|
|
$material = explode('/',$v['material']);
|
|
|
for ($i=0;$i<count($material);$i++){
|
|
|
$replaceData[$j]['fid'] = $v['id'];
|
|
|
- $replaceData[$j]['material'] = encrypt($material[$i]);
|
|
|
+ $replaceData[$j]['material'] = $material[$i];
|
|
|
$replaceData[$j]['create'] = date('Y-m-d H:i:s');
|
|
|
$j++;
|
|
|
}
|
|
|
@@ -347,7 +347,7 @@ class Formula extends Backend
|
|
|
$list = Db::name('formula')->where('id',$ids)->find();
|
|
|
$list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('id,material,percentage,gy_name,gy_num')->select();
|
|
|
foreach ($list['gyinfo'] as $key=>$value){
|
|
|
- $list['gyinfo'][$key]['material'] = decode($value['material']);
|
|
|
+ $list['gyinfo'][$key]['percentage'] = decode($value['percentage']);
|
|
|
}
|
|
|
$this->view->assign('ids',$ids);
|
|
|
$this->view->assign('row', $list);
|
|
|
@@ -422,7 +422,7 @@ class Formula extends Backend
|
|
|
}
|
|
|
$list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
|
|
|
foreach ($list['gyinfo'] as $key=>$value){
|
|
|
- $list['gyinfo'][$key]['material'] = decode($value['material']);
|
|
|
+ $list['gyinfo'][$key]['material'] = decode($value['percentage']);
|
|
|
}
|
|
|
$this->view->assign('ids',$ids);
|
|
|
$this->view->assign('name',$name);
|
|
|
@@ -468,15 +468,19 @@ class Formula extends Backend
|
|
|
if (empty($gyinfo)){
|
|
|
return array('status'=>0,'msg'=>'数据错误');
|
|
|
}
|
|
|
- $total = Db::name('formula_detail')->where('pid',$params['ids'])->where('version',$list['version'])->sum('percentage');
|
|
|
+ $total = Db::name('formula_detail')->where('pid',$params['ids'])->where('version',$list['version'])->column('percentage');
|
|
|
if (empty($total)){
|
|
|
return array('status'=>0,'msg'=>'数据错误');
|
|
|
}
|
|
|
+ foreach ($total as $k=>$v){
|
|
|
+ $total[$k] = decode($v);
|
|
|
+ }
|
|
|
+ $num = array_sum($total);
|
|
|
foreach ($gyinfo as $key=>$value){
|
|
|
- $gyinfo[$key]['material']= decode($value['material']);
|
|
|
$gyinfo[$key]['num'] = '';
|
|
|
+ $gyinfo[$key]['percentage'] = decode($value['percentage']);
|
|
|
if (!empty($value['percentage'])){
|
|
|
- $gyinfo[$key]['num'] = number_format($value['percentage'] / $total * $params['number'],3);
|
|
|
+ $gyinfo[$key]['num'] = number_format($gyinfo[$key]['percentage'] / $num * $params['number'],3);
|
|
|
}
|
|
|
}
|
|
|
$date = date('Y/m/d');
|
