修改许昌仓库存条信息展示

core/CoreApp/controllers/Whlabel.php

@@ -877,6 +877,8 @@ class Whlabel extends Start_Controller
 			}
 			$rows = array();
 			$list = array();
+			$info_list = $this->logic_whlabel->dataTran($info_list, ['pm']);
+			
 			foreach ($info_list as $key => $value) {
 				$info_list[$key]['purchase'] = (isset($prc[$value['purchase']])) ? $prc[$value['purchase']] : '未知';
 				$mc = $this->whlabel->find_all("sku = '" . $value['sku'] . "' and features = '" . $value['features'] . "' and warehouse = '" . $value['warehouse'] . "'", 'cpbz', 'id desc', 0, 1);
@@ -900,17 +902,10 @@ class Whlabel extends Start_Controller
 					}
 				}
 				$info_list[$key]['details'] = ($cpid) ? implode(" ", $details) . '<p>' . implode(" ", $cpid) . '</p>' : implode(" ", $details);
-				$classid = $this->classid->sku();
-				$pm = $classid;
-				$features = explode('-', trim($value['features'], '-'));
-				foreach ($features as $v) {
-					$zh = explode('|', trim($t[$v]['zh'], '|'));
-					$pm[$t[$v]['classid']] = $zh[0];
-				}
-				$zh = implode(" ", $pm);
-				$zh = str_replace('自然色 ', '', rtrim($zh, ' '));
-				$zh = str_replace(array('        ', '       ', '      ', '     ', '    ', '   ', '  '), ' ', $zh);
-				$info_list[$key]['sm'] = $zh;
+				$info_list[$key]['sm'] = $info_list[$key]['pm'];
+				unset($info_list[$key]['pm']);
+				unset($info_list[$key]['jm']);
+				unset($info_list[$key]['bm']);
 			}
 			$total = count($this->whlabel->find_pc($where, 'sku,features,warehouse', 'id,warehouse,sku,title,features,number'));
 			$pagenum = ceil($total / $perpage);
@@ -1005,43 +1000,27 @@ class Whlabel extends Start_Controller
 			}
 			$tc = array();
 			$tcdata = array();
-			$typeclass = $this->typeclass->find_all();
-			foreach ($typeclass as $v) {
-				$tc[$v['id']] = $v;
-			}
+			
 			$list = array();
+			$classid = $this->classid->sku();
+            $tcall = $this->typeclass->find_all();
+			$typeclass = array();
+            foreach ($tcall as $v)
+            {
+                //$tcjm[$v['id']] = array($v['jm'],$v['classid']);
+                $typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
+            }
 			$rows = $this->whlabel->find_pc($where, 'sku,features,warehouse', 'warehouse,purchase,details,cpid,sku,cpbz,cs,title,dbcontent,number,features');
 			foreach ($rows as $key => $value) {
-				$bm = '03';
-				$bmpx = array(13 => '', 16 => '', 18 => '', 25 => '', 26 => '', 41 => '');
+				
 				$rows[$key]['purchase'] = (isset($prc[$value['purchase']])) ? $prc[$value['purchase']] : '未知';
-				$classid = $this->classid->sku();
-				$pm = $classid;
-				$jm = $classid;
-				$features = explode('-', trim($value['features'], '-'));
-				foreach ($features as $v) {
-					if (isset($tc[$v]) && isset($bmpx[$tc[$v]['classid']])) {
-						if ($tc[$v]['bm'] != '') {
-							$bmpx[$tc[$v]['classid']] = $tc[$v]['bm'];
-						}
-					}
-					if (isset($tc[$v])) {
-						$zh = explode('|', trim($tc[$v]['zh'], '|'));
-						$pm[$tc[$v]['classid']] = $zh[0];
-					}
-					if (isset($tc[$v])) {
-						if (isset($jm[$tc[$v]['classid']])) {
-							$jm[$tc[$v]['classid']] = $tc[$v]['jm'];
-						}
-					}
-				}
-				$zh = implode(" ", $pm);
-				$zh = str_replace('自然色 ', '', rtrim($zh, ' '));
-				$zh = str_replace(array('        ', '       ', '      ', '     ', '    ', '   ', '  '), ' ', $zh);
-				$rows[$key]['dbcontent'] = $zh;
-				$rows[$key]['cpbz'] = $bm . implode("", $bmpx);
-				$jm = array_filter($jm);
-				$rows[$key]['cs'] = implode("-", $jm);
+			
+				$u9_info = $this->logic_u9tools->getOneU9bm($value['features'],$classid,$typeclass);
+
+				$rows[$key]['dbcontent'] = $u9_info['zh'];
+				$rows[$key]['cpbz'] = $u9_info['bm'];
+				
+				$rows[$key]['cs'] =  $u9_info['jm'];
 				$sd = $this->whlabel->find_all($where . ' and sku = "' . $value['sku'] . '" and warehouse = "' . $value['warehouse'] . '" and features = "' . $value['features'] . '"', 'details,cpid,cpbz,state');
 				$details = array();
 				$cpid = array();