推送代码

core/CoreApp/controllers/Goodimglibrary.php

@@ -252,8 +252,15 @@ class Goodimglibrary extends Start_Controller {
             $scsku = $classid;
             foreach($final_list as $k=>$v){
                 if (!empty($v)) {
-                    $type_info = $this->typeclass->read($v);
-                    $scsku[$type_info['classid']] = $type_info['bqsku'];
+                    if($k == 'hairtype'){
+                        if(!in_array($v,[163,164,165,166])){
+                            $type_info = $this->typeclass->read($v);
+                            $scsku[$type_info['classid']] = $type_info['bqsku'];
+                        }
+                    }else{
+                        $type_info = $this->typeclass->read($v);
+                        $scsku[$type_info['classid']] = $type_info['bqsku'];
+                    }
                 }
             }
             $scsku = implode("-", $scsku);

core/CoreApp/controllers/Specialstock.php

@@ -1556,12 +1556,10 @@ class Specialstock extends Start_Controller {
 				$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				$list['lacesize'] = $this->input->post('lacesize',true);
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
 			if($category == 128)
 			{
@@ -1629,7 +1627,16 @@ class Specialstock extends Start_Controller {
 			$post['features'] = '-'.$features;
 			$featurespp = str_replace(array('-163-','-164-','-165-','-166-'),'-',$features);
 			$featurespp = explode('-',trim($featurespp,'-'));
-			$post['featurespp'] = $featurespp[0].'-'.$featurespp[3].'-'.$featurespp[4].'-'.$featurespp[5];
+			if (isset($featurespp[5])) {
+				$post['featurespp'] = $featurespp[0] . '-' . $featurespp[3] . '-' . $featurespp[4] . '-' . $featurespp[5];
+			} else {
+				if(isset($featurespp[4])){
+					$post['featurespp'] = $featurespp[0] . '-' . $featurespp[3] . '-' . $featurespp[4];
+				}else{
+					$post['featurespp'] = trim($features,'-');
+				}
+				
+			}
 			$post['enter'] = $time;
 			$post['time'] = $time;//操作时间
 			for($i=0;$i<$order;$i++)
@@ -1697,14 +1704,12 @@ class Specialstock extends Start_Controller {
 				$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				$list['lacesize'] = $this->input->post('lacesize',true);
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
-			if($category == 128)
+			if($category == 128 || $category == 2465)
 			{
 				$list['lacetype'] = $this->input->post('lacetype',true);
 				$list['haircap'] = $this->input->post('haircap',true);

core/CoreApp/controllers/Transfer.php

@@ -21,6 +21,7 @@ class Transfer extends Start_Controller {
 		$this->load->_model("Model_logic_ding","logic_ding");
 		$this->load->_model("Model_zzquque_u9","zzquque_u9");
 		$this->load->_model("Model_logic_order","logic_order");
+		$this->load->_model("Model_logic_zhlp","logic_zhlp");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -290,14 +291,14 @@ class Transfer extends Start_Controller {
 				$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				
+				$list['lacesize'] = $this->input->post('lacesize',true);
+				
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
-			if($category == 128)
+			if($category == 128 || $category == 2465)
 			{
 				$list['lacetype'] = $this->input->post('lacetype',true);
 				$list['haircap'] = $this->input->post('haircap',true);
@@ -353,8 +354,24 @@ class Transfer extends Start_Controller {
 						if(isset($pm[$typeclass['classid']]))
 						{
 						    $pm[$typeclass['classid']] = $typeclass['zh'];
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+									$pm[$typeclass['classid']] = $typeclass['zh'];
+								}
+							}else{
+								$pm[$typeclass['classid']] = $typeclass['zh'];
+							}
 						}
-						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+
+						if($k == 'hairtype'){
+                            if(!in_array($v,[163,164,165,166])){
+                               $scsku[$typeclass['classid']] = $typeclass['bqsku'];
+                            }
+                        }else{
+                            $scsku[$typeclass['classid']] = $typeclass['bqsku'];
+                        }
+
+						
 						if($k != 'size')
 					    {
 			                $title .= $typeclass['title']." ";

core/CoreApp/controllers/Weight.php

@@ -136,12 +136,12 @@ class Weight extends Start_Controller {
 					$list['type'] = $this->input->post('type',true);
 					$list['headroad'] = $this->input->post('headroad',true);
 					$list['density'] = $this->input->post('density',true);
-					if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-					{
-						$list['lacesize'] = $this->input->post('lacesize',true);
-					}
+					
+					$list['lacesize'] = $this->input->post('lacesize',true);
+					
 					$list['lacecolor'] = $this->input->post('lacecolor',true);
 					$list['lacetypes'] = $this->input->post('lacetypes',true);
+					$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 				}
 			if($category == 128)
 			{
@@ -255,12 +255,11 @@ class Weight extends Start_Controller {
 					$list['type'] = $this->input->post('type',true);
 					$list['headroad'] = $this->input->post('headroad',true);
 					$list['density'] = $this->input->post('density',true);
-					if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-					{
-						$list['lacesize'] = $this->input->post('lacesize',true);
-					}
+					$list['lacesize'] = $this->input->post('lacesize',true);
+					
 					$list['lacecolor'] = $this->input->post('lacecolor',true);
 					$list['lacetypes'] = $this->input->post('lacetypes',true);
+					$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 				}
 			if($category == 128)
 			{

core/CoreApp/controllers/Whlabel.php

@@ -2267,11 +2267,10 @@ class Whlabel extends Start_Controller
 				$list['type'] = $this->input->post('type', true);
 				$list['headroad'] = $this->input->post('headroad', true);
 				$list['density'] = $this->input->post('density', true);
-				if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-					$list['lacesize'] = $this->input->post('lacesize', true);
-				}
+				$list['lacesize'] = $this->input->post('lacesize', true);
 				$list['lacecolor'] = $this->input->post('lacecolor', true);
 				$list['lacetypes'] = $this->input->post('lacetypes', true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo', true);
 			}
 			if ($category == 128) {
 				$list['lacetype'] = $this->input->post('lacetype', true);
@@ -2318,7 +2317,14 @@ class Whlabel extends Start_Controller
 					$num .= $v;
 					$features .= $v . '-';
 					$post[$k] = $v;
-					$scsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+					if($k == 'hairtype'){
+						if(!in_array($v,[163,164,165,166])){
+							$scsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+						}
+					}else{
+						$scsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+					}
+					
 					if ($k != 'size') {
 						$title .= $typeclass[$v]['title'] . " ";
 					}
@@ -2333,7 +2339,14 @@ class Whlabel extends Start_Controller
 								$clzh = explode('|', rtrim($typeclass[$v]['zh'], '|'));
 								$clzh = $clzh[0];
 							}
-							$pm[$typeclass[$v]['classid']] = $clzh;
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+									$pm[$typeclass[$v]['classid']] = $clzh;
+								}
+							}else{
+								$pm[$typeclass[$v]['classid']] = $clzh;
+							}
+					
 						}
 					}
 				}
@@ -2494,11 +2507,10 @@ class Whlabel extends Start_Controller
 				$list['type'] = $this->input->post('type', true);
 				$list['headroad'] = $this->input->post('headroad', true);
 				$list['density'] = $this->input->post('density', true);
-				if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-					$list['lacesize'] = $this->input->post('lacesize', true);
-				}
+				$list['lacesize'] = $this->input->post('lacesize', true);
 				$list['lacecolor'] = $this->input->post('lacecolor', true);
 				$list['lacetypes'] = $this->input->post('lacetypes', true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo', true);
 			}
 			if ($category == 128) {
 				$list['lacetype'] = $this->input->post('lacetype', true);
@@ -6293,11 +6305,10 @@ class Whlabel extends Start_Controller
 					$list['type'] = $this->input->post('type', true);
 					$list['headroad'] = $this->input->post('headroad', true);
 					$list['density'] = $this->input->post('density', true);
-					if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-						$list['lacesize'] = $this->input->post('lacesize', true);
-					}
+					$list['lacesize'] = $this->input->post('lacesize', true);
 					$list['lacecolor'] = $this->input->post('lacecolor', true);
 					$list['lacetypes'] = $this->input->post('lacetypes', true);
+					$list['lacetypestwo'] = $this->input->post('lacetypestwo', true);
 				}
 				if ($category == 128) {
 					$list['lacetype'] = $this->input->post('lacetype', true);
@@ -6345,12 +6356,40 @@ class Whlabel extends Start_Controller
 						if (isset($pm[$typeclass['classid']])) {
 							if (stripos($typeclass['zh'], '|') !== false) {
 								$exzh = explode('|', $typeclass['zh']);
-								$pm[$typeclass['classid']] = $exzh[0];
+								if($k == 'hairtype'){
+									if(!in_array($v,[163,164,165,166])){
+										$pm[$typeclass['classid']] = $exzh[0];
+									}
+								}else{
+									$pm[$typeclass['classid']] = $exzh[0];
+								}
+
+								
 							} else {
-								$pm[$typeclass['classid']] = $typeclass['zh'];
+
+								if($k == 'hairtype'){
+									if(!in_array($v,[163,164,165,166])){
+										$pm[$typeclass['classid']] = $typeclass['zh'];
+									}
+								}else{
+									$pm[$typeclass['classid']] = $typeclass['zh'];
+								}
+
+							}
+						}
+						
+
+
+						if($k == 'hairtype'){
+							if(!in_array($v,[163,164,165,166])){
+								$scsku[$typeclass['classid']] = $typeclass['bqsku'];
 							}
+						}else{
+							$scsku[$typeclass['classid']] = $typeclass['bqsku'];
 						}
-						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+
+
+						
 						if ($k != 'size') {
 							$title .= $typeclass['title'] . " ";
 						}
@@ -6529,11 +6568,12 @@ class Whlabel extends Start_Controller
 					$list['type'] = $this->input->post('type', true);
 					$list['headroad'] = $this->input->post('headroad', true);
 					$list['density'] = $this->input->post('density', true);
-					if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-						$list['lacesize'] = $this->input->post('lacesize', true);
-					}
+					
+					$list['lacesize'] = $this->input->post('lacesize', true);
+					
 					$list['lacecolor'] = $this->input->post('lacecolor', true);
 					$list['lacetypes'] = $this->input->post('lacetypes', true);
+					$list['lacetypestwo'] = $this->input->post('lacetypestwo', true);
 				}
 				if ($category == 128) {
 					$list['lacetype'] = $this->input->post('lacetype', true);
@@ -6578,12 +6618,38 @@ class Whlabel extends Start_Controller
 						if (isset($pm[$typeclass['classid']])) {
 							if (stripos($typeclass['zh'], '|') !== false) {
 								$exzh = explode('|', $typeclass['zh']);
-								$pm[$typeclass['classid']] = $exzh[0];
+								if($k == 'hairtype'){
+									if(!in_array($v,[163,164,165,166])){
+										$pm[$typeclass['classid']] = $exzh[0];
+									}
+								}else{
+									$pm[$typeclass['classid']] = $exzh[0];
+								}
+
+								
 							} else {
-								$pm[$typeclass['classid']] = $typeclass['zh'];
+
+								if($k == 'hairtype'){
+									if(!in_array($v,[163,164,165,166])){
+										$pm[$typeclass['classid']] = $typeclass['zh'];
+									}
+								}else{
+									$pm[$typeclass['classid']] = $typeclass['zh'];
+								}
+								
 							}
 						}
-						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+
+
+						if($k == 'hairtype'){
+							if(!in_array($v,[163,164,165,166])){
+								$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+							}
+						}else{
+							$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+						}
+
+						
 						if ($k != 'size') {
 							$title .= $typeclass['title'] . " ";
 						}

core/CoreApp/controllers/Whlabel_bh.php

@@ -42,6 +42,8 @@ class Whlabel_bh extends Start_Controller {
 		$this->load->_model('Model_settingtest','settingtest');
 		$this->load->_model("Model_whlabel_bh_transfer_cr","whlabel_bh_transfer_cr");
 		$this->load->_model("Model_zzquque_u9","zzquque_u9");
+		$this->load->_model("Model_logic_zhlp","logic_zhlp");
+		$this->load->_model("Model_goods","goods");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -499,7 +501,6 @@ class Whlabel_bh extends Start_Controller {
 		if(isset($post['num']))
 		{
 			$list = array();
-			$sku = $this->input->post('sku',true);
 			$category = $this->input->post('category',true);
 			$list['category'] = $category;
 			$list['hairtype'] = $this->input->post('hairtype',true);
@@ -527,15 +528,13 @@ class Whlabel_bh extends Start_Controller {
 			$list['lowe'] = $this->input->post('lowe',true);
 			if($category == 127)
 			{
-				$list['type'] = $this->input->post('type',true);
+				//$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				$list['lacesize'] = $this->input->post('lacesize',true);
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
 			if($category == 128)
 			{
@@ -584,7 +583,7 @@ class Whlabel_bh extends Start_Controller {
 			$classid = $this->classid->sku();
 			$pm = $classid;
 		    $jm = $classid;
-			$sku = $sku;
+			$scsku = $classid;
 			$title = '';$features = '';$cs = array();
 			$bmpx = array(13=>'',16=>'',18=>'',25=>'',26=>'',41=>'');
 			foreach($list as $k=>$v)
@@ -603,7 +602,14 @@ class Whlabel_bh extends Start_Controller {
 			            $title .= $typeclass[$v]['title']." ";
 					}
 					$features .=$v.'-';
-					$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+					if($k == 'hairtype'){
+                        if(!in_array($v,[163,164,165,166])){
+							$scsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+                        }
+                    }else{
+						$scsku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+                    }
+					
 					if(isset($pm[$typeclass[$v]['classid']]))
 					{
 						if($typeclass[$v]['title'] == '9A')
@@ -622,22 +628,43 @@ class Whlabel_bh extends Start_Controller {
 								$clzh = explode('|',rtrim($typeclass[$v]['zh'],'|'));
 								$clzh = $clzh[0];
 							}
-							$pm[$typeclass[$v]['classid']] = $clzh;
+
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+									$pm[$typeclass[$v]['classid']] = $clzh;
+								}
+							}else{
+								$pm[$typeclass[$v]['classid']] = $clzh;
+							}
+									
+
+							
 						}
 					}
 					if(isset($jm[$typeclass[$v]['classid']]))
 					{
 						if($typeclass[$v]['jm'])
 						{
-						    $jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+									$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+								}
+							}else{
+								$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+							}
+						    
 						}
 					}
 				}
 			}
+
+			$scsku = implode("-", $scsku);
+			$scsku = str_replace('- ', '-', trim($scsku, '-'));
+			$scsku = str_replace(array('--------', '-------', '------', '-----', '----', '---', '--'), '-', $scsku);
+
 			$jm = array_filter($jm);//去除空值
 			$jm = implode("-",$jm);
-			$sku = array_filter($sku);//去除空值
-			$sku = implode("-",$sku);
+			$sku = $scsku;
 			$pm = array_filter($pm);//去除空值
 			$pm = implode(" ",$pm);
 			$pm = preg_replace("/\r\n|\r|\n/",'',trim($pm,' '));
@@ -815,17 +842,17 @@ class Whlabel_bh extends Start_Controller {
 			$list['lowe'] = $this->input->post('lowe',true);
 			if($category == 127)
 			{
-				$list['type'] = $this->input->post('type',true);
+				//$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				
+				$list['lacesize'] = $this->input->post('lacesize',true);
+				
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
-			if($category == 128)
+			if($category == 128 ||  $category = 2465)
 			{
 				$list['lacetype'] = $this->input->post('lacetype',true);
 				$list['haircap'] = $this->input->post('haircap',true);
@@ -890,7 +917,14 @@ class Whlabel_bh extends Start_Controller {
 			            $title .= $typeclass[$v]['title']." ";
 					}
 					$features .=$v.'-';
-					$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+					if($k == 'hairtype'){
+						if(!in_array($v,[163,164,165,166])){
+							$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+						}
+					}else{
+						$sku[$typeclass[$v]['classid']] = $typeclass[$v]['bqsku'];
+					}
+					
 					if(isset($pm[$typeclass[$v]['classid']]))
 					{
 						if($typeclass[$v]['title'] == '9A')
@@ -909,14 +943,29 @@ class Whlabel_bh extends Start_Controller {
 								$clzh = explode('|',rtrim($typeclass[$v]['zh'],'|'));
 								$clzh = $clzh[0];
 							}
-							$pm[$typeclass[$v]['classid']] = $clzh;
-						}
+							
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+										$pm[$typeclass[$v]['classid']] = $clzh;
+									}
+								}else{
+									$pm[$typeclass[$v]['classid']] = $clzh;
+								}
+							}
 					}
 					if(isset($jm[$typeclass[$v]['classid']]))
 					{
 						if($typeclass[$v]['jm'])
 						{
-						    $jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+							if($k == 'hairtype'){
+								if(!in_array($v,[163,164,165,166])){
+										$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+								}else{
+									$jm[$typeclass[$v]['classid']] = $typeclass[$v]['jm'];
+								}
+							}
+							
+						   
 						}
 					}
 				}
@@ -1283,15 +1332,14 @@ class Whlabel_bh extends Start_Controller {
 			$list['lowe'] = $this->input->post('lowe',true);
 			if($category == 127)
 			{
-				$list['type'] = $this->input->post('type',true);
+				//$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				
+				$list['lacesize'] = $this->input->post('lacesize',true);
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
 				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
 			if($category == 128)
 			{

core/CoreApp/controllers/Whlabelbarcode.php

@@ -176,11 +176,12 @@ class Whlabelbarcode extends Start_Controller {
 				$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				
+				$list['lacesize'] = $this->input->post('lacesize',true);
+				
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
+				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
 			else if($category == 128)
 			{
@@ -225,7 +226,14 @@ class Whlabelbarcode extends Start_Controller {
 					$post[$k] = $v;
 					$typeclass = $this->typeclass->read($v);
 			        $title .= $typeclass['title']." ";
-					$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+					if($k == 'hairtype'){
+						if(!in_array($v,[163,164,165,166])){
+							$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+						}
+					}else{
+						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+					}
+					
 				}
             }
 			$time = time();
@@ -292,11 +300,12 @@ class Whlabelbarcode extends Start_Controller {
 				$list['type'] = $this->input->post('type',true);
 				$list['headroad'] = $this->input->post('headroad',true);
 				$list['density'] = $this->input->post('density',true);
-				if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-				{
-					$list['lacesize'] = $this->input->post('lacesize',true);
-				}
+				
+				$list['lacesize'] = $this->input->post('lacesize',true);
+				
 				$list['lacecolor'] = $this->input->post('lacecolor',true);
+				$list['lacetypes'] = $this->input->post('lacetypes',true);
+				$list['lacetypestwo'] = $this->input->post('lacetypestwo',true);
 			}
 			else if($category == 128)
 			{
@@ -337,7 +346,14 @@ class Whlabelbarcode extends Start_Controller {
 					$post[$k] = $v;
 					$typeclass = $this->typeclass->read($v);
 			        $title .= $typeclass['title']." ";
-					$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+					if($k == 'hairtype'){
+						if(!in_array($v,[163,164,165,166])){
+							$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+						}
+					}else{
+						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+					}
+					
 				}
             }
 			$time = time();

core/CoreApp/controllers/Whlabelfz.php

@@ -757,11 +757,10 @@ class Whlabelfz extends Start_Controller
 			$list['type'] = empty($post['type'])?'':$post['type'];
 			$list['headroad'] = empty($post['headroad'])?'':$post['headroad'];
 			$list['density'] =empty($post['density'])?'':$post['density'];
-			if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-				$list['lacesize'] = empty($post['lacesize'])?'':$post['lacesize'];
-			}
+			$list['lacesize'] = empty($post['lacesize'])?'':$post['lacesize'];
 			$list['lacecolor'] = empty($post['lacecolor'])?'':$post['lacecolor'];
 			$list['lacetypes'] = empty($post['lacetypes'])?'':$post['lacetypes'];
+			$list['lacetypestwo'] =  empty($post['lacetypestwo'])?'':$post['lacetypestwo']; 
 		}
 		if ($category == 128) {
 			$list['lacetype'] =empty($post['lacetype'])?'':$post['lacetype'];
@@ -809,12 +808,33 @@ class Whlabelfz extends Start_Controller
 				if (isset($pm[$typeclass['classid']])) {
 					if (stripos($typeclass['zh'], '|') !== false) {
 						$exzh = explode('|', $typeclass['zh']);
-						$pm[$typeclass['classid']] = $exzh[0];
+						
+						if($k == 'hairtype'){
+							if(!in_array($v,[163,164,165,166])){
+								$pm[$typeclass['classid']] = $exzh[0];
+							}
+						}else{
+							$pm[$typeclass['classid']] = $exzh[0];
+						}
 					} else {
-						$pm[$typeclass['classid']] = $typeclass['zh'];
+						if($k == 'hairtype'){
+							if(!in_array($v,[163,164,165,166])){
+								$pm[$typeclass['classid']] = $typeclass['zh'];
+							}
+						}else{
+							$pm[$typeclass['classid']] = $typeclass['zh'];
+						}
 					}
 				}
-				$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+
+				if($k == 'hairtype'){
+					if(!in_array($v,[163,164,165,166])){
+						$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+					}
+				}else{
+					$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+				}
+				
 				if ($k != 'size') {
 					$title .= $typeclass['title'] . " ";
 				}

core/CoreApp/models/Model_api.php

@@ -1913,21 +1913,31 @@ function __construct(){
 
 			$cphxtt = array(16=>1297,13=>80,14=>'',40=>'',8=>57,15=>'',41=>'',42=>'');
 			$cphxhair = array(16=>1702,13=>80,14=>'',47=>'',46=>'',8=>57,15=>'',38=>'',48=>'');
-			if((preg_match('/\d\*\df/',$pd[$x]) ||  preg_match('/\df/',$pd[$x]) ||  stripos($pd[$x],'+F') !== false || stripos($pd[$x],'Frontal') !== false) && stripos($pd[$x],'wig') === false && stripos($pd[$x],'Bob') === false)
+			if((preg_match('/\d\*\df/',$pd[$x]) ||  preg_match('/\df/',$pd[$x]) ||  stripos($pd[$x],'+F') !== false || stripos($pd[$x],'Frontal') !== false) && stripos($pd[$x],'wig') === false && stripos($pd[$x],'Bob') === false && stripos($pd[$x],'BH-') === false && stripos($pd[$x],'fsw') === false)
 			{
-				$u27 = (stripos($pd[$x],'SilkBaseFrontal') !== false)?199:197;
-				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,26=>191,9=>'',44=>'');//蕾丝发块
+				// $u27 = (stripos($pd[$x],'SilkBaseFrontal') !== false)?199:197;
+				// $cplf = array(16=>127,27=>$u27,12=>75,10=>72,26=>191,9=>'',44=>'');//蕾丝发块
+				// $fc = 1;
+				//删除了 发块前头类型 27 
+				$cplf = array(16=>127,12=>75,10=>'',25=>182,9=>'',44=>'',54=>'');//蕾丝发块  
 				$fc = 1;
 			}
 			else if((preg_match('/\d\*\dc/',$pd[$x]) || preg_match('/\dc/',$pd[$x]) || stripos($pd[$x],'+C') !== false || stripos($pd[$x],'Closure') !== false) && stripos($pd[$x],'wig') === false && stripos($pd[$x],'Bob') === false && !preg_match('/\dcolor/',$pd[$x]) && !preg_match('/\dColor/',$pd[$x]))
 			{
-				$u27 = (stripos($pd[$x],'SilkBaseClosure') !== false)?196:195;
-				$cplf = array(16=>127,27=>$u27,12=>75,10=>72,25=>182,9=>'',44=>'');//蕾丝发块
+				// $u27 = (stripos($pd[$x],'SilkBaseClosure') !== false)?196:195;
+				// $cplf = array(16=>127,27=>$u27,12=>75,10=>72,25=>182,9=>'',44=>'');//蕾丝发块
+				// if(stripos($pd[$x],'2*6') !== false)
+				// {
+				// 	$cplf[12] = 76;
+				// }
+				// $fc = 1;
+				//删除了 发块前头类型 27  同步清除了 密度不一定有
+				$cplf = array(16=>127,12=>75,10=>'',25=>182,9=>'',44=>'',54=>'');//蕾丝发块
 				if(stripos($pd[$x],'2*6') !== false)
 				{
 					$cplf[12] = 76;
 				}
-				$fc = 1;
+				 $fc = 1;
 			}
 			$cpcppd = 0;
 			$cpcptype = $this->typeclass->find_all("classid = 33");
@@ -2131,10 +2141,24 @@ function __construct(){
 					}
 					else if($cp['16'] == '127')
 					{
-						if(isset($item[9]))
+						// if(isset($item[9]))
+						// {
+				    	// 	$sku127a = $item[0].'-'.$v['id'].'-'.$item[3].'-'.$item[6].'-'.$item[9];
+				    	// 	$sku127b = $item[0].'-'.$v['id'].'-'.$item[6].'-'.$item[9];
+						// 	if(isset($weightsku[$sku127a]))
+						// 	{
+				 	  	// 	    $weight = $weightsku[$sku127a];
+						// 	}
+						// 	else if(isset($weightsku[$sku127b]))
+						// 	{
+						// 		$weight = $weightsku[$sku127b];
+						// 	}
+						// }
+
+						if(isset($item[8]))
 						{
-				    		$sku127a = $item[0].'-'.$v['id'].'-'.$item[3].'-'.$item[6].'-'.$item[9];
-				    		$sku127b = $item[0].'-'.$v['id'].'-'.$item[6].'-'.$item[9];
+				    		$sku127a = $item[0].'-'.$v['id'].'-'.$item[2].'-'.$item[5].'-'.$item[8];
+				    		$sku127b = $item[0].'-'.$v['id'].'-'.$item[5].'-'.$item[8];
 							if(isset($weightsku[$sku127a]))
 							{
 				 	  		    $weight = $weightsku[$sku127a];
@@ -2205,10 +2229,23 @@ function __construct(){
 					}
 					else if($fk['16'] == '127')
 					{
-						if(isset($item[9]))
+						// if(isset($item[9]))
+						// {
+				    	// 	$sku127a = $item[0].'-'.$v['id'].'-'.$item[3].'-'.$item[6].'-'.$item[9];
+				    	// 	$sku127b = $item[0].'-'.$v['id'].'-'.$item[6].'-'.$item[9];
+						// 	if(isset($weightsku[$sku127a]))
+						// 	{
+				 	  	// 	    $weight = $weightsku[$sku127a];
+						// 	}
+						// 	else if(isset($weightsku[$sku127b]))
+						// 	{
+						// 		$weight = $weightsku[$sku127b];
+						// 	}
+						// }
+						if(isset($item[8]))
 						{
-				    		$sku127a = $item[0].'-'.$v['id'].'-'.$item[3].'-'.$item[6].'-'.$item[9];
-				    		$sku127b = $item[0].'-'.$v['id'].'-'.$item[6].'-'.$item[9];
+				    		$sku127a = $item[0].'-'.$v['id'].'-'.$item[2].'-'.$item[5].'-'.$item[8];
+				    		$sku127b = $item[0].'-'.$v['id'].'-'.$item[5].'-'.$item[8];
 							if(isset($weightsku[$sku127a]))
 							{
 				 	  		    $weight = $weightsku[$sku127a];

core/CoreApp/models/Model_bhccwl.php

@@ -12,6 +12,7 @@ class Model_bhccwl extends Lin_Model
 		return [
 			'0'=>'未发布',
 			'1'=>"已发布",
+			'2'=>'已撤回'
 		];
 	}
 

core/CoreApp/models/Model_logic_order.php

@@ -996,8 +996,10 @@ class Model_logic_order extends Lin_Model {
         $ft = [16=>0,13=>0,8=>0,15=>0,14=>0];
         $sku_rules[126] = $ft;
         //16 类目  13 等级 8 头发颜色 15 曲度 27 发块前头类型 12 头路设计 10 密度 25|26 蕾丝尺寸 14 长度  如果发块前头是195 发块 则对应25 如果发块前头是蕾丝前头 则对应26
-        //发块
-        $fk = [16=>0,13=>0,8=>0,15=>0,27=>0,12=>0,10=>0,25=>0,26=>0,14=>0];
+        //发块  其中密度默认可选择了  发块前头类型 删除了
+        // $fk = [16=>0,13=>0,8=>0,15=>0,27=>0,12=>0,10=>0,25=>0,26=>0,14=>0];
+        // $sku_rules[127] = $fk;
+        $fk = [16=>0,13=>0,8=>0,15=>0,12=>0,25=>0,26=>0,14=>0];
         $sku_rules[127] = $fk;
         //16 类目  13 等级  8 头发颜色 15曲度 18 头套种类 6 发帽大小 10 密度 14 长度
         //头套
@@ -1073,13 +1075,15 @@ class Model_logic_order extends Lin_Model {
             }
             //发块前头 会造成其中一个变换的
             if($sku_arr[0] == 127){
-                $fkqt = $check_sku_rule[27];
-                if($fkqt == 195){
-                    unset($check_sku_rule[26]);
-                }
-                if($fkqt == 197){
-                    unset($check_sku_rule[25]);
-                }
+                // $fkqt = $check_sku_rule[27];
+                // if($fkqt == 195){
+                //     unset($check_sku_rule[26]);
+                // }
+                // if($fkqt == 197){
+                //     unset($check_sku_rule[25]);
+                // }
+
+                unset($check_sku_rule[26]);
             }
           
             $flag = 1;

core/CoreApp/models/Model_logic_u9tools.php

@@ -305,31 +305,37 @@ class Model_logic_u9tools extends Lin_Model {
         }
         if($cate == 127)
         {
-            if(isset($sku_list[27])){
-                $list['type'] = $sku_list[27]['id']; //类 型
-            }
+            // 发块前头类型删除
+            // if(isset($sku_list[27])){
+            //     $list['type'] = $sku_list[27]['id']; //类 型
+            // }
             if(isset($sku_list[12])){
                 $list['headroad'] = $sku_list[12]['id']; //头路设计
             }
             if(isset($sku_list[10])){
                 $list['density'] = $sku_list[10]['id']; //密 度
             }
-            if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
-            {
-                //蕾丝尺寸
-                if(isset($sku_list[25])){
-                    $list['lacesize'] = $sku_list[25]['id'];
-                }
-                if(isset($sku_list[26])){
-                    $list['lacesize'] = $sku_list[26]['id'];
-                }
+            $list['lacesize'] = $sku_list[25]['id'];
+            
+            // if($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199)
+            // {
+            //     //蕾丝尺寸
+            //     if(isset($sku_list[25])){
+            //         $list['lacesize'] = $sku_list[25]['id'];
+            //     }
+            //     if(isset($sku_list[26])){
+            //         $list['lacesize'] = $sku_list[26]['id'];
+            //     }
                 
-            }
+            // }
             if(isset($sku_list[9])){
                 $list['lacecolor'] = $sku_list[9]['id'];//蕾丝颜色
             }
             if(isset($sku_list[44])){
-                $list['lacetypes'] = $sku_list[44]['id'];//蕾丝类型
+                $list['lacetypes'] = $sku_list[44]['id'];//蕾丝网材
+            }
+            if(isset($sku_list[54])){
+                $list['lacetypestwo'] = $sku_list[54]['id'];//蕾丝格式
             }
         }
         if($cate == 128)
@@ -359,7 +365,7 @@ class Model_logic_u9tools extends Lin_Model {
                 $list['wigother2'] = $sku_list[51]['id'];//头套其它2
             }
             if(isset($sku_list[53])){
-                $list['product_related'] = $sku_list[53]['id'];//头套其它2
+                $list['product_related'] = $sku_list[53]['id'];//生产配比
             }
         }
         //现在没有129这个分类了
@@ -417,7 +423,7 @@ class Model_logic_u9tools extends Lin_Model {
         }
         $pm = $classid;
         $jm = $classid;
-        $sku = [];
+        $scsku = $classid;
         $title = '';$features = '';$cs = array();
         $bmpx = array(13=>'',16=>'',18=>'',25=>'',26=>'',41=>'');
       
@@ -437,7 +443,16 @@ class Model_logic_u9tools extends Lin_Model {
                     $title .= $typeclassid[$v]['title']." ";
                 }
                 $features .=$v.'-';
-                $sku[$typeclassid[$v]['classid']] = empty($typeclassid[$v]['bqsku'])?"":$typeclassid[$v]['bqsku'];
+
+                if($k == 'hairtype'){
+					if(!in_array($v,[163,164,165,166])){
+						 $scsku[$typeclassid[$v]['classid']] = empty($typeclassid[$v]['bqsku'])?"":$typeclassid[$v]['bqsku'];
+					}
+				}else{
+					 $scsku[$typeclassid[$v]['classid']] = empty($typeclassid[$v]['bqsku'])?"":$typeclassid[$v]['bqsku'];
+				}
+
+               
                 if(isset($pm[$typeclassid[$v]['classid']]))
                 {
                     if($typeclassid[$v]['title'] == '9A')
@@ -456,22 +471,39 @@ class Model_logic_u9tools extends Lin_Model {
                             $clzh = explode('|',rtrim($typeclassid[$v]['zh'],'|'));
                             $clzh = $clzh[0];
                         }
-                        $pm[$typeclassid[$v]['classid']] = $clzh;
+
+                        if($k == 'hairtype'){
+                            if(!in_array($v,[163,164,165,166])){
+                                $pm[$typeclassid[$v]['classid']] = $clzh;
+                            }
+                        }else{
+                            $pm[$typeclassid[$v]['classid']] = $clzh;
+                        }
+
+                        
                     }
                 }
                 if(isset($jm[$typeclassid[$v]['classid']]))
                 {
                     if($typeclassid[$v]['jm'])
                     {
-                        $jm[$typeclassid[$v]['classid']] = $typeclassid[$v]['jm'];
+                        if($k == 'hairtype'){
+                            if(!in_array($v,[163,164,165,166])){
+                                 $jm[$typeclassid[$v]['classid']] = $typeclassid[$v]['jm'];
+                            }
+                        }else{
+                             $jm[$typeclassid[$v]['classid']] = $typeclassid[$v]['jm'];
+                        }
+                       
                     }
                 }
             }
         }
         $jm = array_filter($jm);//去除空值
         $jm = implode("-",$jm);
-        $sku = array_filter($sku);//去除空值
-        $sku = implode("-",$sku);
+        $scsku = implode("-", $scsku);
+		$scsku = str_replace('- ', '-', trim($scsku, '-'));
+		$scsku = str_replace(array('--------', '-------', '------', '-----', '----', '---', '--'), '-', $scsku);
         $pm = array_filter($pm);//去除空值
         $pm = implode(" ",$pm);
         $pm = preg_replace("/\r\n|\r|\n/",'',trim($pm,' '));
@@ -487,7 +519,7 @@ class Model_logic_u9tools extends Lin_Model {
         $post['ztime'] = strtotime($ztime);
         $post['bm'] = '03'.implode("",$bmpx);
         $post['jm'] = $jm;
-        $post['sku'] = $sku;
+        $post['sku'] = $scsku;
         $post['pm'] = $pm;
         $post['title'] = $title;
         $post['features'] = '-'.$features;
@@ -504,18 +536,40 @@ class Model_logic_u9tools extends Lin_Model {
     }
     //获取erp转化u9需要classid和typeclassid
     public function getClass(){
+        $this->load->driver('cache');
+
+        $cache_key  = "get_erpclass_20261021";
+	    $cached = $this->cache->get($cache_key);
+		if ($cached !== FALSE) {
+			return json_decode($cached,true);
+		}
+
+	
         $classid = $this->classid->sku();
+        $json_encode_str = json_encode($classid);
+        $this->cache->save($cache_key, $json_encode_str, 3600); // 缓存1小时
         return $classid;
        
     }
     public function getTypeClass(){
+
+        $this->load->driver('cache');
+
+        $cache_key  = "get_erptypeclass_20261021";
+	    $cached = $this->cache->get($cache_key);
+		if ($cached !== FALSE) {
+			return json_decode($cached,true);
+		}
         $typeclass = [];
         $tcall = $this->typeclass->find_all();
         foreach ($tcall as $v)
         {
             //$tcjm[$v['id']] = array($v['jm'],$v['classid']);
-            $typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
+            $typeclass[$v['id']] = array('id'=>$v['id'],'zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
         }
+
+        $json_encode_str = json_encode($typeclass);
+        $this->cache->save($cache_key, $json_encode_str, 3600); // 缓存1小时
         return $typeclass;
     }
     //只针对创建u9料号 不牵扯到erp的sku组合

core/CoreApp/models/Model_logic_zhlp.php

@@ -9,6 +9,8 @@
 class Model_logic_zhlp extends Lin_Model {
     function __construct(){
         parent::__construct();
+        $this->load->_model("Model_typeclass",'typeclass');
+        $this->load->_model("Model_classid","classid");
     }
 
     public function sortByName($arr){
@@ -163,6 +165,7 @@ class Model_logic_zhlp extends Lin_Model {
                 'lacesize'=>empty($arr['lacesize'])?0:$arr['lacesize'],
                 'lacecolor'=>empty($arr['lacecolor'])?0:$arr['lacecolor'],
                 "lacetypes"=>empty($arr['lacetypes'])?0:$arr['lacetypes'],
+                "lacetypestwo"=>empty($arr['lacetypestwo'])?0:$arr['lacetypestwo'],
                 "size"=>empty($arr['size'])?0:$arr['size'],
             ];
         }elseif($type == 3){
@@ -170,9 +173,9 @@ class Model_logic_zhlp extends Lin_Model {
             if(!empty($arr[25])){
                 $lacesize = $arr[25];
             }
-            if(!empty($arr[26])){
-                $lacesize = $arr[26];
-            }
+            // if(!empty($arr[26])){
+            //     $lacesize = $arr[26];
+            // }
             return [
                 "category"=>empty($arr[16])?0:$arr[16],//类目
                 "hairtype"=>empty($arr[22])?0:$arr[22],//真人发类型
@@ -186,6 +189,7 @@ class Model_logic_zhlp extends Lin_Model {
                 'lacesize'=> $lacesize,
                 'lacecolor'=>empty($arr[9])?0:$arr[9],//蕾丝颜色
                 "lacetypes"=>empty($arr[44])?0:$arr[44],//蕾丝类型
+                "lacetypestwo"=>empty($arr[54])?0:$arr[54],//蕾丝类型
                 "size"=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }else{
@@ -200,10 +204,11 @@ class Model_logic_zhlp extends Lin_Model {
                 10=>empty($arr[10])?0:$arr[10],//密 度
                 //到时间会去重处理
                 25=>empty($arr[25])?0:$arr[25],//蕾丝尺寸
-                26=>empty($arr[26])?0:$arr[26],//蕾丝尺寸
+                //26=>empty($arr[26])?0:$arr[26],//蕾丝尺寸
 
                 9=>empty($arr[9])?0:$arr[9],//蕾丝颜色
                 44=>empty($arr[44])?0:$arr[44],//蕾丝类型
+                54=>empty($arr[54])?0:$arr[54],//蕾丝类型
                 14=>empty($arr[14])?0:$arr[14],//长 度
             ];
         }
@@ -486,11 +491,13 @@ class Model_logic_zhlp extends Lin_Model {
 			$list['type'] = empty($post['type'])?'':$post['type'];
 			$list['headroad'] = empty($post['headroad'])?'':$post['headroad'];
 			$list['density'] =empty($post['density'])?'':$post['density'];
-			if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
-				$list['lacesize'] = empty($post['lacesize'])?'':$post['lacesize'];
-			}
+			// if ($list['type'] == 195 || $list['type'] == 197 || $list['type'] == 199) {
+			// 	$list['lacesize'] = empty($post['lacesize'])?'':$post['lacesize'];
+			// }
+            $list['lacesize'] = empty($post['lacesize'])?'':$post['lacesize'];
 			$list['lacecolor'] = empty($post['lacecolor'])?'':$post['lacecolor'];
 			$list['lacetypes'] = empty($post['lacetypes'])?'':$post['lacetypes'];
+            $list['lacetypestwo'] = empty($post['lacetypestwo'])?'':$post['lacetypestwo'];
 		}
 		if ($category == 128) {
 			$list['lacetype'] =empty($post['lacetype'])?'':$post['lacetype'];
@@ -538,14 +545,36 @@ class Model_logic_zhlp extends Lin_Model {
 				$features .= $v . '-';
 				$typeclass = $this->typeclass->read($v);
 				if (isset($pm[$typeclass['classid']])) {
+                    
 					if (stripos($typeclass['zh'], '|') !== false) {
 						$exzh = explode('|', $typeclass['zh']);
-						$pm[$typeclass['classid']] = $exzh[0];
+						
+                        if($k == 'hairtype'){
+                            if(!in_array($v,[163,164,165,166])){
+                                $pm[$typeclass['classid']] = $exzh[0];
+                            }
+                        }else{
+                            $pm[$typeclass['classid']] = $exzh[0];
+                        }
 					} else {
-						$pm[$typeclass['classid']] = $typeclass['zh'];
+						
+                        if($k == 'hairtype'){
+                            if(!in_array($v,[163,164,165,166])){
+                                $pm[$typeclass['classid']] = $typeclass['zh'];
+                            }
+                        }else{
+                           $pm[$typeclass['classid']] = $typeclass['zh'];
+                        }
 					}
 				}
-				$scsku[$typeclass['classid']] = $typeclass['bqsku'];
+                if($k == 'hairtype'){
+                    if(!in_array($v,[163,164,165,166])){
+                        $scsku[$typeclass['classid']] = $typeclass['bqsku'];
+                    }
+                }else{
+                    $scsku[$typeclass['classid']] = $typeclass['bqsku'];
+                }
+				
 				if ($k != 'size') {
 					$title .= $typeclass['title'] . " ";
 				}
@@ -598,4 +627,45 @@ class Model_logic_zhlp extends Lin_Model {
 		$zh = implode(" ", $pm);
         return $zh;
     }
+    //根据features 获取对应的特征码
+    public function getYstzm($features){
+        $arr = explode("-",trim($features, '-'));
+        $list = $this->typeclass->find_all("id in (".implode(",",$arr).")");
+        if(empty($list)){
+            return [];
+        }
+        $class_ids =  [];
+        foreach($list as $val){
+            $class_ids[] = $val['classid'];
+        }
+        $class_list = $this->classid->find_all("id in (".implode(",",$class_ids).")");
+        if(empty($class_list)){
+            return [];
+        }
+        $tmp_list = [];
+        foreach($class_list as $k=>$v){
+            foreach($list as $key=>$val){
+                if($v['id'] == $val['classid']){
+                    if(!empty($v['ysdiybm'])){
+                        $tmp_list[$v['ysdiybm']] = $val['ysbm']; 
+                    }
+                }
+            }
+        }
+        return $tmp_list;
+    }
+    // 将erp的原始 fpdate 转化为 u9料品信息
+    public function fpdatetransjm($fpdate,$typeclass){
+
+    }
+
+    protected function fpdatetransjmdetail($str,$typeclass){
+
+    }
+
+    public function getFeatures($str,$typeclass){
+
+    }
+
+   
 }

core/CoreApp/models/Model_returngoods.php

@@ -103,7 +103,7 @@ class Model_returngoods extends Lin_Model
             14 =>"未收到货-不想要了",
             15 =>"未收到货-下错单",
             16 =>"未收到货-重复下单",
-            17 =>"好评/推广返现"
+            17 =>"好评/推广返现",
         ];
     }
 

core/CoreApp/models/Model_whlabel.php

@@ -261,4 +261,27 @@ class Model_Whlabel extends Lin_Model
 			return array('t'=>1,'m'=>json_encode(array('t'=>1,'msg'=>'库存操作错误，请重试！','oldwarehouse'=>$oldwarehouse-1,'success'=>false)));
 		}
 	}
+
+
+	//配置库存的出库类型
+	public function getCkType(){
+		return [
+			'1'=>"销售出库",
+			'2'=>"销售美国出库",
+			'3'=>'盘亏调整',
+			'4'=>'其它调整出库',
+			'5'=>"形态转化出库",
+		];
+	}
+	//配置库存的入库类型
+	public function getRkType(){
+		return [
+			'1'=>"采购入库",
+			'2'=>"盘盈调整",
+			'3'=>"其他调整入库",
+			'5'=>'退库入库',
+			'6'=>'退货可用入库',
+			'7'=>'形态转换入库',
+		];
+	}
 }  //end class

core/CoreApp/models/Model_zxyuntu.php

@@ -140,7 +140,7 @@ public function get_data($data){
 		//$post['datas'][0]["items"][0]['merchantproductid'] = $data['orderinfo'];
 		$post['datas'][0]["items"][0]['skucode'] = $data['orderinfo'];
 		$post['datas'][0]["items"][0]['manufacturerproductid'] = $data['orderinfo'];
-		$post['datas'][0]["items"][0]['intlstdproductid'] = 'NA';
+		$post['datas'][0]["items"][0]['intlstdproductid'] = '';
 	}
 	$jsonBody = json_encode($post);
 	//$start_time = time();

core/CoreApp/models/Model_zzquque_u9.php

@@ -13,6 +13,7 @@ class Model_zzquque_u9 extends Lin_Model
 		return [
 			1=>"备货流转-在途",//实际就是在途库存的在途过程 需要在香港组织留痕
 			2=>"备货流转-美仓",//实际就是在途库存的完成过程 需要在香港组织留痕
+			9=>"小单工厂-成品库",//因为YS的限制1分钟40次  不能再 直接执行力 让等2秒也不合适 所以先扫成功 让系统自动帮忙执行可否
 			10=>"小单临时",//实际就是小单从许昌仓发出后 需要在香港组织留痕
 			11=>"小单美仓",//实际就是香港仓出货了
 			20=>"工厂外销单",

template/erp/choice.html

@@ -84,14 +84,14 @@
 						<option></option>
 					</select>
 
-					<li class="1 none cikeb">
+					<!-- <li class="1 none cikeb">
 						<em>类 型：</em>
 						<select name="type" class="select">
 							{loop typeclass(27) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 							{/loop}
 						</select>
-					</li>
+					</li> -->
 
 					<li class="1 none">
 						<em>头路设计：</em>
@@ -105,6 +105,7 @@
 					<li class="1 none">
 						<em>密 度：</em>
 						<select name="density" class="select">
+							<option value="">未选择</option>
 							{loop typeclass(10) as $val}
 							{if $val['id']==72}
 							<option value="{$val['id']}" {if $weight['density']==$val['id']}selected="selected" {/if}>
@@ -129,14 +130,14 @@
 						</select>
 					</li>
 
-					<li class="a2 none">
+					<!-- <li class="a2 none">
 						<em>蕾丝尺寸：</em>
 						<select name="lacesize" class="select">
 							{loop typeclassyc(26) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 							{/loop}
 						</select>
-					</li>
+					</li> -->
 
 					<li class="a3 none">
 						<em>蕾丝尺寸：</em>
@@ -163,7 +164,7 @@
 					</li>
 
 					<li class="1 none">
-						<em>蕾丝类型：</em>
+						<em>蕾丝网材：</em>
 						<select name="lacetypes" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(44) as $val}
@@ -171,6 +172,15 @@
 							{/loop}
 						</select>
 					</li>
+					<li class="1 none">
+						<em>蕾丝格式：</em>
+						<select name="lacetypestwo" class="select">
+							<option value="">未选择</option>
+							{loop typeclassyc(54) as $val}
+							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+							{/loop}
+						</select>
+					</li>
 
 					<li class="4 none">
 						<em>Gift类型：</em>
@@ -582,8 +592,8 @@
 			 }
 		};
 		**/
-
 	</script>
-	<script src="{$theme}js/fullorder-addedit.js?v=202310110001"></script>
+	<!-- <script src="{$theme}js/fullorder-addedit.js?v={time()}"></script> -->
+	<script src="{$theme}js/fullorder-addedit.js?v=202310110002"></script>
 	<script src="{$theme}js/goodsrules.js?v=202310110001"></script>
-	{Template footer}
+	{Template footer}

template/erp/choices.html

@@ -84,14 +84,14 @@
 						<option></option>
 					</select>
 
-					<li class="1 none cikeb">
+					<!-- <li class="1 none cikeb">
 						<em>类 型：</em>
 						<select name="type" class="select">
 							{loop typeclass(27) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 							{/loop}
 						</select>
-					</li>
+					</li> -->
 
 					<li class="1 none">
 						<em>头路设计：</em>
@@ -105,6 +105,8 @@
 					<li class="1 none">
 						<em>密 度：</em>
 						<select name="density" class="select">
+							<option value="">未选择</option>
+
 							{loop typeclass(10) as $val}
 							{if $val['id']==72}
 							<option value="{$val['id']}" {if $weight['density']==$val['id']}selected="selected" {/if}>
@@ -129,14 +131,14 @@
 						</select>
 					</li>
 
-					<li class="a2 none">
+					<!-- <li class="a2 none">
 						<em>蕾丝尺寸：</em>
 						<select name="lacesize" class="select">
 							{loop typeclassyc(26) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 							{/loop}
 						</select>
-					</li>
+					</li> -->
 
 					<li class="a3 none">
 						<em>蕾丝尺寸：</em>
@@ -163,7 +165,7 @@
 					</li>
 
 					<li class="1 none">
-						<em>蕾丝类型：</em>
+						<em>蕾丝网材：</em>
 						<select name="lacetypes" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(44) as $val}
@@ -171,6 +173,15 @@
 							{/loop}
 						</select>
 					</li>
+					<li class="1 none">
+						<em>蕾丝格式：</em>
+						<select name="lacetypestwo" class="select">
+							<option value="">未选择</option>
+							{loop typeclassyc(54) as $val}
+							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+							{/loop}
+						</select>
+					</li>
 
 					<li class="4 none">
 						<em>Gift类型：</em>
@@ -584,6 +595,6 @@
 		**/
 
 	</script>
-	<script src="{$theme}js/fullorder-addeditdlz.js?v=2023101100111"></script>
+	<script src="{$theme}js/fullorder-addeditdlz.js?v=2023101100012"></script>
 	<script src="{$theme}js/goodsrules.js?v=202310110001"></script>
 	{Template footer}

template/erp/common_product.html

@@ -66,14 +66,14 @@
         <option></option>
     </select>
 
-    <li class="1 none cikeb">
+    <!-- <li class="1 none cikeb">
         <em>类 型：</em>
         <select name="type" class="select">
             {loop typeclass(27) as $val}
             <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
             {/loop}
         </select>
-    </li>
+    </li> -->
 
     <li class="1 none">
         <em>头路设计：</em>
@@ -87,6 +87,7 @@
     <li class="1 none">
         <em>密 度：</em>
         <select name="density" class="select">
+            <option value="">未选择</option>
             {loop typeclass(10) as $val}
             {if $val['id']==72}
             <option value="{$val['id']}" {if $weight['density']==$val['id']}selected="selected" {/if}>
@@ -111,14 +112,14 @@
         </select>
     </li>
 
-    <li class="a2 none">
+    <!-- <li class="a2 none">
         <em>蕾丝尺寸：</em>
         <select name="lacesize" class="select">
             {loop typeclassyc(26) as $val}
             <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
             {/loop}
         </select>
-    </li>
+    </li> -->
 
     <li class="a3 none">
         <em>蕾丝尺寸：</em>
@@ -145,7 +146,7 @@
     </li>
 
     <li class="1 none">
-        <em>蕾丝类型：</em>
+        <em>蕾丝网材：</em>
         <select name="lacetypes" class="select">
             <option value="">未选择</option>
             {loop typeclassyc(44) as $val}
@@ -153,6 +154,15 @@
             {/loop}
         </select>
     </li>
+    <li class="1 none">
+        <em>蕾丝格式：</em>
+        <select name="lacetypestwo" class="select">
+            <option value="">未选择</option>
+            {loop typeclassyc(54) as $val}
+            <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+            {/loop}
+        </select>
+    </li>
 
     <li class="4 none">
         <em>Gift类型：</em>

template/erp/customer_mdedit2.html

@@ -271,6 +271,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+	<option value="">未选择</option>
 {loop typeclass(10) as $val}
 <option value="{$val['id']}">{$val['title']}</option>
 {/loop}

template/erp/footer.html

@@ -118,6 +118,6 @@ window.onbeforeunload = function() {
             }
         };
 </script>
-<script src="{$theme}js/index.js?v=202509110001"></script>
+<script src="{$theme}js/index.js?v=2025091100013"></script>
 </body>
 </html>

template/erp/js/fullorder-addedit.js

@@ -551,6 +551,12 @@ $("#currency").change(function(){
 		{
 			$(".synthetichair").show();
 		}
+    //var indexb = $(".cikeb.post select").find("option:selected").val();
+	//发块的类型的清除 这里直接写死了
+	if(index == 1){
+		var indexb = 195;
+	}else{
+		var indexb = 0;
 	}
     var indexb = $(".cikeb.post select").find("option:selected").val();
 	$(".pttab .a1").hide();$(".pttab .a2").hide();$(".pttab .a3").hide();$(".pttab .a4").hide();$(".pttab .a1").removeClass("post");$(".pttab .a2").removeClass("post");$(".pttab .a3").removeClass("post");$(".pttab .a4").removeClass("post");

template/erp/js/fullorder-addeditdlz.js

@@ -555,6 +555,12 @@ $("#currency").change(function(){
 		{
 			$(".synthetichair").show();
 		}
+    //var indexb = $(".cikeb.post select").find("option:selected").val();
+	//发块的类型的清除 这里直接写死了
+	if(index == 1){
+		var indexb = 195;
+	}else{
+		var indexb = 0;
 	}
     var indexb = $(".cikeb.post select").find("option:selected").val();
 	$(".pttab .a1").hide();$(".pttab .a2").hide();$(".pttab .a3").hide();$(".pttab .a4").hide();$(".pttab .a1").removeClass("post");$(".pttab .a2").removeClass("post");$(".pttab .a3").removeClass("post");$(".pttab .a4").removeClass("post");

template/erp/js/fullorder-addeditv2.js

@@ -556,7 +556,13 @@ $("#currency").change(function(){
 			$(".synthetichair").show();
 		}
 	}
-    var indexb = $(".cikeb.post select").find("option:selected").val();
+    //var indexb = $(".cikeb.post select").find("option:selected").val();
+	//发块清除这里直接写死了
+	if(index == 1){
+        var indexb = 195;
+    }else{
+        var indexb = 0;
+    }
 	$(".pttab .a1").hide();$(".pttab .a2").hide();$(".pttab .a3").hide();$(".pttab .a4").hide();$(".pttab .a1").removeClass("post");$(".pttab .a2").removeClass("post");$(".pttab .a3").removeClass("post");$(".pttab .a4").removeClass("post");
 	if(indexb == 195)
      {

template/erp/js/index.js

@@ -1041,7 +1041,14 @@ $(".cike select").change(function(){
 	}
  });
 $(".cikeb select").change(function(){
-    var indexb = $(this).find("option:selected").val();
+    //var indexb = $(this).find("option:selected").val();
+	//发块的类型的清除 这里直接写死了
+	if(index == 1){
+		var indexb = 195;
+	}else{
+		var indexb = 0;
+	}
+
 	$(".pttab .a1").hide();$(".pttab .a2").hide();$(".pttab .a3").hide();$(".pttab .a4").hide();$(".pttab .a1").removeClass("post");$(".pttab .a2").removeClass("post");$(".pttab .a3").removeClass("post");$(".pttab .a4").removeClass("post");
 	if(indexb == 195)
      {
@@ -2735,6 +2742,13 @@ function cpxz() {
 		{
 			$(".synthetichair").show();
 		}
+    //var indexb = $(".cikeb.post select").find("option:selected").val();
+	//发块的类型的清除 这里直接写死了
+	
+	if(index == 1){
+		var indexb = 195;
+	}else{
+		var indexb = 0;
 	}
     var indexb = $(".cikeb.post select").find("option:selected").val();
 	$(".pttab .a1").hide();$(".pttab .a2").hide();$(".pttab .a1").removeClass("post");$(".pttab .a2").removeClass("post");

template/erp/specialstock_enteradd.html

@@ -79,14 +79,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -100,6 +100,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -122,14 +123,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -154,15 +155,23 @@
 {/loop}
 </select>
 </li>
-
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/specialstock_enteredit.html

@@ -79,14 +79,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -100,6 +100,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -122,14 +123,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -156,13 +157,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">
@@ -438,6 +448,15 @@
 		{/loop}
 	</select>
 </li>
+<li class="none4">
+<em>长 度：</em>
+<select name="size" class="select">
+	<option value="">未选择</option>
+{loop typeclass(14) as $val}
+<option value="{$val['id']}">{$val['title']}</option>
+{/loop}
+</select>
+</li>
 </div>
 <div class="datalist postgift">
 <li>

template/erp/transfer_print.html

@@ -68,14 +68,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -89,6 +89,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -111,14 +112,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -144,14 +145,25 @@
 </select>
 </li>
 
+
+
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/weight_add.html

@@ -69,14 +69,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -90,6 +90,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -112,14 +113,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -146,13 +147,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/weight_edit.html

@@ -69,14 +69,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -90,6 +90,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -112,14 +113,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -145,7 +146,7 @@
 </select>
 </li>
 
-<li class="1 none">
+<!-- <li class="1 none">
 <em>蕾丝类型：</em>
 <select name="lacetypes" class="select">
 <option value="">未选择</option>
@@ -153,6 +154,24 @@
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
+</li> -->
+<li class="1 none">
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/whlabel_bh_add.html

@@ -72,14 +72,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -93,6 +93,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -115,14 +116,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -148,7 +149,7 @@
 </select>
 </li>
 
-<li class="1 none">
+<!-- <li class="1 none">
 <em>蕾丝类型：</em>
 <select name="lacetypes" class="select">
 <option value="">未选择</option>
@@ -156,7 +157,27 @@
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
+</li> -->
+
+<li class="1 none">
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+
 
 <li class="4 none">
 <em>Gift类型：</em>

template/erp/whlabel_bh_edit.html

@@ -74,14 +74,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -95,6 +95,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -117,14 +118,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -151,13 +152,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 

template/erp/whlabel_enteradd.html

@@ -79,14 +79,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -100,6 +100,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>	
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -122,14 +123,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -156,13 +157,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/whlabel_enteredit.html

@@ -79,7 +79,7 @@
 
 <div class="pttab">
 <select class="none select"><option></option></select>
-
+<!-- 
 <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
@@ -87,7 +87,7 @@
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -101,6 +101,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -123,14 +124,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -157,13 +158,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+	<em>蕾丝网材：</em>
+	<select name="lacetypes" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(44) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
+</li>
+<li class="1 none">
+	<em>蕾丝格式：</em>
+	<select name="lacetypestwo" class="select">
+		<option value="">未选择</option>
+		{loop typeclassyc(54) as $val}
+		<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+		{/loop}
+	</select>
 </li>
 
 <li class="4 none">

template/erp/whlabel_print.html

@@ -88,14 +88,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -109,6 +109,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -131,14 +132,14 @@
 </select>
 </li>
 
-<li class="a2 none">
+<!-- <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
 {loop typeclassyc(26) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -165,13 +166,22 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
-<select name="lacetypes" class="select">
-<option value="">未选择</option>
-{loop typeclassyc(44) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
-{/loop}
-</select>
+    <em>蕾丝网材：</em>
+    <select name="lacetypes" class="select">
+        <option value="">未选择</option>
+        {loop typeclassyc(44) as $val}
+        <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+        {/loop}
+    </select>
+</li>
+<li class="1 none">
+    <em>蕾丝格式：</em>
+    <select name="lacetypestwo" class="select">
+        <option value="">未选择</option>
+        {loop typeclassyc(54) as $val}
+        <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+        {/loop}
+    </select>
 </li>
 
 <li class="4 none">

template/erp/whlabel_usaprint.html

@@ -85,14 +85,14 @@
 <div class="pttab">
 <select class="none select"><option></option></select>
 
-<li class="1 none cikeb">
+<!-- <li class="1 none cikeb">
 <em>类 型：</em>
 <select name="type" class="select">
 {loop typeclass(27) as $val}
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="1 none">
 <em>头路设计：</em>
@@ -106,6 +106,7 @@
 <li class="1 none">
 <em>密 度：</em>
 <select name="density" class="select">
+<option value="">未选择</option>
 {loop typeclass(10) as $val}
 {if $val['id']==72}
 <option value="{$val['id']}" {if $weight['density'] == $val['id']}selected="selected"{/if}>{$val['title']}</option>
@@ -127,7 +128,7 @@
 {/loop}
 </select>
 </li>
-
+<!-- 
 <li class="a2 none">
 <em>蕾丝尺寸：</em>
 <select name="lacesize" class="select">
@@ -135,7 +136,7 @@
 <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
 {/loop}
 </select>
-</li>
+</li> -->
 
 <li class="a3 none">
 <em>蕾丝尺寸：</em>
@@ -162,7 +163,7 @@
 </li>
 
 <li class="1 none">
-<em>蕾丝类型：</em>
+<em>蕾丝网材：</em>
 <select name="lacetypes" class="select">
 <option value="">未选择</option>
 {loop typeclassyc(44) as $val}
@@ -170,7 +171,15 @@
 {/loop}
 </select>
 </li>
-
+<li class="1 none">
+<em>蕾丝格式：</em>
+<select name="lacetypestwo" class="select">
+<option value="">未选择</option>
+{loop typeclassyc(44) as $val}
+<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
+{/loop}
+</select>
+</li>
 <li class="4 none">
 <em>Gift类型：</em>
 <select name="gifttype" class="select">