|
|
@@ -2857,18 +2857,23 @@ class Whlabel_bh extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
$fid_list = array_column($list,'fid');
|
|
|
- $tmp_list = $this->whlabel_bh_transfer->find_all(" id in (".implode(",",$fid_list).") ","id,wbid,orderinfo,jm,pm,time,label","id asc");
|
|
|
- $tmp_list = array_column($tmp_list,null,'id');
|
|
|
- foreach($list as $k=>$v){
|
|
|
- if(isset($tmp_list[$k])){
|
|
|
- $list[$v['fid']]['wbid'] = $tmp_list[$k]['wbid'];
|
|
|
- $list[$v['fid']]['orderinfo'] = $tmp_list[$k]['orderinfo'];
|
|
|
- $list[$v['fid']]['jm'] = $tmp_list[$k]['jm'];
|
|
|
- $list[$v['fid']]['pm'] = $tmp_list[$k]['pm'];
|
|
|
- $list[$v['fid']]['sl'] = 1;
|
|
|
- $list[$v['fid']]['label'] = $tmp_list[$k]['label'];
|
|
|
+ if(empty($fid_list)){
|
|
|
+ $tmp_list = $this->whlabel_bh_transfer->find_all(" id in (".implode(",",$fid_list).") ","id,wbid,orderinfo,jm,pm,time,label","id asc");
|
|
|
+ $tmp_list = array_column($tmp_list,null,'id');
|
|
|
+ foreach($list as $k=>$v){
|
|
|
+ if(isset($tmp_list[$k])){
|
|
|
+ $list[$v['fid']]['wbid'] = $tmp_list[$k]['wbid'];
|
|
|
+ $list[$v['fid']]['orderinfo'] = $tmp_list[$k]['orderinfo'];
|
|
|
+ $list[$v['fid']]['jm'] = $tmp_list[$k]['jm'];
|
|
|
+ $list[$v['fid']]['pm'] = $tmp_list[$k]['pm'];
|
|
|
+ $list[$v['fid']]['sl'] = 1;
|
|
|
+ $list[$v['fid']]['label'] = $tmp_list[$k]['label'];
|
|
|
+ }
|
|
|
}
|
|
|
+ }else{
|
|
|
+ $list = [];
|
|
|
}
|
|
|
+
|
|
|
$filename = date("YmdHi",$ktime)."~".date("YmdHi",$jtime)."工厂成品库扫入库汇总.xls";
|
|
|
$str = "<html xmlns:x=\"urn:schemas-microsoft-com:office:excel\">
|
|
|
<head>
|
