lvhao пре 12 часа
родитељ
комит
36d599c716
1 измењених фајлова са 21 додато и 4 уклоњено
  1. 21 4
      core/CoreApp/controllers/Fullorder.php

+ 21 - 4
core/CoreApp/controllers/Fullorder.php

@@ -1495,7 +1495,12 @@ class Fullorder extends Start_Controller {
 					    	$wzid = $this->$bdck->read(trim($val,$warehouse['hz']));
 							if($wzid['details'] != '')
 						    {
-					    	    $xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+								if($fullorder['type'] == 5){
+									$xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+								}else{
+									$xxv['zd'] .= '<p>位置:'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+								}
+					    	    
 							}
 						}
 					}
@@ -1504,7 +1509,11 @@ class Fullorder extends Start_Controller {
 					    $wzid = $this->$bdck->read(trim($xxv[9],$warehouse['hz']));
 						if($wzid['details'] != '')
 						{
-					        $xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+					        if($fullorder['type'] == 5){
+								$xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+							}else{
+								$xxv['zd'] .= '<p>位置:'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+							}
 						}
 					}
 				}
@@ -2078,7 +2087,11 @@ class Fullorder extends Start_Controller {
 					    	$wzid = $this->$bdck->read(trim($val,$warehouse['hz']));
 							if($wzid['details'] != '')
 						    {
-					    	    $xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+					    	    if($fullorder['type'] == 5){
+									$xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+								}else{
+									$xxv['zd'] .= '<p>位置:'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+								}
 							}
 						}
 					}
@@ -2087,7 +2100,11 @@ class Fullorder extends Start_Controller {
 					    $wzid = $this->$bdck->read(trim($xxv[9],$warehouse['hz']));
 						if($wzid['details'] != '')
 						{
-					        $xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+					        if($fullorder['type'] == 5){
+								$xxv['zd'] .= '<p>位置:'.$wzid['details'].'</p>';
+							}else{
+								$xxv['zd'] .= '<p>位置:'.$wzid['details'].' - '.$wzid['cpid'].'</p>';
+							}
 						}
 					}
 				}