|
|
@@ -86,7 +86,7 @@ class Deliver extends Backend
|
|
|
$order = input('order');
|
|
|
$offset = input('offset');
|
|
|
$limit = input('limit');
|
|
|
- $total = $large->name($userInfo['company'].'_'.'qcode_large')->where($where)->whereIn('bach_id',$bach_id)->count();
|
|
|
+ $total = $large->name($userInfo['company'].'_'.'qcode_large')->where('l_status',0)->where($where)->whereIn('bach_id',$bach_id)->count();
|
|
|
$large_list = $large->name($userInfo['company'].'_'.'qcode_large')
|
|
|
->order('creat_time',$order)
|
|
|
->where($where)
|
|
|
@@ -232,9 +232,10 @@ class Deliver extends Backend
|
|
|
if ($res === false){
|
|
|
$this->error('发货失败');
|
|
|
}
|
|
|
- $lager->name($userinfo['company'].'_'.'qcode_large')->where('bach_id',$v)->whereIn('_id',$lagerId)->update(['l_status'=>1]);
|
|
|
+ $lager = new QcodeLarge();
|
|
|
+ $result =$lager->name($userinfo['company'].'_'.'qcode_large')->where('bach_id',$v)->whereIn('_id',$lagerId)->update(['l_status'=>1]);
|
|
|
}
|
|
|
- $this->success();
|
|
|
+ $this->success('成功');
|
|
|
}
|
|
|
/**
|
|
|
* 表格数据处理
|
|
|
@@ -358,7 +359,7 @@ class Deliver extends Backend
|
|
|
header('Content-Disposition:attachment;filename='.$filename);
|
|
|
header('Cache-Control: max-age=0');
|
|
|
header("Content-Type:text/html;charset=utf-8");
|
|
|
- if(is_dir(ROOT_PATH.'public/uploads/export/') === null)
|
|
|
+ if(is_dir(ROOT_PATH.'public/uploads/export/') === false)
|
|
|
{
|
|
|
mkdir(ROOT_PATH.'public/uploads/export/',0777,true);
|
|
|
}
|