1

core/CoreApp/controllers/Whlabel.php

@@ -1099,7 +1099,9 @@ class Whlabel extends Start_Controller
                 //$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');
+
+			
+			$rows = $this->whlabel->find_pc($where, 'sku,features,warehouse', "warehouse,purchase,details,cpid,sku,cpbz,cs,title,dbcontent,GROUP_CONCAT(NULLIF(cpbz, '') ORDER BY cpbz ASC SEPARATOR ', ') AS cpbzs,number,features ");
 			foreach ($rows as $key => $value) {
 				
 				$rows[$key]['purchase'] = (isset($prc[$value['purchase']])) ? $prc[$value['purchase']] : '未知';
@@ -1173,6 +1175,7 @@ class Whlabel extends Start_Controller
 			<td>用友料号</td>
             <td>产品英文名</td>
 			<td>产品中文名</td>
+			<td>备注</td>
 			<td>入库总量</td>
             <td>库存数量</td>
             <td>销售数量</td>

template/erp/whlabel_typeck.html

@@ -76,7 +76,7 @@
 <td>SKU</td>
 <td>仓库名称</td>
 <td>位置及编码</td>
-<td>产品备注</td>
+<td>备注</td>
 <td>当前库存</td>
 <td>占单数量</td>
 </tr>