|
|
@@ -202,15 +202,15 @@ class Systemfoutfz extends Start_Controller {
|
|
|
$warehouse_list = $this->warehouse->find_all();
|
|
|
$warehouse_list = array_column($warehouse_list,'title','id');
|
|
|
|
|
|
- $info_list = $this->_getAndTransfer('fullorder',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid);
|
|
|
+ $info_list = $this->_getAndTransfer('fullorder',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass);
|
|
|
|
|
|
- $info_listsmt = $this->_getAndTransfer('fullordersmt',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid);
|
|
|
+ $info_listsmt = $this->_getAndTransfer('fullordersmt',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass);
|
|
|
|
|
|
- $info_listtt = $this->_getAndTransfer('fullordertt',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid);
|
|
|
+ $info_listtt = $this->_getAndTransfer('fullordertt',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass);
|
|
|
|
|
|
- $info_listamz = $this->_getAndTransfer('fullorderamz',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid);
|
|
|
+ $info_listamz = $this->_getAndTransfer('fullorderamz',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass);
|
|
|
|
|
|
- $info_listxw = $this->_getAndTransfer('fullorderxw',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid);
|
|
|
+ $info_listxw = $this->_getAndTransfer('fullorderxw',$where.$wid,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -286,7 +286,7 @@ class Systemfoutfz extends Start_Controller {
|
|
|
/**
|
|
|
* 对多个平台的数据进行循环处理
|
|
|
*/
|
|
|
- private function _getAndTransfer($table,$where,$order_str,$shop_list,$express_list,$warehouse_list,$classid){
|
|
|
+ private function _getAndTransfer($table,$where,$order_str,$shop_list,$express_list,$warehouse_list,$classid,$typeclass){
|
|
|
//取得信息列表
|
|
|
$info_list = $this->$table->find_all($where,'shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks,ts,fpdata',$order_str);
|
|
|
//格式化数据
|
