|
|
@@ -1049,12 +1049,11 @@ 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->where("extra_type",1);//美国销售
|
|
|
$this->db->order_by('id','desc');
|
|
|
- $this->db->select("id,number,pm,shipremarks,printtime,time,ctime12");
|
|
|
+
|
|
|
|
|
|
$this->db->like('rk', '|'.$lx.'|','before');
|
|
|
$this->db->where('rk != ck');
|
