修改进销存展示

core/CoreApp/controllers/Whlabel.php

@@ -1349,6 +1349,7 @@ class Whlabel extends Start_Controller
 				$od = array();
 				$odid = '';
 				$companytitle = '';
+				$shop_list = [];
 				foreach ($qbdata as $v) {
 					if ($v['zd'] != "" && $v['state'] < 1) {
 						if (!isset($od[$v['zd']])) {
@@ -1363,9 +1364,20 @@ class Whlabel extends Start_Controller
 							$cpid[$v['cpid']] = $v['cpid'];
 						}
 					}
-					if ($v['companytitle'] != '' &&  stripos($companytitle, $company[$v['companytitle']]) === false) {
-						$companytitle .= '<p>' . $company[$v['companytitle']] . '</p>';
+					if($v['state'] == 0){
+						if ($v['companytitle'] != '' &&  stripos($companytitle, $company[$v['companytitle']]) === false) {
+							$companytitle .= '<p>' . $company[$v['companytitle']] . '</p>';
+						}
+						if ($v['shop'] != '') {
+							$shop = explode(',', trim($v['shop'], ','));
+							foreach ($shop as $vv) {
+								if (!in_array($vv, $shop_list)) {
+									$shop_list[] = $vv;	
+								}		
+							}
+						}
 					}
+					
 				}
 				foreach ($od as $k => $vv) {
 					$odid .= $k . '数量' . $vv;
@@ -1394,11 +1406,20 @@ class Whlabel extends Start_Controller
 				 **/
 				$info_list[$key]['shop'] = '';
 				$info_list[$key]['details'] = ($cpid) ? implode(" ", $details) . '<p>' . implode(" ", $cpid) . '</p>' : implode(" ", $details);
-				if ($value['shop'] != '') {
-					$shop = explode(',', trim($value['shop'], ','));
-					$info_list[$key]['shop'] = '<p>' . $sp[$shop[0]] . '</p>';
+				// if ($value['shop'] != '') {
+				// 	$shop = explode(',', trim($value['shop'], ','));
+				// 	$info_list[$key]['shop'] = '<p>' . $sp[$shop[0]] . '</p>';
+				// }
+
+				$shop_list = array_unique($shop_list);
+				$shop_str = '';
+				foreach ($shop_list as $v) {
+					if(isset($sp[$v])){
+						$shop_str .= '<p>' . $sp[$v] . '</p>';
+					}
 				}
-				$info_list[$key]['shop'] .= $companytitle;
+				
+				$info_list[$key]['shop'] = $shop_str.$companytitle;
 				/**
 				$companytitle = $this->whlabel->find_pc($where.$fjnr,'companytitle','companytitle');
 				if(isset($companytitle[0]))