取消掉匹配规则RTGWL和非RTGWL的互换

core/CoreApp/controllers/Warehouse.php

@@ -442,6 +442,7 @@ class Warehouse extends Start_Controller {
 							    }
 							}
 							//美国仓提档检测是否有货结束
+							//103 Body Wave     1647 LooseBody
 							if(stripos($cp,'-103-') !== false || stripos($cp,'-1647-') !== false)
 							{
 								$htpd += 1;
@@ -449,6 +450,7 @@ class Warehouse extends Start_Controller {
 								$newcp = '-';
 								foreach ($cc1 as $kk=>$vv)
 		   					    {
+									//曲度后边加了长度
 									if($kk == 1)
 									{
                 					    $newcp .= $vv.'-'.$cc[0].'-';
@@ -551,56 +553,56 @@ class Warehouse extends Start_Controller {
 							    	}
 							}
 							**/
-							//RTGWL
-							if(stripos($cp,'-2076-') !== false)
-							{
-								$cc1 = explode('-',trim($cc[1],'-'));
-								$newcp = '-';
-								foreach ($cc1 as $kk=>$vv)
-		   					    {
-									if($kk == 1)
-									{
-                					    $newcp .= $vv.'-'.$cc[0].'-';
-									}
-									else
-									{
-										$newcp .= $vv.'-';
-									}
-            					}
-									$gpp = str_replace('-2076-','-',$newcp);
-									$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用
-									if($ccxh >= $num[1])
-				                	{
-				        	        	$hdtx .= $v['title'].' - 非RTGWL有货；';
-							    	}
+							//RTGWL   注释掉了
+							// if(stripos($cp,'-2076-') !== false)
+							// {
+							// 		$cc1 = explode('-',trim($cc[1],'-'));
+							// 		$newcp = '-';
+							// 		foreach ($cc1 as $kk=>$vv)
+							// 		{
+							// 			if($kk == 1)
+							// 			{
+							// 				$newcp .= $vv.'-'.$cc[0].'-';
+							// 			}
+							// 			else
+							// 			{
+							// 				$newcp .= $vv.'-';
+							// 			}
+							// 		}
+							// 		$gpp = str_replace('-2076-','-',$newcp);
+							// 		$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用
+							// 		if($ccxh >= $num[1])
+				            //     	{
+				        	//         	$hdtx .= $v['title'].' - 非RTGWL有货；';
+							//     	}
 								
-							}
-							else if(stripos($cp,'-128-') !== false)
-							{
-								$cptt = array(16=>128,13=>80,14=>'',43=>'',8=>'57',15=>'',18=>'',6=>30,10=>72,9=>'',39=>'',44=>'');//头套
-								$cc1 = explode('-',trim($cc[1],'-'));
-								$cptt[$typeclass[$cc[0]]] = $cc[0];
-								$newcp = '-';
-								foreach ($cc1 as $kk=>$vv)
-		   					    {
-									$cptt[$typeclass[$vv]] = $vv;
-            					}
-								if($cptt[44] != '')
-								{
-									continue;
-								}
-								else
-								{
-									$cptt[44] = '2076';
-									$cptt = array_filter($cptt);
-								}
-									$gpp =  '-'.implode("-",$cptt).'-';
-									$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用
-									if($ccxh >= $num[1])
-				                	{
-				        	        	$hdtx .= $v['title'].' - RTGWL有货；';
-							    	}
-							}
+							// }
+							// else if(stripos($cp,'-128-') !== false)
+							// {
+							// 		$cptt = array(16=>128,13=>80,14=>'',43=>'',8=>'57',15=>'',18=>'',6=>30,10=>72,9=>'',39=>'',44=>'');//头套
+							// 		$cc1 = explode('-',trim($cc[1],'-'));
+							// 		$cptt[$typeclass[$cc[0]]] = $cc[0];
+							// 		$newcp = '-';
+							// 		foreach ($cc1 as $kk=>$vv)
+							// 		{
+							// 			$cptt[$typeclass[$vv]] = $vv;
+							// 		}
+							// 		if($cptt[44] != '')
+							// 		{
+							// 			continue;
+							// 		}
+							// 		else
+							// 		{
+							// 			$cptt[44] = '2076';
+							// 			$cptt = array_filter($cptt);
+							// 		}
+							// 		$gpp =  '-'.implode("-",$cptt).'-';
+							// 		$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用
+							// 		if($ccxh >= $num[1])
+				            //     	{
+				        	//         	$hdtx .= $v['title'].' - RTGWL有货；';
+							//     	}
+							// }
 							
 							// 4*7没货的，5*7如果有货，给提醒
 							if(stripos($cp,'-1253-') !== false)