修改进销存的信息

core/CoreApp/controllers/Whlabel.php

@@ -1180,6 +1180,7 @@ class Whlabel extends Start_Controller
 			$ktime = strtotime($ktime);
 			$jtime = strtotime($jtime);
 			$cpbz = $this->input->post('cpbz', true);
+			$sm = $this->input->post('sm', true);
 			$where = "1=1";
 			$gj = "";
 			$ck = "";
@@ -1216,6 +1217,9 @@ class Whlabel extends Start_Controller
 			if ($cpbz) {
 				$where .= " and cpbz like '%$cpbz%' ";
 			}
+			if ($sm) {
+				$where .= " and sm like '%$sm%' ";
+			}
 			if ($lacecolor) {
 				$where  .= " and features like '%-$lacecolor-%'";
 			}
@@ -1283,7 +1287,7 @@ class Whlabel extends Start_Controller
 			}
 
 			//$where  .= " and time > '$ktime' and time < '$jtime'";
-			$info_list = $this->whlabel->find_pc($where . $fjnr, 'sku,purchase,features,warehouse', 'id,warehouse,purchase,sku,title,details,shop,cpbz,type,features,number,sm', $order_str, $start, $perpage); //改这需要修改_gbhtype
+			$info_list = $this->whlabel->find_pc($where . $fjnr, 'sku,purchase,features,warehouse', 'id,warehouse,purchase,sku,title,details,shop,cpbz,label,type,features,number,sm', $order_str, $start, $perpage); //改这需要修改_gbhtype
 
 			//取得信息列表
 			$info_list = $this->logic_whlabel->dataTran($info_list, ['pm']);
@@ -1366,7 +1370,8 @@ class Whlabel extends Start_Controller
 				foreach ($od as $k => $vv) {
 					$odid .= $k . '数量' . $vv;
 				}
-				$info_list[$key]['cpbz'] = '<p>' . $value['cpbz'] . '</p><p>' . $value['sm'] . '</p>';
+				$info_list[$key]['cpbz'] = $value['cpbz'] ;
+				$info_list[$key]['label'] = $value['sm'];
 				$number = $value['number'];
 				$ftime = time() - 15 * 24 * 3600;
 				$z = $z . '(' . $odid . ')'; //查看订单号
@@ -1419,6 +1424,7 @@ class Whlabel extends Start_Controller
 					"details" => $v["details"],
 					"shop" => $v["shop"],
 					"cpbz" => $v["cpbz"],
+					'label' => $v['label'],
 					"type" => $v["type"],
 					"features" => $v["features"],
 					"number" => $v["number"],

template/erp/whlabel_type.html

@@ -222,6 +222,7 @@
 <td>位置</td>
 <td>品牌 / 公司</td>
 <td>备注</td>
+<td>说明</td>
 <td>类型</td>
 <td>库存</td>
 <td>在途</td>