|
|
@@ -13,6 +13,7 @@ class Workshopshow extends Start_Controller
|
|
|
$this->load->_model('Model_transfer','transfer');
|
|
|
$this->load->_model('Model_systemtransfer_cr','systemtransfer_cr');
|
|
|
$this->load->_model('Model_systemtransfer','systemtransfer');
|
|
|
+ $this->load->_model("Model_whlabel_bh_transfer_cr","whlabel_bh_transfer_cr");
|
|
|
}
|
|
|
public function _remap($arg, $arg_array)
|
|
|
{
|
|
|
@@ -1054,13 +1055,9 @@ class Workshopshow extends Start_Controller
|
|
|
$this->db->where("extra_type",1);//美国销售
|
|
|
$this->db->order_by('id','desc');
|
|
|
$this->db->select("id,number,pm,shipremarks,printtime,time,ctime12");
|
|
|
- $list = $this->db->get('whlabel_bh')->result_array();
|
|
|
- $orderinfos = array_column($list,'orderinfo');
|
|
|
-
|
|
|
- $this->db->where_in('orderinfo',$orderinfos);
|
|
|
+
|
|
|
$this->db->like('rk', '|'.$lx.'|','before');
|
|
|
$this->db->where('rk != ck');
|
|
|
- $this->db->select("orderinfo,rk,ck");
|
|
|
$info_list = $this->db->get('whlabel_bh_transfer')->result_array();
|
|
|
|
|
|
|
|
|
@@ -1072,7 +1069,7 @@ class Workshopshow extends Start_Controller
|
|
|
foreach($info_list as $key=>$value){
|
|
|
$info_list[$key]['printtime'] = date('Y-m-d H:i',$value['printtime']);
|
|
|
$info_list[$key]['time'] = "布标打印 ：".date('Y-m-d H:i',$value['ctime12'])."<br>";
|
|
|
- $cr_list = $this->systemtransfer_cr->find_all("fid = '".$value['id']."'");
|
|
|
+ $cr_list = $this->whlabel_bh_transfer_cr->find_all("fid = '".$value['id']."'");
|
|
|
foreach($cr_list as $k=>$v){
|
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
|
$operate_name = isset($operate_list[$v['lx']])?$operate_list[$v['lx']]:'';
|
