|
|
@@ -20,6 +20,7 @@ class Warehouse extends Start_Controller {
|
|
|
$this->load->_model('Model_systemtransfer_cr', 'systemtransfer_cr');
|
|
|
$this->load->_model("Model_logic_order",'logic_order');
|
|
|
$this->load->_model("Model_logic_ding","logic_ding");
|
|
|
+ $this->load->_model('Model_fullorderamz','fullorderamz');
|
|
|
}
|
|
|
//定义方法的调用规则 获取URI第二段值
|
|
|
public function _remap($arg,$arg_array)
|
|
|
@@ -1276,7 +1277,8 @@ class Warehouse extends Start_Controller {
|
|
|
$info_list = $this->fullorder->find_all($where,'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
$info_listsmt = $this->fullordersmt->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
$info_listtt = $this->fullordertt->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
- $rows = array_merge($info_list,$info_listsmt,$info_listtt);
|
|
|
+ $info_listamz = $this->fullorderamz->find_all($where." and mergeid != '1'",'id,shop,orderinfo,number,printtime,librarytime,shipremarks',$order_str,$start,$perpage);
|
|
|
+ $rows = array_merge($info_list,$info_listsmt,$info_listtt,$info_listamz);
|
|
|
//格式化数据
|
|
|
foreach ($rows as $key=>$value)
|
|
|
{
|
|
|
@@ -1327,9 +1329,10 @@ class Warehouse extends Start_Controller {
|
|
|
$dlz = $this->fullorder->find_count($where);
|
|
|
$smt = $this->fullordersmt->find_count($where);
|
|
|
$tt = $this->fullordertt->find_count($where);
|
|
|
+ $amz = $this->fullorderamz->find_count($where);
|
|
|
|
|
|
//$total += $this->fullorder_smt->find_count($where);
|
|
|
- $total = $dlz+$smt+$tt;
|
|
|
+ $total = $dlz+$smt+$tt+$amz;
|
|
|
|
|
|
//$rows = array_slice($rows,$start,$perpage);
|
|
|
$pagenum = ceil($total/$perpage);
|
|
|
@@ -1415,7 +1418,8 @@ class Warehouse extends Start_Controller {
|
|
|
$info_list = $this->fullorder->find_all($where,'id,number,shipremarks',$order_str,$start,$perpage);
|
|
|
$info_listsmt = $this->fullordersmt->find_all($where." and mergeid != '1'",'id,number,shipremarks',$order_str,$start,$perpage);
|
|
|
$info_listtt = $this->fullordertt->find_all($where." and mergeid != '1'",'id,number,shipremarks',$order_str,$start,$perpage);
|
|
|
- $rows = array_merge($info_list,$info_listsmt,$info_listtt);
|
|
|
+ $info_listamz = $this->fullorderamz->find_all($where." and mergeid != '1'",'id,number,shipremarks',$order_str,$start,$perpage);
|
|
|
+ $rows = array_merge($info_list,$info_listsmt,$info_listtt,$info_listamz);
|
|
|
//格式化数据
|
|
|
foreach ($rows as $key=>$value)
|
|
|
{
|
|
|
@@ -1453,9 +1457,10 @@ class Warehouse extends Start_Controller {
|
|
|
$dlz = $this->fullorder->find_count($where);
|
|
|
$smt = $this->fullordersmt->find_count($where);
|
|
|
$tt = $this->fullordersmt->find_count($where);
|
|
|
+ $amz = $this->fullorderamz->find_count($where);
|
|
|
|
|
|
//$total += $this->fullorder_smt->find_count($where);
|
|
|
- $total = $dlz+$smt+$tt;
|
|
|
+ $total = $dlz+$smt+$tt+$amz;
|
|
|
|
|
|
//$rows = array_slice($rows,$start,$perpage);
|
|
|
$pagenum = ceil($total/$perpage);
|
|
|
@@ -1489,6 +1494,10 @@ class Warehouse extends Start_Controller {
|
|
|
$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)
|
|
|
@@ -1648,7 +1657,8 @@ class Warehouse extends Start_Controller {
|
|
|
$info_list = $this->fullorder->find_all($where.$id_is,'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);
|
|
|
$info_listsmt = $this->fullordersmt->find_all($where.$id_smt." and mergeid != '1'",'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);
|
|
|
$info_listtt = $this->fullordertt->find_all($where.$id_smt." and mergeid != '1'",'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);
|
|
|
- $rows = array_merge($info_list,$info_listsmt,$info_listtt);
|
|
|
+ $info_listamz = $this->fullorderamz->find_all($where.$id_smt." and mergeid != '1'",'number,shipremarks,ts,printtime,library,libraryconfirm,librarynot,systemwigsout',$order_str);
|
|
|
+ $rows = array_merge($info_list,$info_listsmt,$info_listtt,$info_listamz);
|
|
|
foreach ($rows as $key=>$value)
|
|
|
{
|
|
|
if($value['printtime'] > 0)
|
