Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
===================================================================
diff -u -r21851 -r21863
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 21851)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 21863)
@@ -13,9 +13,11 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsStock;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsAuthorization;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsBatch;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModelStock;
+import com.forgon.disinfectsystem.entity.expensivegoods.RelevancyGoodsAuthorization;
 import com.forgon.disinfectsystem.expensivegoods.ExpensiveGoodsServiceContext;
 import com.forgon.disinfectsystem.inventorymanagement.model.Inventory;
 import com.forgon.tools.hibernate.BasePoManager;
@@ -303,4 +305,14 @@
 	 * @return
 	 */
 	public ExpensiveGoodsModelStock getExpensiveGoodsModelStockByModelId(Long warehouseId, Long expensiveGoodsModelId,Long expensiveGoodsId);
+	
+	/**
+	 * 获取授权记录
+	 */
+	public List<ExpensiveGoodsAuthorization> getExpensiveGoodsAuthorization(
+			ExpensiveGoodsAuthorization expensiveGoodsAuthorization,
+			RelevancyGoodsAuthorization relevancyGoodsAuthorization,
+			String expensiveGoodsIds, String expensiveGoodsName);
+	
+	public List<Map<String,Object>> findExpensiveGoodsList(String simpleSpell);
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r21851 -r21863
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21851)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21863)
@@ -91,13 +91,19 @@
 import com.forgon.tools.GB2WB;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.SqlBuilder;
+import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.excel.ParerUtils;
 import com.forgon.tools.format.FormatString;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.SqlUtils;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsAuthorization;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsBatch;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel;
+import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModelStock;
+import com.forgon.disinfectsystem.entity.expensivegoods.RelevancyGoodsAuthorization;
 
 
 @Service("expensiveGoodsManagerTarget")
@@ -2276,5 +2282,42 @@
 		return (ExpensiveGoodsModelStock) objectDao.getBySql(ExpensiveGoodsModelStock.class.getSimpleName(), sql);
 	}
 
+
+	@Override
+	public List<Map<String,Object>> findExpensiveGoodsList(String simpleSpell) {
+			String sql = "where (po.spelling like '%" + simpleSpell
+					   + "%' or po.wbCode like '%" + simpleSpell
+					   + "%' or po.name like '%" + simpleSpell
+					   + "%')";
+			@SuppressWarnings("unchecked")
+			List<ExpensiveGoods> eg = objectDao.findBySql(ExpensiveGoods.class.getSimpleName(), sql);
+			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+			for (ExpensiveGoods expensiveGoods : eg) {
+				Map<String, Object> temp = new HashMap<String, Object>();
+				temp.put("id", expensiveGoods.getId());
+				temp.put("name", expensiveGoods.getName());
+				mapList.add(temp);
+			}
+			return mapList;
 	
+	}
+
+	@Override
+	public List<ExpensiveGoodsAuthorization> getExpensiveGoodsAuthorization(
+			ExpensiveGoodsAuthorization expensiveGoodsAuthorization,
+			RelevancyGoodsAuthorization relevancyGoodsAuthorization,
+			String expensiveGoodsIds, String expensiveGoodsName) {
+		String[]  strs = expensiveGoodsIds.split(";");
+		String[]  names = expensiveGoodsName.split(";");
+		List<ExpensiveGoodsAuthorization> authorization = new ArrayList<ExpensiveGoodsAuthorization>();
+		for(int i=0,len=strs.length;i<len;i++){
+			expensiveGoodsAuthorization.setRelevancyGoodsAuthorization(relevancyGoodsAuthorization);
+			expensiveGoodsAuthorization.setExpensiveGoodsId(Long.parseLong(strs[i]));
+			expensiveGoodsAuthorization.setExpensiveGoodsName(names[i].toString());
+			objectDao.saveOrUpdate(expensiveGoodsAuthorization);
+			authorization.add(expensiveGoodsAuthorization);
+		}
+		return authorization;
+	}
+	
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
===================================================================
diff -u -r21850 -r21863
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21850)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21863)
@@ -3,6 +3,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashSet;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -13,25 +18,31 @@
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import net.sf.json.JsonConfig;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsBatch;
 import com.forgon.disinfectsystem.entity.expensivegoods.ExpensiveGoodsModel;
 import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsManager;
+import com.forgon.entity.PageEntity;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.systemsetting.model.HttpOption;
@@ -789,7 +800,6 @@
 	
 	
 	
-
 	/**
 	 * 根据一次性物品批次id,返回该物品批次的标识号表的物资系统batchId列表
 	 * [{batchIdFromHisSync:1234,amount:100}]
@@ -1074,4 +1084,22 @@
 		return modifyContent.toString();
 	}
 	
+	/**
+	 * 根据拼音获取所有高值耗材定义Json
+	 */
+	public void getExpensiveGoodsJson() {
+		if (spell == null) {
+			spell = " ";
+		}
+		try {
+		spell = StrutsParamUtils.getPraramValue("spell", "");
+		List<Map<String, Object>> list = expensiveGoodsManager.findExpensiveGoodsList(spell);
+		PageEntity pageEntity = PageUtil.getPagePara();
+        pageEntity.setNeedToEscape(true);
+		PageUtil.outPutResult(pageEntity, list);
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+		}
+	}
+	
 }