|
|
@@ -411,12 +411,22 @@ class WorkOrderVerification extends Api
|
|
|
})
|
|
|
->field('distinct(a.sczl_gxmc),a.sczl_bzdh,a.sczl_jtbh,a.sczl_bh1,b.员工姓名 as name')
|
|
|
->select();
|
|
|
- }else{
|
|
|
+ }elseif ($searchArr[1] === '拆片'){
|
|
|
+ $search = substr($searchArr[1],0,6);
|
|
|
+ $where['a.sczl_type'] = array('like','%'.$search.'%');
|
|
|
+ $list = db('db_sczl')->alias('a')
|
|
|
+ ->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')
|
|
|
+ ->select();
|
|
|
+ }
|
|
|
+ else{
|
|
|
$search = substr($searchArr[1],0,6);
|
|
|
$where['a.sczl_type'] = array('like','%'.$search.'%');
|
|
|
$list = db('设备_产量计酬')->alias('a')
|
|
|
->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')
|
|
|
->select();
|
|
|
}
|
|
|
$count = count($list);
|
|
|
@@ -699,7 +709,7 @@ class WorkOrderVerification extends Api
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
$where['Gd_gdbh'] = $params['order'];
|
|
|
- $where['行号'] = 1;
|
|
|
+// $where['行号'] = 1;
|
|
|
//工单基本资料
|
|
|
$info = db('工单_基本资料')->where($where)->field('rtrim(成品代号) as code,rtrim(成品名称) as name')->find();
|
|
|
//工艺资料
|