|
@@ -295,6 +295,7 @@ class WorkOrderVerification extends Api
|
|
|
->where('a.Gd_gdbh',$params['order'])
|
|
->where('a.Gd_gdbh',$params['order'])
|
|
|
// ->where('a.行号',1)
|
|
// ->where('a.行号',1)
|
|
|
->field('a.Gd_cpmc,b.yj_Yjno,b.yj_yjmc')
|
|
->field('a.Gd_cpmc,b.yj_Yjno,b.yj_yjmc')
|
|
|
|
|
+ ->group('a.Gd_gdbh,b.yj_Yjno')
|
|
|
->select();
|
|
->select();
|
|
|
$this->success('请求成功',$list);
|
|
$this->success('请求成功',$list);
|
|
|
}
|
|
}
|
|
@@ -555,7 +556,7 @@ class WorkOrderVerification extends Api
|
|
|
$gdInfo['yj_Yjno'] = $gdInfo['yj_Yjno'] > 10 ? $gdInfo['yj_Yjno']:'0'.$gdInfo['yj_Yjno'];
|
|
$gdInfo['yj_Yjno'] = $gdInfo['yj_Yjno'] > 10 ? $gdInfo['yj_Yjno']:'0'.$gdInfo['yj_Yjno'];
|
|
|
$gdInfo['实际投料'] = (int)($gdInfo['实际投料'] * 10000);
|
|
$gdInfo['实际投料'] = (int)($gdInfo['实际投料'] * 10000);
|
|
|
$gdInfo['wasteTotal'] = $wasteTotal;
|
|
$gdInfo['wasteTotal'] = $wasteTotal;
|
|
|
- $finishNum = db('成品入仓')->where('jjcp_gdbh',$params['order'])->sum('jjcp_sl');
|
|
|
|
|
|
|
+ $finishNum = db('成品入仓')->where('jjcp_gdbh',$params['order'])->where('jjxp_yjno',$params['yjno'])->sum('jjcp_sl');
|
|
|
$gdInfo['passRate'] = '';
|
|
$gdInfo['passRate'] = '';
|
|
|
if (!empty($finishNum)){
|
|
if (!empty($finishNum)){
|
|
|
$gdInfo['passRate'] = number_format((int)$finishNum/$gdInfo['实际投料']*100,2).'%';
|
|
$gdInfo['passRate'] = number_format((int)$finishNum/$gdInfo['实际投料']*100,2).'%';
|