diff --git a/jsite-web/src/main/java/com/jsite/modules/erp/service/ErpQjzcService.java b/jsite-web/src/main/java/com/jsite/modules/erp/service/ErpQjzcService.java
index dd299f65570685b134463555eafd59a159b888af..7f6419c359d24b0e049ffc242b5d61d1ed36c973 100644
--- a/jsite-web/src/main/java/com/jsite/modules/erp/service/ErpQjzcService.java
+++ b/jsite-web/src/main/java/com/jsite/modules/erp/service/ErpQjzcService.java
@@ -50,6 +50,11 @@ public class ErpQjzcService extends CrudService<ErpQjzcDao, ErpQjzc> {
 	}
 	
 	public Page<ErpQjzc> findPage(Page<ErpQjzc> page, ErpQjzc erpQjzc) {
+		String serNum = erpQjzc.getSerNum();
+		if (StringUtils.isNoneBlank(serNum)){
+			erpQjzc.setAnlaAnln1(serNum);
+			erpQjzc.setSerNum("");
+		}
 		return super.findPage(page, erpQjzc);
 	}
 
@@ -165,48 +170,63 @@ public class ErpQjzcService extends CrudService<ErpQjzcDao, ErpQjzc> {
 		}
 		ErpQjzc erpQjzcAsset11 = getErpQjzcAsset(listTemp11);
 		erpQjzcAsset11.setAnlaDescr("输电线路");
+		erpQjzcAsset11.setSerNum("11");
 		newErpQjzc.add(erpQjzcAsset11);
 		ErpQjzc erpQjzcAsset14 = getErpQjzcAsset(listTemp14);
 		erpQjzcAsset14.setAnlaDescr("变电设备");
+		erpQjzcAsset14.setSerNum("14");
 		newErpQjzc.add(erpQjzcAsset14);
 		ErpQjzc erpQjzcAsset16 = getErpQjzcAsset(listTemp16);
 		erpQjzcAsset16.setAnlaDescr("配电线路及设备");
+		erpQjzcAsset16.setSerNum("16");
 		newErpQjzc.add(erpQjzcAsset16);
 		ErpQjzc erpQjzcAsset17 = getErpQjzcAsset(listTemp17);
 		erpQjzcAsset17.setAnlaDescr("用电设备");
+		erpQjzcAsset17.setSerNum("17");
 		newErpQjzc.add(erpQjzcAsset17);
 		ErpQjzc erpQjzcAsset18 = getErpQjzcAsset(listTemp18);
 		erpQjzcAsset18.setAnlaDescr("通信线路及设备");
+		erpQjzcAsset18.setSerNum("18");
 		newErpQjzc.add(erpQjzcAsset18);
 		ErpQjzc erpQjzcAsset20 = getErpQjzcAsset(listTemp20);
 		erpQjzcAsset20.setAnlaDescr("自动化控制设备、信息设备及仪器仪表");
+		erpQjzcAsset20.setSerNum("20");
 		newErpQjzc.add(erpQjzcAsset20);
 		ErpQjzc erpQjzcAsset21 = getErpQjzcAsset(listTemp21);
 		erpQjzcAsset21.setAnlaDescr("发电及供热设备");
+		erpQjzcAsset21.setSerNum("21");
 		newErpQjzc.add(erpQjzcAsset21);
 		ErpQjzc erpQjzcAsset22 = getErpQjzcAsset(listTemp22);
 		erpQjzcAsset22.setAnlaDescr("水工机械设备");
+		erpQjzcAsset22.setSerNum("22");
 		newErpQjzc.add(erpQjzcAsset22);
 		ErpQjzc erpQjzcAsset23 = getErpQjzcAsset(listTemp23);
 		erpQjzcAsset23.setAnlaDescr("制造及检修维护设备");
+		erpQjzcAsset23.setSerNum("23");
 		newErpQjzc.add(erpQjzcAsset23);
 		ErpQjzc erpQjzcAsset24 = getErpQjzcAsset(listTemp24);
 		erpQjzcAsset24.setAnlaDescr("生产管理用工器具");
+		erpQjzcAsset24.setSerNum("24");
 		newErpQjzc.add(erpQjzcAsset24);
 		ErpQjzc erpQjzcAsset25 = getErpQjzcAsset(listTemp25);
 		erpQjzcAsset25.setAnlaDescr("运输设备");
+		erpQjzcAsset25.setSerNum("25");
 		newErpQjzc.add(erpQjzcAsset25);
 		ErpQjzc erpQjzcAsset26 = getErpQjzcAsset(listTemp26);
 		erpQjzcAsset26.setAnlaDescr("辅助生产用设备及器具");
+		erpQjzcAsset26.setSerNum("26");
 		newErpQjzc.add(erpQjzcAsset26);
 		ErpQjzc erpQjzcAsset27 = getErpQjzcAsset(listTemp27);
 		erpQjzcAsset27.setAnlaDescr("房屋");
+		erpQjzcAsset27.setSerNum("27");
 		newErpQjzc.add(erpQjzcAsset27);
 		ErpQjzc erpQjzcAsset28 = getErpQjzcAsset(listTemp28);
 		erpQjzcAsset28.setAnlaDescr("建筑物");
+		erpQjzcAsset28.setSerNum("28");
 		newErpQjzc.add(erpQjzcAsset28);
 		ErpQjzc erpQjzcAsset30 = getErpQjzcAsset(listTemp30);
 		erpQjzcAsset30.setAnlaDescr("土地");
+		erpQjzcAsset30.setSerNum("30");
 		newErpQjzc.add(erpQjzcAsset30);
 		page.setList(newErpQjzc);
 		return page;
diff --git a/jsite-web/src/main/java/com/jsite/modules/erp/web/ErpQjzcController.java b/jsite-web/src/main/java/com/jsite/modules/erp/web/ErpQjzcController.java
index 15d595bc5bdb619e54ae4e98259b1b0d3f998ed2..b7a0eccce7a8adfe2f472dd46efbf1bc03af7435 100644
--- a/jsite-web/src/main/java/com/jsite/modules/erp/web/ErpQjzcController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/erp/web/ErpQjzcController.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -104,4 +105,14 @@ public class ErpQjzcController extends BaseController {
 		Page<ErpQjzc> page = erpQjzcService.findPageErpQjzc(new Page<>(request, response), erpQjzc);
 		return page;
 	}
+
+	@RequiresPermissions("erp:erpQjzc:view")
+	@RequestMapping(value = "search")
+	public String search(ErpQjzc erpQjzc, Model model) {
+		String serNum = erpQjzc.getSerNum();
+		String anlaDescr = erpQjzc.getAnlaDescr();
+		model.addAttribute("serNum", serNum);
+		model.addAttribute("title", anlaDescr);
+		return "modules/erp/erpQjzcList";
+	}
 }
\ No newline at end of file
diff --git a/jsite-web/src/main/resources/mappings/modules/erp/ErpQjzcDao.xml b/jsite-web/src/main/resources/mappings/modules/erp/ErpQjzcDao.xml
index c3b51eec3b82e573f07d5dd1f7093b678870660a..e25d545b73a3e2af6434dbeadb3bcbde7e8bbd43 100644
--- a/jsite-web/src/main/resources/mappings/modules/erp/ErpQjzcDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/erp/ErpQjzcDao.xml
@@ -84,7 +84,7 @@
 				AND a.anla_acco = #{anlaAcco}
 			</if>
 			<if test="anlaAnln1 != null and anlaAnln1 != ''">
-				AND a.anla_anln1 = #{anlaAnln1}
+				AND a.anla_anln1 like CONCAT(#{anlaAnln1}, '%')
 			</if>
 			<if test="anlaDescr != null and anlaDescr != ''">
 				AND a.anla_descr = #{anlaDescr}
diff --git a/jsite-web/src/main/resources/views/modules/erp/erpQjzcList.html b/jsite-web/src/main/resources/views/modules/erp/erpQjzcList.html
index 77bce806ad76593628e5d3c3be67fc5769b34645..aedf25342882207294bb71978956b402cf1002e2 100644
--- a/jsite-web/src/main/resources/views/modules/erp/erpQjzcList.html
+++ b/jsite-web/src/main/resources/views/modules/erp/erpQjzcList.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa fa-cubes"></i> 生成全局资产的实体
+				<i class="fa fa-cubes"></i> ${title}
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
@@ -14,6 +14,7 @@
 		</div>
 		<div class="box-body">
 			<form id="searchForm" action="${ctx}/erp/erpQjzc/listData" method="post" class="form-inline hide" >
+				<input name="serNum" maxlength="16" style="display:none" class="form-control" value="${serNum}"/>
 				<div class="form-group">
 					<label class="control-label">id：</label>
 					<div class="control-inline">
@@ -286,51 +287,14 @@
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'id', name:'id', index:'a.id', width:90, align:"center"},
-		{header:'会计年度', name:'anlaAcco', index:'a.anla_acco', width:90, align:"center"},
-		{header:'资产编号，不能更改', name:'anlaAnln1', index:'a.anla_anln1', width:90, align:"center"},
-		{header:'资产描述', name:'anlaDescr', index:'a.anla_descr', width:90, align:"center"},
-		{header:'资产原值年初数', name:'anlaAssetOrig', index:'a.anla_asset_orig', width:90, align:"center"},
-		{header:'本年原值变动', name:'anlaCurr', index:'a.anla_curr', width:90, align:"center"},
-		{header:'资产原值年末数', name:'anlaAssetLast', index:'a.anla_asset_last', width:90, align:"center"},
-		{header:'资产长文本', name:'anlaAssetLong', index:'a.anla_asset_long', width:90, align:"center"},
-		{header:'资产主号文本', name:'anlhAnlhtxt', index:'a.anlh_anlhtxt', width:90, align:"center"},
-		{header:'规格型号', name:'anlaSernr', index:'a.anla_sernr', width:90, align:"center"},
-		{header:'固定资产分类', name:'anlaAssetCate', index:'a.anla_asset_cate', width:90, align:"center"},
-		{header:'资产分类描述', name:'anlaCateDescr', index:'a.anla_cate_descr', width:90, align:"center"},
-		{header:'远光卡片号', name:'anlaCard', index:'a.anla_card', width:90, align:"center"},
-		{header:'购置日期', name:'anlaPurchDate', index:'a.anla_purch_date', width:90, align:"center"},
-		{header:'创建日期', name:'anlaCreateDate', index:'a.anla_create_date', width:90, align:"center"},
-		{header:'资本化日期', name:'anlaAssetDate', index:'a.anla_asset_date', width:90, align:"center"},
-		{header:'成本中心', name:'anlzKostl', index:'a.anlz_kostl', width:90, align:"center"},
-		{header:'成本中心描述', name:'anlzKostlDescr', index:'a.anlz_kostl_descr', width:90, align:"center"},
-		{header:'成本中心结束日期', name:'anlzKostlDate', index:'a.anlz_kostl_date', width:90, align:"center"},
-		{header:'停用标记', name:'anlaStopFlag', index:'a.anla_stop_flag', width:90, align:"center"},
-		{header:'保管人', name:'anlzRaumn', index:'a.anlz_raumn', width:90, align:"center"},
-		{header:'数量', name:'anlaMenge', index:'a.anla_menge', width:90, align:"center"},
-		{header:'单位', name:'anlaMeins', index:'a.anla_meins', width:90, align:"center"},
-		{header:'车牌号', name:'anlzKfzkz', index:'a.anlz_kfzkz', width:90, align:"center"},
-		{header:'资产使用', name:'anlaOrd41', index:'a.anla_ord41', width:90, align:"center"},
-		{header:'电压等级', name:'anlaOrd42', index:'a.anla_ord42', width:90, align:"center"},
-		{header:'资产状态', name:'anlaOrd43', index:'a.anla_ord43', width:90, align:"center"},
-		{header:'资产来源', name:'anlaOrd44', index:'a.anla_ord44', width:90, align:"center"},
-		{header:'所属线站名称', name:'anlaStadt', index:'a.anla_stadt', width:90, align:"center"},
-		{header:'资产变动方式', name:'anlaGdlgrp', index:'a.anla_gdlgrp', width:90, align:"center"},
-		{header:'入账状态', name:'anlaEhwnr', index:'a.anla_ehwnr', width:90, align:"center"},
-		{header:'资产制造商', name:'anlaHerst', index:'a.anla_herst', width:90, align:"center"},
-		{header:'坐落地点', name:'anlaFiamt', index:'a.anla_fiamt', width:90, align:"center"},
-		{header:'WBS元素', name:'anlaPosnr', index:'a.anla_posnr', width:90, align:"center"},
-		{header:'折旧码', name:'anlbAfasl', index:'a.anlb_afasl', width:90, align:"center"},
-		{header:'资产累计折旧年初数', name:'anlbAfaslBegin', index:'a.anlb_afasl_begin', width:90, align:"center"},
-		{header:'资产本年折旧', name:'anlbAfaslYear', index:'a.anlb_afasl_year', width:90, align:"center"},
-		{header:'资产累计折旧年末数', name:'anlbAfaslLast', index:'a.anlb_afasl_last', width:90, align:"center"},
-		{header:'资产净值', name:'anlbAssetAcco', index:'a.anlb_asset_acco', width:90, align:"center"},
-		{header:'是否是瑜龄资产', name:'anlbAssetFlag', index:'a.anlb_asset_flag', width:90, align:"center"},
-		{header:'折旧范围', name:'anlbAfaslRang', index:'a.anlb_afasl_rang', width:90, align:"center"},
-		{header:'资产系类', name:'anlaTypbz', index:'a.anla_typbz', width:90, align:"center"},
-		{header:'更新时间', name:'updateDate', index:'a.update_date', width:90, align:"center"},
-		{header:'备注信息', name:'remarks', index:'a.remarks', width:90, align:"center"},
-		{header:'操作', name:'actions', width:100, sortable:false, title:false, align:"center",formatter: function(val, obj, row, act){
+		{header:'id', name:'id', index:'a.id', width:90, align:"center", hidden:true},
+        {header:'资产编号', name:'anlaAnln1', index:'a.anla_anln1', width:50, align:"center"},
+        {header:'资产描述', name:'anlaDescr', index:'a.anla_descr', width:100, align:"center"},
+        {header:'资产原值年初数', name:'anlaAssetOrig', index:'a.anla_asset_orig', width:80, align:"center"},
+        {header:'资产净值', name:'anlbAssetAcco', index:'a.anlb_asset_acco', width:80, align:"center"},
+        {header:'资产累计折旧年初数', name:'anlbAfaslBegin', index:'a.anlb_afasl_begin', width:70, align:"center"},
+        {header:'资产本年折旧', name:'anlbAfaslYear', index:'a.anlb_afasl_year', width:70, align:"center"},
+		{header:'操作', name:'actions', width:50, sortable:false, title:false, align:"center",formatter: function(val, obj, row, act){
 			var actions = [];
 			<% if(hasPermi('erp:erpQjzc:edit')){ %>
 				actions.push('<a href="/erp/erpQjzc/form?id='+row.id+'" class="btnList" title="编辑生成全局资产的实体"><i class="fa fa-pencil"></i></a>&nbsp;');
diff --git a/jsite-web/src/main/resources/views/modules/erp/tableErpQjzc.html b/jsite-web/src/main/resources/views/modules/erp/tableErpQjzc.html
index 8a229d325859498276974348bb70feaa24d9e104..bb1de250edb56757ef88013eb6bad081b14ea5f3 100644
--- a/jsite-web/src/main/resources/views/modules/erp/tableErpQjzc.html
+++ b/jsite-web/src/main/resources/views/modules/erp/tableErpQjzc.html
@@ -283,6 +283,7 @@
     $('#dataGrid').dataGrid({
         searchForm: $("#searchForm"),
         columnModel: [
+            {header:'序列', name:'serNum', index:'a.anla_ser_num', width:10, align:"center", hidden:true},
             {header:'资产类别', name:'anlaDescr', index:'a.anla_descr', width:100, align:"center"},
             {header:'原值', name:'anlaAssetOrig', index:'a.anla_asset_orig', width:90, align:"center"},
             {header:'逾龄资产', name:'anlaAssetOver', index:'a.anla_asset_over', width:80, align:"center"},
@@ -292,7 +293,7 @@
             {header:'操作', name:'actions', width:35, sortable:false, title:false, align:"center",formatter: function(val, obj, row, act){
                     var actions = [];
                     <% if(hasPermi('erp:erpQjzc:edit')){ %>
-                        actions.push('<a href="/erp/erpQjzc/form?id='+row.id+'" class="btnList" title="查询'+ row.anlaDescr +'详情"><i class="icon-magnifier"></i></a>&nbsp;');
+                        actions.push('<a href="/erp/erpQjzc/search?serNum='+row.serNum+'&anlaDescr='+row.anlaDescr+'列表" class="btnList" title="查询'+ row.anlaDescr +'详情"><i class="icon-magnifier"></i></a>&nbsp;');
                     <% } %>
 
                     return actions.join('');