|
|
@@ -553,7 +553,7 @@ class Whlabeltransport extends Start_Controller {
|
|
|
|
|
|
foreach ($final_list as $v)
|
|
|
{
|
|
|
- //$c = $this->whlabel->find_count('state = 0 and warehouse = "'.$v['warehouse'].'" and features = "'.$v['features'].'"');
|
|
|
+ $c = $this->whlabel->find_count('state = 0 and warehouse = "'.$v['warehouse'].'" and features = "'.$v['features'].'"');
|
|
|
// $warehouse = $this->warehouse->read($v['warehouse']);
|
|
|
// $v['warehouse'] = $warehouse['title'];
|
|
|
// $v['enter'] = date('Y-m-d H:i:s',$v['enter']);
|
|
|
@@ -565,11 +565,8 @@ class Whlabeltransport extends Start_Controller {
|
|
|
else
|
|
|
{
|
|
|
$zh[$v['features']] = $v;
|
|
|
- $c = $this->whlabel->find_count('state = 0 and warehouse = "'.$v['warehouse'].'" and features = "'.$v['features'].'"');
|
|
|
- $zh[$v['features']]['features'] = $c;
|
|
|
}
|
|
|
- //$zh[$v['features']]['features'] = $c;
|
|
|
-
|
|
|
+ $zh[$v['features']]['features'] = $c;
|
|
|
}
|
|
|
|
|
|
$title = "在途数据".date('Y-m-d',time());
|
