1

core/CoreApp/controllers/Fullordersmt.php

@@ -1182,7 +1182,11 @@ class Fullordersmt extends Start_Controller {
 					    	$wzid = $this->$bdck->read(trim($val,$warehouse['hz']));
 							if($wzid['details'] != '')
 						    {
-					    	    $xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+								if($fullordersmt['type'] == 5){
+									$xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+								}else{
+									$xxv['zd'] .= '<p>位置：'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+								}
 							}
 						}
 					}
@@ -1191,7 +1195,11 @@ class Fullordersmt extends Start_Controller {
 					    $wzid = $this->$bdck->read(trim($xxv[9],$warehouse['hz']));
 						if($wzid['details'] != '')
 						{
-					        $xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+					        if($fullordersmt['type'] == 5){
+								$xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+							}else{
+								$xxv['zd'] .= '<p>位置：'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+							}
 						}
 					}
 				}
@@ -1601,7 +1609,11 @@ class Fullordersmt extends Start_Controller {
 					    	$wzid = $this->$bdck->read(trim($val,$warehouse['hz']));
 							if($wzid['details'] != '')
 						    {
-					    	    $xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+								if($fullordersmt['type'] == 5){
+									$xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+								}else{
+									$xxv['zd'] .= '<p>位置：'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+								}
 							}
 						}
 					}
@@ -1610,7 +1622,11 @@ class Fullordersmt extends Start_Controller {
 					    $wzid = $this->$bdck->read(trim($xxv[9],$warehouse['hz']));
 						if($wzid['details'] != '')
 						{
-					        $xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+					        if($fullordersmt['type'] == 5){
+								$xxv['zd'] .= '<p>位置：'.$wzid['details'].'</p>';
+							}else{
+								$xxv['zd'] .= '<p>位置：'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+							}
 						}
 					}
 				}