|
|
@@ -1275,9 +1275,28 @@ class Warehouse extends Start_Controller {
|
|
|
}
|
|
|
//取得信息列表
|
|
|
$info_list = $this->fullorder->find_all($where,'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
+
|
|
|
+ foreach ($info_list as $key=>$value) {
|
|
|
+ $info_list[$key]['id'] = "fullorder-".$value['id'];
|
|
|
+ }
|
|
|
+
|
|
|
$info_listsmt = $this->fullordersmt->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
+
|
|
|
+ foreach ($info_listsmt as $key=>$value) {
|
|
|
+ $info_listsmt[$key]['id'] = "fullordersmt-".$value['id'];
|
|
|
+ }
|
|
|
+
|
|
|
$info_listtt = $this->fullordertt->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
+
|
|
|
+ foreach ($info_listtt as $key=>$value) {
|
|
|
+ $info_listtt[$key]['id'] = "fullordertt-".$value['id'];
|
|
|
+ }
|
|
|
$info_listamz = $this->fullorderamz->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
+
|
|
|
+ foreach ($info_listamz as $key=>$value) {
|
|
|
+ $info_listamz[$key]['id'] = "fullorderamz-".$value['id'];
|
|
|
+ }
|
|
|
+
|
|
|
$rows = array_merge($info_list,$info_listsmt,$info_listtt,$info_listamz);
|
|
|
//格式化数据
|
|
|
foreach ($rows as $key=>$value)
|
|
|
@@ -1481,23 +1500,28 @@ class Warehouse extends Start_Controller {
|
|
|
|
|
|
public function _ordersee($arg_array)
|
|
|
{
|
|
|
- $arg_array = $arg_array[0];
|
|
|
- $fullorder = 'fullorder';
|
|
|
- $data = $this->fullorder->read($arg_array);
|
|
|
- if(!$data)
|
|
|
- {
|
|
|
- $fullorder = 'fullordersmt';
|
|
|
- $data = $this->fullordersmt->read($arg_array);
|
|
|
- }
|
|
|
- if(!$data)
|
|
|
- {
|
|
|
- $fullorder = 'fullordertt';
|
|
|
- $data = $this->fullordertt->read($arg_array);
|
|
|
- }
|
|
|
- if(!$data){
|
|
|
- $fullorder = 'fullorderamz';
|
|
|
- $data = $this->fullorderamz->read($arg_array);
|
|
|
- }
|
|
|
+ $arr_str = $arg_array[0];
|
|
|
+ $arr= explode('-',rtrim($arr_str,'-'));
|
|
|
+ $table_name = $arr[0];
|
|
|
+ $arg_array = $arr[1];
|
|
|
+ $fullorder = $table_name;
|
|
|
+ $data = $this->$fullorder->read($arg_array);
|
|
|
+ // $fullorder = 'fullorder';
|
|
|
+ // $data = $this->fullorder->read($arg_array);
|
|
|
+ // if(!$data)
|
|
|
+ // {
|
|
|
+ // $fullorder = 'fullordersmt';
|
|
|
+ // $data = $this->fullordersmt->read($arg_array);
|
|
|
+ // }
|
|
|
+ // if(!$data)
|
|
|
+ // {
|
|
|
+ // $fullorder = 'fullordertt';
|
|
|
+ // $data = $this->fullordertt->read($arg_array);
|
|
|
+ // }
|
|
|
+ // if(!$data){
|
|
|
+ // $fullorder = 'fullorderamz';
|
|
|
+ // $data = $this->fullorderamz->read($arg_array);
|
|
|
+ // }
|
|
|
$fpdata = array();
|
|
|
$fullorder = $this->$fullorder->read($arg_array);
|
|
|
if(stripos($fullorder['fpdata'],';') !== false)
|