1

core/CoreApp/controllers/Workshopshow.php

@@ -1052,11 +1052,10 @@ class Workshopshow extends Start_Controller
             $this->db->select("id,number,pm,shipremarks,printtime,time,ctime12");   
             $this->db->where("time >= ",strtotime($timetkk));
             $this->db->where("time < ",strtotime($timetjj));
-            $this->db->order_by('id','desc');
-            
-           
             $this->db->like('rk', '|'.$lx.'|','before');
             $this->db->where('rk != ck');
+            $this->db->order_by('id','desc');
+            $this->db->limit($perpage, $start);
             $info_list = $this->db->get('whlabel_bh_transfer')->result_array();
 
 
@@ -1072,7 +1071,6 @@ class Workshopshow extends Start_Controller
                 foreach($cr_list as $k=>$v){
                     $type = ($v['type']==1)?'入库':'出库';
                     $operate_name = isset($operate_list[$v['lx']])?$operate_list[$v['lx']]:'';
-                    foreach($log_list as $k=>$v){
 					if(empty($v['lx']) && !empty($v['ycrk_type'])){
 						$tmp_operate_str.= "订单已完成：".date('Y-m-d H:i:s',$v['time'])."<br>";
 					}else{
@@ -1088,10 +1086,9 @@ class Workshopshow extends Start_Controller
             }
             $this->db->where("time >= ",strtotime($timetkk));
             $this->db->where("time < ",strtotime($timetjj));
-            $this->db->where('rk != ck');
             $this->db->like('rk', '|'.$lx.'|','before');
-            $this->db->where("ycrk_type",0);
-            $total = $this->db->count_all_results('systemtransfer');
+            $this->db->where('rk != ck');
+            $total = $this->db->count_all_results('whlabel_bh_transfer');
 
 		    $pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);