回复原装

core/CoreApp/controllers/Boss.php

@@ -1278,67 +1278,24 @@ class Boss extends Start_Controller {
 					$zh = implode(" ",$pm);
 					$zh = str_replace('自然色 ','',rtrim($zh,' '));
 					$zh = str_replace(array('        ','       ','      ','     ','    ','   ','  '),' ',$zh);
-					// if(isset($title[1])){
-					// 	if(isset($sp[$title[1]]))
-					// 	{
-					// 		$sp[$title[1]]['n'] += $title[2];
-					// 		if(isset($sp[$title[1]]['warehouse'][$val['type']])){
-					// 		    $sp[$title[1]]['warehouse'][$val['type']] += $title[2];
-					// 		}else{
-					// 		    $sp[$title[1]]['warehouse'][$val['type']] = $title[2];
-					// 		}
-					// 		//美仓
-					// 		if($val['type'] == 5){
-					// 			$sp[$title[1]]['mc'] +=  $title[2];
-					// 		}elseif($val['type'] == 13){//许昌仓
-					// 			$sp[$title[1]]['xcc'] +=  $title[2];
-					// 		}elseif($val['type'] == 16){//定制仓
-					// 			$sp[$title[1]]['dzc'] +=  $title[2];
-					// 		}else{
-					// 			$sp[$title[1]]['qtc'] +=  $title[2];
-					// 		}
-					// 	}
-					// 	else
-					// 	{
-					// 		$wh = explode('-',$w[$k]);
-					// 		$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");
-					// 		$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';
-					// 		$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'c'=>$tmp_c,'w'=>$whs,'j'=>$jm,'n'=>$title[2],"warehouse"=>[
-					// 		        $val['type'] =>$title[2],
-					// 		    ],"warehouse_show"=>"","xcc"=>0,"mc"=>0,"dzc"=>0,"qtc"=>0);
-					// 		//美仓
-					// 		if($val['type'] == 5){
-					// 			$sp[$title[1]]['mc'] =  $title[2];
-					// 		}elseif($val['type'] == 13){//许昌仓
-					// 			$sp[$title[1]]['xcc'] =  $title[2];
-					// 		}elseif($val['type'] == 16){//定制仓
-					// 			$sp[$title[1]]['dzc'] =  $title[2];
-					// 		}else{
-					// 			$sp[$title[1]]['qtc'] =  $title[2];
-					// 		}
-					// 	}
-					// }
-
-					//由于原来的按照品名分组可能会有异常 这里将品名转化为skuid为分组依据
-					$wh = explode('-',$w[$k]);
-					if(isset($wh[0])){
-						if(isset($sp[$wh[0]]))
+					if(isset($title[1])){
+						if(isset($sp[$title[1]]))
 						{
-							$sp[$wh[0]]['n'] += $title[2];
-							if(isset($sp[$wh[0]]['warehouse'][$val['type']])){
-							    $sp[$wh[0]]['warehouse'][$val['type']] += $title[2];
+							$sp[$title[1]]['n'] += $title[2];
+							if(isset($sp[$title[1]]['warehouse'][$val['type']])){
+							    $sp[$title[1]]['warehouse'][$val['type']] += $title[2];
 							}else{
-							    $sp[$wh[0]]['warehouse'][$val['type']] = $title[2];
+							    $sp[$title[1]]['warehouse'][$val['type']] = $title[2];
 							}
 							//美仓
 							if($val['type'] == 5){
-								$sp[$wh[0]]['mc'] +=  $title[2];
+								$sp[$title[1]]['mc'] +=  $title[2];
 							}elseif($val['type'] == 13){//许昌仓
-								$sp[$wh[0]]['xcc'] +=  $title[2];
+								$sp[$title[1]]['xcc'] +=  $title[2];
 							}elseif($val['type'] == 16){//定制仓
-								$sp[$wh[0]]['dzc'] +=  $title[2];
+								$sp[$title[1]]['dzc'] +=  $title[2];
 							}else{
-								$sp[$wh[0]]['qtc'] +=  $title[2];
+								$sp[$title[1]]['qtc'] +=  $title[2];
 							}
 						}
 						else
@@ -1346,22 +1303,65 @@ class Boss extends Start_Controller {
 							$wh = explode('-',$w[$k]);
 							$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");
 							$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';
-							$sp[$wh[0]] = array('t'=>$title[1],'z'=>$zh,'c'=>$tmp_c,'w'=>$whs,'j'=>$jm,'n'=>$title[2],"warehouse"=>[
+							$sp[$title[1]] = array('t'=>$title[1],'z'=>$zh,'c'=>$tmp_c,'w'=>$whs,'j'=>$jm,'n'=>$title[2],"warehouse"=>[
 							        $val['type'] =>$title[2],
 							    ],"warehouse_show"=>"","xcc"=>0,"mc"=>0,"dzc"=>0,"qtc"=>0);
 							//美仓
 							if($val['type'] == 5){
-								$sp[$wh[0]]['mc'] =  $title[2];
+								$sp[$title[1]]['mc'] =  $title[2];
 							}elseif($val['type'] == 13){//许昌仓
-								$sp[$wh[0]]['xcc'] =  $title[2];
+								$sp[$title[1]]['xcc'] =  $title[2];
 							}elseif($val['type'] == 16){//定制仓
-								$sp[$wh[0]]['dzc'] =  $title[2];
+								$sp[$title[1]]['dzc'] =  $title[2];
 							}else{
-								$sp[$wh[0]]['qtc'] =  $title[2];
+								$sp[$title[1]]['qtc'] =  $title[2];
 							}
 						}
 					}
 
+					//由于原来的按照品名分组可能会有异常 这里将品名转化为skuid为分组依据
+					// $wh = explode('-',$w[$k]);
+					// if(isset($wh[0])){
+					// 	if(isset($sp[$wh[0]]))
+					// 	{
+					// 		$sp[$wh[0]]['n'] += $title[2];
+					// 		if(isset($sp[$wh[0]]['warehouse'][$val['type']])){
+					// 		    $sp[$wh[0]]['warehouse'][$val['type']] += $title[2];
+					// 		}else{
+					// 		    $sp[$wh[0]]['warehouse'][$val['type']] = $title[2];
+					// 		}
+					// 		//美仓
+					// 		if($val['type'] == 5){
+					// 			$sp[$wh[0]]['mc'] +=  $title[2];
+					// 		}elseif($val['type'] == 13){//许昌仓
+					// 			$sp[$wh[0]]['xcc'] +=  $title[2];
+					// 		}elseif($val['type'] == 16){//定制仓
+					// 			$sp[$wh[0]]['dzc'] +=  $title[2];
+					// 		}else{
+					// 			$sp[$wh[0]]['qtc'] +=  $title[2];
+					// 		}
+					// 	}
+					// 	else
+					// 	{
+					// 		$wh = explode('-',$w[$k]);
+					// 		$wsku = $this->whlabel->find_all("number = '".$wh[0]."' and sku != 'Preset'");
+					// 		$whs = (isset($wsku[0]['sku']))?$wsku[0]['sku']:'';
+					// 		$sp[$wh[0]] = array('t'=>$title[1],'z'=>$zh,'c'=>$tmp_c,'w'=>$whs,'j'=>$jm,'n'=>$title[2],"warehouse"=>[
+					// 		        $val['type'] =>$title[2],
+					// 		    ],"warehouse_show"=>"","xcc"=>0,"mc"=>0,"dzc"=>0,"qtc"=>0);
+					// 		//美仓
+					// 		if($val['type'] == 5){
+					// 			$sp[$wh[0]]['mc'] =  $title[2];
+					// 		}elseif($val['type'] == 13){//许昌仓
+					// 			$sp[$wh[0]]['xcc'] =  $title[2];
+					// 		}elseif($val['type'] == 16){//定制仓
+					// 			$sp[$wh[0]]['dzc'] =  $title[2];
+					// 		}else{
+					// 			$sp[$wh[0]]['qtc'] =  $title[2];
+					// 		}
+					// 	}
+					// }
+
 
 				}
 			}