提交测试

core/CoreApp/controllers/Systemfout.php

@@ -1518,7 +1518,7 @@ class Systemfout extends Start_Controller {
 				$typeclass[$v['id']] = $v;
 			}
             //取得信息列表
-            $info_list = $this->fullorder->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
+            $info_list = $this->fullorder->find_all($where.$wid,'shop,type,orderinfo,number,waybill,waybillid,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
 			 //格式化数据
             foreach ($info_list as $key=>$value) 
 		    {
@@ -1651,7 +1651,7 @@ class Systemfout extends Start_Controller {
 					$info_list[$key]['zh'] = trim($tmp_zh,';');
             }
 			//取得信息列表
-            $info_listsmt = $this->fullordersmt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
+            $info_listsmt = $this->fullordersmt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,waybillid,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
 			 //格式化数据
             foreach ($info_listsmt as $key=>$value) 
 		    {
@@ -1784,7 +1784,7 @@ class Systemfout extends Start_Controller {
 					
             }
 			 //取得信息列表
-            $info_listtt = $this->fullordertt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
+            $info_listtt = $this->fullordertt->find_all($where.$wid,'shop,type,orderinfo,number,waybill,waybillid,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
 			 //格式化数据
             foreach ($info_listtt as $key=>$value) 
 		    {
@@ -1918,7 +1918,7 @@ class Systemfout extends Start_Controller {
 			
 			
 				 //取得信息列表
-            $info_listamz = $this->fullorderamz->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
+            $info_listamz = $this->fullorderamz->find_all($where.$wid,'shop,type,orderinfo,number,waybill,waybillid,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
 			 //格式化数据
             foreach ($info_listamz as $key=>$value) 
 		    {
@@ -2054,7 +2054,7 @@ class Systemfout extends Start_Controller {
 			
 			
 			 //取得信息列表
-            $info_listxw = $this->fullorderxw->find_all($where.$wid,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
+            $info_listxw = $this->fullorderxw->find_all($where.$wid,'shop,type,orderinfo,number,waybill,waybillid,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
 			 //格式化数据
             foreach ($info_listxw as $key=>$value) 
 		    {
@@ -2182,6 +2182,7 @@ class Systemfout extends Start_Controller {
 					$info_listxw[$key]['zh'] = $zh;
             }
             $title = '订单出库-'.date('Ymd',time());
+			$t = str_replace("<td>运单号</td>","<td>运单号</td><td>转单号</td>",$t);
             $titlename = "<table border=1>".$t."<td>条数</td><td>料品</td><td>品名</td></table>";
 			$tail = "\n";
             $filename = $title.".xls";