提交在途导出数据

core/CoreApp/controllers/Whlabeltransport.php

@@ -450,7 +450,7 @@ class Whlabeltransport extends Start_Controller {
 				'time'=>(($value['time'] > 0))?date('Y-m-d H:i:s',$value['time']):"<p class='wc'><p>",
 				'text'=>$value['text']
 			 ];
-		   }
+		    }
 		 
 			// foreach ($info_list as $key=>$value) 
 		    // {
@@ -527,13 +527,37 @@ class Whlabeltransport extends Start_Controller {
             //取得信息列表
 			$zh = array();
            $info_list = $this->whlabeltransport->find_all($where,'warehouse,sku,title,num,features,enter,stime,text');
-			foreach ($info_list as $v) 
+		 //转化为用友的编码 不为空在执行 为空了啥都不说了
+		   if(!empty($info_list)){
+				$info_list = $this->logic_u9tools->getU9bm($info_list,'features');
+		   }
+
+		   $final_list = [];
+		   $warehouse_list = $this->warehouse->find_all("1=1",'id,title');
+
+		   
+		   $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']]:"",
+				"sku"=>$value['sku'],
+				'title'=>$value['title'],
+				'jm'=>$value['jm'],
+				'num'=>$value['num'],
+				'features'=>$value['features'],
+				'enter'=>date('Y-m-d H:i:s',$value['enter']),
+				'stime'=>date('Y-m-d',$value['stime']),
+				'text'=>$value['text']
+			 ];
+		    }
+
+			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']);
-				$v['warehouse'] = $warehouse['title'];
-				$v['enter'] = date('Y-m-d H:i:s',$v['enter']);
-				$v['stime'] = date('Y-m-d',$v['stime']);
+				// $warehouse = $this->warehouse->read($v['warehouse']);
+				// $v['warehouse'] = $warehouse['title'];
+				// $v['enter'] = date('Y-m-d H:i:s',$v['enter']);
+				// $v['stime'] = date('Y-m-d',$v['stime']);
 				if(isset($zh[$v['features']]))
 				{
 					$zh[$v['features']]['num'] += $v['num'];
@@ -544,12 +568,14 @@ class Whlabeltransport extends Start_Controller {
 				}
 				$zh[$v['features']]['features'] = $c;
 		    }
+
             $title = "在途数据".date('Y-m-d',time()); 
             $titlename = "<table border=1>
             <tr align='center'>
 			<td>仓库</td>
 			<td>SKU</td>
 			<td>名称</td>
+			<td>用友编码</td>
             <td>在途数量</td>
 			<td>库存数量</td>
 			<td>添加在途日期</td>