提交数据

core/CoreApp/controllers/Whlabel.php

@@ -3793,6 +3793,32 @@ class Whlabel extends Start_Controller
 						$zh = preg_replace("/\r\n|\r|\n/", '', $zh);
 						$info_list[$key]['features'] = $zh;
 					}
+					
+					$final_list = [];
+					foreach($info_list as $k=>$v){
+						$number = "";
+						if(!empty($v['orderinfo'])){
+							$tmp_info = $this->logic_order->getInfo('orderinfo = "'.$v['orderinfo'].'"','orderinfo,number,librarytime');
+							if(!empty($tmp_info['number'])){
+								$number = $tmp_info['number'];
+							}
+							
+						}
+						$final_list[] = [
+								'warehouse'=>$v['warehouse'],
+								'purchase'=>$v['purchase'],
+								'sku'=>$v['sku'],
+								'title'=>$v['title'],
+								'features'=>$v['features'],
+								'label'=>$v['label'],
+								'orderinfo'=>$v['orderinfo'],
+								'number'=>$number,
+								'waybill'=>$v['waybill'],
+								'outtk'=>$v['outtk'],
+						];
+					}
+
+
 				} else {
 					$info_list = $this->whlabel->find_all($where, 'warehouse,purchase,sku,title,features,label,orderinfo,waybill,retreat', $order_str);
 					foreach ($info_list as $key => $value) {
@@ -3824,38 +3850,35 @@ class Whlabel extends Start_Controller
 						$zh = preg_replace("/\r\n|\r|\n/", '', $zh);
 						$info_list[$key]['features'] = $zh;
 					}
-				}
 
-				$final_list = [];
-				foreach($info_list as $k=>$v){
-					//getInfo
-					$number = "";
-					if(!empty($v['orderinfo'])){
-						$tmp_info = $this->logic_order->getInfo('orderinfo = "'.$v['orderinfo'].'"','orderinfo,number');
-						if(!empty($tmp_info['number'])){
-							$number = $tmp_info['number'];
+					$final_list = [];
+					foreach($info_list as $k=>$v){
+				
+						$number = "";
+						if(!empty($v['orderinfo'])){
+							$tmp_info = $this->logic_order->getInfo('orderinfo = "'.$v['orderinfo'].'"','orderinfo,number,librarytime');
+							if(!empty($tmp_info['number'])){
+								$number = $tmp_info['number'];
+							}
+							
 						}
+						$final_list[] = [
+								'warehouse'=>$v['warehouse'],
+								'purchase'=>$v['purchase'],
+								'sku'=>$v['sku'],
+								'title'=>$v['title'],
+								'features'=>$v['features'],
+								'label'=>$v['label'],
+								'orderinfo'=>$v['orderinfo'],
+								'number'=>$number,
+								'waybill'=>$v['waybill'],
+								'retreat'=>$v['retreat'],
+						];
 					}
-					$outtk = "";
-					if(isset($v['outtk'])){
-						$outtk = $v['outtk'];
-					}
-					if(isset($v['retreat'])){
-						$outtk = $v['retreat'];
-					}
-					$final_list[] = [
-							'warehouse'=>$v['warehouse'],
-							'purchase'=>$v['purchase'],
-							'sku'=>$v['sku'],
-							'title'=>$v['title'],
-							'features'=>$v['features'],
-							'label'=>$v['label'],
-							'orderinfo'=>$v['orderinfo'],
-							'number'=>$number,
-							'waybill'=>$v['waybill'],
-							'outtk'=>$outtk,
-					];
+
 				}
+
+				
 				
 				$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . $tl . '详情';
 				$titlename = "<table border=1>