|
@@ -29,18 +29,15 @@ class ProductionLot extends Api
|
|
|
$this->success('请求错误');
|
|
$this->success('请求错误');
|
|
|
}
|
|
}
|
|
|
$param = $this->request->param();
|
|
$param = $this->request->param();
|
|
|
-// $where = [
|
|
|
|
|
-// 'gd_statu' => '1-已完工',
|
|
|
|
|
-// ];
|
|
|
|
|
if (empty($param['search'])){
|
|
if (empty($param['search'])){
|
|
|
$where['Mod_rq'] = ['between',[date('Y-m-d 00:00:00',time()-1209600),date('Y-m-d H:i:s',time())]];
|
|
$where['Mod_rq'] = ['between',[date('Y-m-d 00:00:00',time()-1209600),date('Y-m-d H:i:s',time())]];
|
|
|
}else{
|
|
}else{
|
|
|
- $where['Gd_gdbh|Gd_客户代号|成品名称'] = ['like','%'.$param['search'].'%'];
|
|
|
|
|
|
|
+ $where['Gd_gdbh|Gd_客户代号|成品名称|Gd_cpmc'] = ['like','%'.$param['search'].'%'];
|
|
|
}
|
|
}
|
|
|
$list = \db('工单_基本资料')
|
|
$list = \db('工单_基本资料')
|
|
|
->field('Gd_gdbh,Gd_cpmc,行号')
|
|
->field('Gd_gdbh,Gd_cpmc,行号')
|
|
|
->where($where)
|
|
->where($where)
|
|
|
- ->group('行号')
|
|
|
|
|
|
|
+ ->group('Gd_gdbh,Gd_cpmc,行号')
|
|
|
->select();
|
|
->select();
|
|
|
if (empty($list)){
|
|
if (empty($list)){
|
|
|
$this->success('未找到工单');
|
|
$this->success('未找到工单');
|