lvhao 6 月之前
父节点
当前提交
6752c3d034
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      core/CoreApp/controllers/Whlabeltransport.php

+ 4 - 2
core/CoreApp/controllers/Whlabeltransport.php

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