提交数据

core/CoreApp/controllers/Whlabel.php

@@ -40,6 +40,7 @@ class Whlabel extends Start_Controller
 		$this->load->_model('Model_company', 'company');
 		$this->load->_model('Model_whlabel_list', 'whlabel_list');
 		$this->load->_model("Model_logic_whlabel", "logic_whlabel");
+		$this->load->_model("Model_logic_order","logic_order");
 	}
 	//定义方法的调用规则 获取URI第二段值
 	public function _remap($arg, $arg_array)
@@ -3824,9 +3825,34 @@ class Whlabel extends Start_Controller
 						$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[] = [
+							'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']
+					];
+				}
+				
 				$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . $tl . '详情';
 				$titlename = "<table border=1>
-                <tr><th colspan='8' align='center'><h3>" . $title . "<h3></th></tr>
+                <tr><th colspan='10' align='center'><h3>" . $title . "<h3></th></tr>
                 <tr align='center'>
 				<td>仓库</td>
 				<td>供应商</td>
@@ -3835,13 +3861,14 @@ class Whlabel extends Start_Controller
 				<td>商品中文</td>
                 <td>标签</td>
                 <td>订单号</td>
+				<td>订单编码</td>
                 <td>运单号</td>
 			    <td>" . $tl . "时间(中国时间)</td>
                 </tr>
                 </table>";
 				$filename = $title . ".xls";
 				$tail = "";
-				$this->excel->get_fz2($info_list, $titlename, $filename, $tail);
+				$this->excel->get_fz2($final_list, $titlename, $filename, $tail);
 			} else if ($type == 5) {
 				$info_list = $this->whlabel->find_all($where, 'warehouse,purchase,sku,title,features,label,outk', $order_str);
 				foreach ($info_list as $key => $value) {