1

core/CoreApp/controllers/Whlabeltransport.php

@@ -539,7 +539,7 @@ class Whlabeltransport extends Start_Controller {
 		   $warehouse_list = array_column($warehouse_list,'title','id');
 		   foreach($info_list as $key=>$value){
 			 $final_list[$key] = [
-				'warehouse'=>isset($warehouse_list[$value['warehouse']])?$warehouse_list[$value['warehouse']]:"",
+				'warehouse'=>$value['warehouse'],
 				"sku"=>$value['sku'],
 				'title'=>$value['title'],
 				'jm'=>$value['jm'],
@@ -558,6 +558,7 @@ class Whlabeltransport extends Start_Controller {
 				// $v['warehouse'] = $warehouse['title'];
 				// $v['enter'] = date('Y-m-d H:i:s',$v['enter']);
 				// $v['stime'] = date('Y-m-d',$v['stime']);
+				$v['warehouse'] = isset($warehouse_list[$value['warehouse']])?$warehouse_list[$value['warehouse']]:"";
 				if(isset($zh[$v['features']]))
 				{
 					$zh[$v['features']]['num'] += $v['num'];