|
@@ -387,6 +387,9 @@ class WorkOrderVerification extends Api
|
|
|
if (!isset($params['order']) || empty($params['order'])){
|
|
if (!isset($params['order']) || empty($params['order'])){
|
|
|
$this->error('参数错误');
|
|
$this->error('参数错误');
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!isset($params['yjno']) || empty($params['yjno'])){
|
|
|
|
|
+ $this->error('参数错误');
|
|
|
|
|
+ }
|
|
|
$type = trim($params['type']);
|
|
$type = trim($params['type']);
|
|
|
$waste = db('erp_常用字典')->where('名称','like','%'.$type.'%')->find();
|
|
$waste = db('erp_常用字典')->where('名称','like','%'.$type.'%')->find();
|
|
|
if (empty($waste)){
|
|
if (empty($waste)){
|
|
@@ -397,6 +400,7 @@ class WorkOrderVerification extends Api
|
|
|
$search = substr($searchArr[1],0,6);
|
|
$search = substr($searchArr[1],0,6);
|
|
|
$where['a.sczl_gdbh'] = $params['order'];
|
|
$where['a.sczl_gdbh'] = $params['order'];
|
|
|
$where['a.sczl_type'] = array('like','%'.$search.'%');
|
|
$where['a.sczl_type'] = array('like','%'.$search.'%');
|
|
|
|
|
+ $where['a.sczl_yjno'] = $params['yjno'];
|
|
|
$list = db('设备_产量计酬')->alias('a')
|
|
$list = db('设备_产量计酬')->alias('a')
|
|
|
->join('人事_基本资料 b','a.sczl_bh1 = b.员工编号','left')
|
|
->join('人事_基本资料 b','a.sczl_bh1 = b.员工编号','left')
|
|
|
->where($where)->field('distinct(a.sczl_gxmc),a.sczl_bzdh,a.sczl_jtbh,a.sczl_bh1,b.员工姓名 as name')
|
|
->where($where)->field('distinct(a.sczl_gxmc),a.sczl_bzdh,a.sczl_jtbh,a.sczl_bh1,b.员工姓名 as name')
|
