1

core/CoreApp/controllers/Fullorderexcel.php

@@ -575,8 +575,15 @@ class Fullorderexcel extends Start_Controller {
 			//料品大类
 			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');
+				$tmp_typeclass_lpdl = $this->db->from('typeclass')->select("id,title,zh,classid")->where('classid',16)->get()->result_array();
+				$typeclass_lpdl = array_column($tmp_typeclass_lpdl,'zh','id');
+			}
+			$typeclass_lhdycc = [];
+			//料号对应尺寸
+			if(strpos($feq,'lhdycc')!= false){
+				$feq = str_replace('lhdycc,',"fpdata as lhdycc,",$feq);
+				$tmp_typeclass_lhdycc = $this->db->from('typeclass')->select("id,title,zh,classid")->where('classid',13)->get()->result_array();
+				$typeclass_lhdycc = array_column($tmp_typeclass_lhdycc,'zh','id');
 			}
 			$feq = rtrim($feq,',');
 			
@@ -739,12 +746,34 @@ class Fullorderexcel extends Start_Controller {
 						if(isset($typeclass_lpdl[$tmp_arr[1]])){
 							$tmp_lpdl_str .= $typeclass_lpdl[$tmp_arr[1]]."<br>";
 						}else{
-							$tmp_lpdl_str .= "异常<br>";
+							$tmp_lpdl_str .= " ";
 						}
 
 					}
 					$info_list[$key]['lpdl'] = trim($tmp_lpdl_str,"<br>") ;
 				}
+				if(isset($value['lhdycc'])){
+					$tmp_lhdycc_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;
+						}
+
+						if(stripos($v,',') !== false){
+							$tmp_arr = explode(',',$v);
+							if(isset($typeclass_lhdycc[$tmp_arr[0]])){
+								$tmp_lhdycc_str .= $typeclass_lhdycc[$tmp_arr[0]]."<br>";
+							}else{
+								$tmp_lhdycc_str .= " ";
+							}
+						}else{
+							$tmp_lhdycc_str .= " ";
+						}
+					}
+					$info_list[$key]['lhdycc'] = trim($tmp_lhdycc_str,"<br>") ;
+				}
 				if(isset($value['product_id'])){
 					$tmp_product_id = "";
 					$product_ids = json_decode($value['product_id'],true);

template/erp/fullorderexcel_add.html

@@ -268,6 +268,9 @@
 				<li id="scapi">
 					<font>料号对应产品数量</font><i class="fa fa-plus"></i>
 				</li>
+				<li id="lhdycc">
+					<font>料号对应尺寸</font>
+				</li>
 				<li id="kong">
 					<font>空内容</font><i class="fa fa-plus"></i>
 				</li>

template/erp/fullorderexcel_edit.html

@@ -269,6 +269,9 @@
 				<li id="scapi">
 					<font>料号对应产品数量</font><i class="fa fa-plus"></i>
 				</li>
+				<li id="lhdycc">
+					<font>料号对应尺寸</font>
+				</li>
 				<li id="kong">
 					<font>空内容</font><i class="fa fa-plus"></i>
 				</li>