提交数据amz

core/CoreApp/controllers/Fullorderamz.php

@@ -467,7 +467,7 @@ class Fullorderamz extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表id,shop,type,source,user,orderinfo,number,name,state,buytime,clientremarks,review,print,library,libraryconfirm,express,waybill,orderremarks,black
-                 $info_list = $this->fullorderamz->find_all($where,'id,shop,type,orderinfo,number,sname,phone,state,dtime,review,libraryconfirm,express,waybill,orderremarks,library,black,clientremarks',$order_str,$start,$perpage);
+                 $info_list = $this->fullorderamz->find_all($where,'id,shop,type,orderinfo,number,sname,phone,state,dtime,review,libraryconfirm,express,waybill,orderremarks,library,black,clientremarks,waybillid',$order_str,$start,$perpage);
 		 //格式化数据
             foreach ($info_list as $key=>$value) 
 		    {
@@ -640,6 +640,9 @@ class Fullorderamz extends Start_Controller {
 				if($value['waybill'] != "")
 				{
 					$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz;
+					if($value['express'] == 71 && !empty($value['waybillid'])){
+						$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$value['waybillid']."</p>";
+				   }
 				}
 				if($value['express'] != 0)
 				{
@@ -723,7 +726,7 @@ class Fullorderamz extends Start_Controller {
 				{
 					$info_list[$key]['library'] = '<p>'.date('Y-m-d',$ud['retreattime']).'</p><p>'.date('H:i:s',$ud['retreattime']).'退库</p>';
 				}
-				
+				unset($info_list[$key]['waybillid']);
             }
 		    $total = $this->fullorderamz->find_count($where);
 		    $pagenum = ceil($total/$perpage);
@@ -2276,7 +2279,7 @@ class Fullorderamz extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->fullorderamz->find_all($where,'id,shop,type,orderinfo,number,sname,state,dtime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks',$order_str,$start,$perpage);
+            $info_list = $this->fullorderamz->find_all($where,'id,shop,type,orderinfo,number,sname,state,dtime,review,libraryconfirm,express,waybill,exstate,orderremarks,library,clientremarks,waybillid',$order_str,$start,$perpage);
 			 //格式化数据
 			 $dt = 0;
             foreach ($info_list as $key=>$value) 
@@ -2412,6 +2415,10 @@ class Fullorderamz extends Start_Controller {
 				if($value['waybill'] != "")
 				{
 					$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz;
+					if($value['express'] == 71 && !empty($value['waybillid'])){
+						$info_list[$key]['waybill'] = "<p>".$value['waybill']."</p>".$dlz."<p>".$value['waybillid']."</p>";
+				   }
+				   
 				}
 				if($value['express'] != 0)
 				{
@@ -2449,6 +2456,7 @@ class Fullorderamz extends Start_Controller {
 				{
 				    $info_list[$key]['orderremarks'] = '<p>'.$value['orderremarks'].'</p><p style="border-top: 1px dashed #C2C2C2;">author_id：</p><p>'.$ud['authorid'].'</p><p>source_content_id：</p><p>'.$ud['sourcecontentid'].'</p>';
 				}
+				unset($info_list[$key]['waybillid']);
             }
 			$total = $this->fullorderamz->find_count($where);
 		    $pagenum = ceil($total/$perpage);