|
|
@@ -1240,18 +1240,31 @@ class Boss extends Start_Controller {
|
|
|
if(isset($sp[$title[1]]))
|
|
|
{
|
|
|
$sp[$title[1]]['n'] += $title[2];
|
|
|
+ if(isset($sp[$title[1]]['warehouse'][$val['type']])){
|
|
|
+ $sp[$title[1]]['warehouse'][$val['type']] += $title[2];
|
|
|
+ }else{
|
|
|
+ $sp[$title[1]]['warehouse'][$val['type']] = $title[2];
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
$wh = explode('-',$w[$k]);
|
|
|
$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");
|
|
|
$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';
|
|
|
- $sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'j'=>$jm,'n'=>$title[2]);
|
|
|
+ $sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'w'=>$whs,'j'=>$jm,'n'=>$title[2],"warehouse"=>[
|
|
|
+ $val['type'] =>1,
|
|
|
+ ],"warehouse_show"=>"");
|
|
|
}
|
|
|
- $sp[$title[1]]['warehouse'] = isset($warehouses[$val['type']])?$warehouses[$val['type']]:'仓库异常';
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ foreach ($sp as $k =>$v){
|
|
|
+ foreach($sp[$k]['warehouse'] as $kk =>$vv){
|
|
|
+ $warehouse_name = isset($warehouses[$kk])?$warehouses[$kk]:"异常仓库-".$kk;
|
|
|
+ $sp[$k]['warehouse_show'] .=$warehouse_name.":".$vv."<br />";
|
|
|
+ }
|
|
|
+ unset($sp[$k]['warehouse']);
|
|
|
+ }
|
|
|
$sp = array_values($sp);
|
|
|
$title = "商品统计".date('Y-m-d H-i-s',time());
|
|
|
$titlename = "<table border=1>
|
