|
@@ -571,6 +571,13 @@ class Fullorderexcel extends Start_Controller {
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ $typeclass_lpdl = [];
|
|
|
|
+ //料品大类
|
|
|
|
+ if(strpos($feq,'lpdl')!= false){
|
|
|
|
+ $feq = str_replace('lpdl,',"fpdata as lpdl,",$feq);
|
|
|
|
+ $tmp_product_id = $this->db->from('typeclass')->select("id,title,zh,classid")->where('classid',16)->get()->result_array();
|
|
|
|
+ $typeclass_lpdl = array_column($tmp_product_id,'zh','id');
|
|
|
|
+ }
|
|
$feq = rtrim($feq,',');
|
|
$feq = rtrim($feq,',');
|
|
|
|
|
|
|
|
|
|
@@ -719,6 +726,25 @@ class Fullorderexcel extends Start_Controller {
|
|
$info_list[$key]['rowtotal'] = $tmp_sub_str;
|
|
$info_list[$key]['rowtotal'] = $tmp_sub_str;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+ if(isset($value['lpdl'])){
|
|
|
|
+ $tmp_lpdl_str ="";
|
|
|
|
+ $tmp_fpdata_arr = explode(';',trim($value['fpdata'],';'));
|
|
|
|
+ $tmp_fpdata_arr = array_filter($tmp_fpdata_arr);
|
|
|
|
+ foreach($tmp_fpdata_arr as $v){
|
|
|
|
+ if(empty($v)){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ $tmp_arr = explode('-',$v);
|
|
|
|
+
|
|
|
|
+ if(isset($typeclass_lpdl[$tmp_arr[1]])){
|
|
|
|
+ $tmp_lpdl_str .= $typeclass_lpdl[$tmp_arr[1]]."<br>";
|
|
|
|
+ }else{
|
|
|
|
+ $tmp_lpdl_str .= "异常<br>";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ $info_list[$key]['lpdl'] = trim($tmp_lpdl_str,"<br>") ;
|
|
|
|
+ }
|
|
if(isset($value['product_id'])){
|
|
if(isset($value['product_id'])){
|
|
$tmp_product_id = "";
|
|
$tmp_product_id = "";
|
|
$product_ids = json_decode($value['product_id'],true);
|
|
$product_ids = json_decode($value['product_id'],true);
|