提交数据

core/CoreApp/controllers/Whlabeltransport.php

@@ -6,6 +6,7 @@ class Whlabeltransport extends Start_Controller {
 		$this->load->_model('Model_warehouse','warehouse');
 		$this->load->_model('Model_excel','excel');
 		$this->load->_model('Model_whlabeltransport','whlabeltransport');
+		$this->load->_model('Model_logic_u9tools','logic_u9tools');
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -425,28 +426,55 @@ class Whlabeltransport extends Start_Controller {
             //数据排序
             $order_str = $xztime." desc";
             //取得信息列表
-           $info_list = $this->whlabeltransport->find_all($where,'warehouse,sku,title,num,enter,stime,time,text');
-			foreach ($info_list as $key=>$value) 
-		    {
-				$warehouse = $this->warehouse->read($value['warehouse']);
-				$info_list[$key]['warehouse'] = $warehouse['title'];
-				$info_list[$key]['enter'] = date('Y-m-d H:i:s',$value['enter']);
-				$info_list[$key]['stime'] = date('Y-m-d',$value['stime']);
-				if($value['time'] > 0)
-				{
-				    $info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
-				}
-				else
-				{
-					$info_list[$key]['time'] = "<p class='wc'><p>";
-				}
-		    }
+           $info_list = $this->whlabeltransport->find_all($where,'warehouse,sku,title,num,enter,stime,time,text,features');
+
+
+		   //转化为用友的编码 不为空在执行 为空了啥都不说了
+		   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'],
+				'enter'=>date('Y-m-d H:i:s',$value['enter']),
+				'stime'=>date('Y-m-d',$value['stime']),
+				'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) 
+		    // {
+			// 	$warehouse = $this->warehouse->read($value['warehouse']);
+			// 	$info_list[$key]['warehouse'] = $warehouse['title'];
+			// 	$info_list[$key]['enter'] = date('Y-m-d H:i:s',$value['enter']);
+			// 	$info_list[$key]['stime'] = date('Y-m-d',$value['stime']);
+			// 	if($value['time'] > 0)
+			// 	{
+			// 	    $info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
+			// 	}
+			// 	else
+			// 	{
+			// 		$info_list[$key]['time'] = "<p class='wc'><p>";
+			// 	}
+		    // }
+		
             $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>
@@ -456,7 +484,7 @@ class Whlabeltransport extends Start_Controller {
             </table>"; 
             $filename = $title.".xls";
 			$tail = "";
-            $this->excel->get_fz2($info_list,$titlename,$filename,$tail);
+            $this->excel->get_fz2($final_list,$titlename,$filename,$tail);
 	    }
 	}
 	

core/CoreApp/models/Model_logic_u9tools.php

@@ -22,6 +22,7 @@ class Model_logic_u9tools extends Lin_Model {
             $typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
         }
         foreach($list as $k=>$v){
+            
             $r = $this->getOneU9bm($v[$sku_name],$classid,$typeclass);
             $list[$k]['jm'] =  $r['jm'];
             $list[$k]['zh'] =  $r['zh'];