1

core/CoreApp/controllers/Fullorderexcel.php

@@ -1863,6 +1863,10 @@ class Fullorderexcel extends Start_Controller {
 				    {
 				    	 $feq .= 'fpdata,';
 				    }
+					if(in_array($v[1],['gradefpdata','colorfpdata','densityfpdata','hairnumberfpdata','lacetypefpdata','lowefpdata'])){
+						$goods_sku_list[] = $v[1];
+						continue;
+					}
 				    if($v[1] != 'kong')//空值去除
 				    {
 					    if($v[1] == '9610sku' || $v[1] == 'issku' || $v[1] == 'sku')
@@ -2809,6 +2813,34 @@ class Fullorderexcel extends Start_Controller {
 				}
 				$info_list[$key]['cpfpdata'] = $fpread;
 			}
+			if(count($goods_sku_list) > 0){
+				$ret_goods_sku = $this->_getGoodsInfo($value,$goods_sku_list,$typeclass);
+				if(in_array("gradefpdata",$goods_sku_list)){
+					
+					$info_list[$key]['gradefpdata'] = trim($ret_goods_sku['gradefpdata'],"<br>");
+		
+				}
+				if(in_array("colorfpdata",$goods_sku_list)){
+					
+					$info_list[$key]['colorfpdata'] = trim($ret_goods_sku['colorfpdata'],"<br>");
+				}
+				if(in_array("densityfpdata",$goods_sku_list)){
+				
+					$info_list[$key]['densityfpdata'] = trim($ret_goods_sku['densityfpdata'],"<br>");
+				}
+				if(in_array("hairnumberfpdata",$goods_sku_list)){
+				
+					$info_list[$key]['hairnumberfpdata'] = trim($ret_goods_sku['hairnumberfpdata'],"<br>");
+				}
+				if(in_array("lacetypefpdata",$goods_sku_list)){
+					$info_list[$key]['lacetypefpdata'] = trim($ret_goods_sku['lacetypefpdata'],"<br>");
+				}
+				//lowefpdata
+				if(in_array("lowefpdata",$goods_sku_list)){
+					$info_list[$key]['lowefpdata'] = trim($ret_goods_sku['lowefpdata'],"<br>");
+				}
+
+			}
 			unset($info_list[$key]['id']);
 			unset($info_list[$key]['fpdata']);
 		}