@@ -747,7 +747,7 @@ class MachineProductionReport extends Api
->where('适用机型',$req['sczl_jtbh'])
->find();
$list = db('dic_lzde')
- ->field('sys_bh,rtrim(sys_mc)')
+ ->field('sys_bh,rtrim(sys_mc) AS sys_mc')
->where('Parent',$row['Key_'])
->select();
if (empty($list)){
@@ -29,9 +29,9 @@ class ProductionLot extends Api
$this->error('请求错误');
}
$param = $this->request->param();
- $where = [
- 'gd_statu' => '1-已完工',
- ];
+// $where = [
+// 'gd_statu' => '1-已完工',
+// ];
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())]];
}else{