修改导出信息

core/CoreApp/controllers/Returns.php

@@ -570,13 +570,28 @@ class Returns extends Start_Controller {
             {
                 $where  .= " and torderinfo = '$torderinfo'";
             }
-			 $info_list = $this->returns->find_all($where.$wid,'region,orderinfo,number,name,express,torderinfo,ftime,stime,ret_regist_no,goods,received,degreetext','time desc');
+			 $info_list = $this->returns->find_all($where.$wid,'region,orderinfo,number,name,express,torderinfo,ftime,stime,ret_regist_no,u9_sku,goods,xh,received,degreetext','time desc');
 			 //格式化数据
             foreach ($info_list as $key=>$value) 
 		    {
 				$info_list[$key]['region'] = ($value['region'] == 1)?"国内":"美国店";
 				$info_list[$key]['ftime'] = ($value['ftime'] > 0)?date('Y-m-d H:i:s',$value['ftime']):'';
 				$info_list[$key]['stime'] = ($value['stime'] > 0)?date('Y-m-d H:i:s',$value['stime']):'';
+				if(empty($value['u9_sku'])){
+					$info_list[$key]['u9_sku'] = "";
+				}else{
+					$tmp_u9_sku = trim($info_list[$key]['u9_sku'],";");
+					if(strpos($tmp_u9_sku,";") !== false){
+						$tmp_u9_sku_arr = explode(";",$tmp_u9_sku);
+						$tmp_str = "";
+						foreach ($tmp_u9_sku_arr as $k=>$v) {
+							$tmp_str .= $v."<br>";
+						}
+						$info_list[$key]['u9_sku'] = trim($tmp_str,"<br>");
+					}else{
+						$info_list[$key]['u9_sku'] = $tmp_u9_sku;
+					}
+				}
 				if($value['degreetext'] == '' || $value['degreetext'] == 'undefined-|')
 				{
 					$info_list[$key]['degreetext'] = 0;
@@ -627,7 +642,9 @@ class Returns extends Start_Controller {
 <td>发货日期</td>
 <td>收到日期</td>
 <td>退货登记编码</td>
+<td>原单料号</td>
 <td>应退回货物</td>
+<td>退货箱号</td>
 <td>实际收到货物</td> 
 <td>产品数量</td>   
 <td>完好程度-1</td>