|
|
@@ -400,6 +400,7 @@ class WorkOrderVerification extends Api
|
|
|
$searchArr = explode('-',$wasteType[1]);
|
|
|
$where['a.sczl_gdbh'] = $params['order'];
|
|
|
$where['a.sczl_yjno'] = $params['yjno'];
|
|
|
+ //模切和凹凸的废品类型相同
|
|
|
if ($searchArr[1] === '模切凹凸'){
|
|
|
$list = db('设备_产量计酬')->alias('a')
|
|
|
->join('人事_基本资料 b', 'a.sczl_bh1 = b.员工编号', 'left')
|
|
|
@@ -905,7 +906,9 @@ class WorkOrderVerification extends Api
|
|
|
->join('工单_印件资料 c','a.qczl_gdbh = c.Yj_Gdbh','left')
|
|
|
->join('成品入仓 d','a.qczl_gdbh = d.jjcp_gdbh','left')
|
|
|
->where($where)
|
|
|
- ->field($field)->select();
|
|
|
+ ->field($field)
|
|
|
+ ->group('qczl_yjno')
|
|
|
+ ->select();
|
|
|
$list = [];
|
|
|
$j = 0;
|
|
|
foreach ($data as $entry) {
|
