|
|
@@ -393,7 +393,6 @@ class Whlabelfz extends Start_Controller
|
|
|
}else{
|
|
|
$where .= " warehouse in (".implode(',',$ware_list).")";
|
|
|
}
|
|
|
-
|
|
|
if ($category) {
|
|
|
$where .= " and features like '%-$category-%'";
|
|
|
}
|
|
|
@@ -421,7 +420,7 @@ class Whlabelfz extends Start_Controller
|
|
|
$where .= " and enter > '$ktime' and enter < '$jtime'";
|
|
|
}
|
|
|
//取得信息列表
|
|
|
- $info_list = $this->whlabel->find_pc($where, 'enter,warehouse,sku', 'id,warehouse,sku,title,enter,features');
|
|
|
+ $info_list = $this->whlabel->find_pc($where, 'enter,warehouse,sku', 'id,warehouse,shop,sku,title,enter,features');
|
|
|
if(!empty($info_list)){
|
|
|
$wh = array();
|
|
|
$w = $this->warehouse->find_all('1=1', 'id,title');
|
|
|
@@ -441,8 +440,11 @@ class Whlabelfz extends Start_Controller
|
|
|
$info_list[$k]['enter'] = date('Y-m-d H:i:s', $v['enter']);
|
|
|
$g = $this->whlabel->find_count($where . ' and enter = "' . $v['enter'] . '" and sku = "' . $v['sku'] . '" and warehouse = "' . $v['warehouse'] . '"');
|
|
|
$info_list[$k]['g'] = $g;
|
|
|
- $u9_info = $this->logic_u9tools->getOneU9bm($v['features'],$classid,$typeclass);
|
|
|
- $info_list[$k]['features'] = empty($u9_info['jm'])?"?**?":$u9_info['jm'];
|
|
|
+ if(!empty($v['features'])){
|
|
|
+ $u9_info = $this->logic_u9tools->getOneU9bm($v['features'],$classid,$typeclass);
|
|
|
+ $info_list[$k]['features'] = empty($u9_info['jm'])?"?**?":$u9_info['jm'];
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
