Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r20978 -r20980
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 20978)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 20980)
@@ -148,18 +148,49 @@
 
 		this.save(expensiveGoodsGodownEntry);
 		Map<Long, ExpensiveGoods> idToExpensiveGoodsMap = context.getIdToExpensiveGoodsMap();
+		Map<Long, ExpensiveGoodsInstance> idToExpensiveGoodsInstanceMap = context.getIdToExpensiveGoodsInstanceMap();
+		Map<Long, ExpensiveGoodsStock> idToExpensiveGoodsStockMap = context.getExpensiveGoodsIdToExpensiveGoodsStockMap();
 		List<ExpensiveGoodsGodownEntryItem> itemList = expensiveGoodsGodownEntry.getItemsList();
 		for (int i = 0; i < itemList.size(); ++i) {
 			ExpensiveGoodsGodownEntryItem godownEntryItem = itemList.get(i);
 			Long expensiveGoodsId = godownEntryItem.getExpensiveGoodsId();
+			Long expensiveGoodsStockId = godownEntryItem.getExpensiveGoodsStockId();
+			Long expensiveGoodsInstanceId = godownEntryItem.getExpensiveGoodsInstanceId();
 			if (expensiveGoodsId == null) {
 				throw new RuntimeException("高值耗材物品定义id不能为空!");
-			} 
+			}
+			if (expensiveGoodsInstanceId == null) {
+				throw new RuntimeException("高值耗材实例id不能为空!");
+			}
+			if (expensiveGoodsStockId == null) {
+				throw new RuntimeException("高值耗材库存id不能为空!");
+			}
 			ExpensiveGoods expensiveGoods = idToExpensiveGoodsMap.get(expensiveGoodsId);
 			if (expensiveGoods == null) {
 				throw new RuntimeException("高值耗材物品定义已被删除!");
 			}
-			newExpensiveGoodsGodownOutEntryItem(expensiveGoodsGodownEntry,	context , godownEntryItem);
+			ExpensiveGoodsInstance expensiveGoodsInstance = idToExpensiveGoodsInstanceMap.get(expensiveGoodsInstanceId);
+			if (expensiveGoodsInstance == null) {
+				throw new RuntimeException("高值耗材实例已被删除!");
+			}
+			if(!expensiveGoodsInstance.inWarehouse()){
+				throw new RuntimeException("高值耗材状态不是已入库!");
+			}
+			expensiveGoodsInstance.setGodownOutEntryId(expensiveGoodsGodownEntry.getId());
+			expensiveGoodsInstance.setGodownOutEntryItemId(godownEntryItem.getId());
+			expensiveGoodsInstance.setStatus(ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
+			objectDao.update(expensiveGoodsInstance);
+			ExpensiveGoodsStock expensiveGoodsStock = idToExpensiveGoodsStockMap.get(expensiveGoodsStockId);
+			if (expensiveGoodsStock == null) {
+				throw new RuntimeException("高值耗材库存已被删除!");
+			}
+			if(expensiveGoodsInstance.entryPurchase()){
+				expensiveGoodsStock.adjustAmount(-1);
+			}else{
+//				expensiveGoodsStock.adjustPreAmount(-1);
+			}
+			objectDao.update(expensiveGoodsStock);
+//			newExpensiveGoodsGodownOutEntryItem(expensiveGoodsGodownEntry,	context , godownEntryItem);
 			objectDao.update(godownEntryItem);
 		}
 		
@@ -565,7 +596,8 @@
 		// 汇总信息
 		summaryDiposableGoodsInfoForGodownOutEntry2(expensiveGoodsGodownEntry, expensiveGoodsServiceContext);
 		
-		lockAndGetDiposableGoodsResources(ExpensiveGoodsGodownEntry.TYPE_OUT,expensiveGoodsGodownEntry.getWarehouseID(),expensiveGoodsGodownEntry.getWarehouseName(),expensiveGoodsServiceContext);
+		expensiveGoodsManager.lockAndGetExpensiveGoodsResources(expensiveGoodsServiceContext);
+//		lockAndGetDiposableGoodsResources(ExpensiveGoodsGodownEntry.TYPE_OUT,expensiveGoodsGodownEntry.getWarehouseID(),expensiveGoodsGodownEntry.getWarehouseName(),expensiveGoodsServiceContext);
 		
 		saveGodownOutEntry_internal(expensiveGoodsGodownEntry, expensiveGoodsServiceContext);
 	}
@@ -666,9 +698,17 @@
 		for (ExpensiveGoodsGodownEntryItem godownEntryItem : itemList) {
 			Long expensiveGoodsId = godownEntryItem
 					.getExpensiveGoodsId();
+			Long expensiveGoodsStockId = godownEntryItem.getExpensiveGoodsStockId();
+			Long expensiveGoodsInstanceId = godownEntryItem.getExpensiveGoodsInstanceId();
 			if (DatabaseUtil.isPoIdValid(expensiveGoodsId)) {
 				expensiveGoodsIDsSet.add(expensiveGoodsId);
 			}
+			if (DatabaseUtil.isPoIdValid(expensiveGoodsStockId)) {
+				expensiveGoodsServiceContext.getExpensiveGoodsStockIdsSet().add(expensiveGoodsStockId);
+			}
+			if (DatabaseUtil.isPoIdValid(expensiveGoodsInstanceId)) {
+				expensiveGoodsServiceContext.getExpensiveGoodsInstanceIdsSet().add(expensiveGoodsInstanceId);
+			}
 		}
 	}
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
===================================================================
diff -u -r20977 -r20980
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java	(.../ExpensiveGoodsInstance.java)	(revision 20977)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java	(.../ExpensiveGoodsInstance.java)	(revision 20980)
@@ -86,6 +86,9 @@
 	private Long godownEntryId;//
 	private Long godownEntryItemId;//
 	
+	private Long godownOutEntryId;
+	private Long godownOutEntryItemId;
+	
 	private Long expensiveGoodsStockId;
 
 	private UseRecord useRecord;
@@ -248,6 +251,22 @@
 	// this.userecordId = userecordId;
 	// }
 
+	public Long getGodownOutEntryId() {
+		return godownOutEntryId;
+	}
+
+	public Long getGodownOutEntryItemId() {
+		return godownOutEntryItemId;
+	}
+
+	public void setGodownOutEntryId(Long godownOutEntryId) {
+		this.godownOutEntryId = godownOutEntryId;
+	}
+
+	public void setGodownOutEntryItemId(Long godownOutEntryItemId) {
+		this.godownOutEntryItemId = godownOutEntryItemId;
+	}
+
 	public Long getExpensiveGoodsStockId() {
 		return expensiveGoodsStockId;
 	}
@@ -306,6 +325,19 @@
 	public void setEntryType(String entryType) {
 		this.entryType = entryType;
 	}
+	
+	public boolean entryPurchase() {
+		if (ENTRY_TYPE_PURCHASE.equals(entryType)) {
+			return true;
+		}
+		return false;
+	}
+	public boolean entryPrepare() {
+		if (ENTRY_TYPE_PREPARE.equals(entryType)) {
+			return true;
+		}
+		return false;
+	}
 
 	public String getFirstBodyCode() {
 		return firstBodyCode;
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
===================================================================
diff -u -r20841 -r20980
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 20841)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 20980)
@@ -1,99 +1,15 @@
-var entityName = "退库单";
+var entityName =  "退库单";
 var grid;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
 var commonEntry = new commonEntry();
 
-//单价数据源
-var priceStore = null;
-var PriceRecord = null;
-// 清除表单数据
-function clearFormData(){
-	disposableGoodsBatchNumStore.removeAll();
-	priceStore.removeAll();
-}
-// 清空批次和价格
-function clearBatchNumberAndPrice() {
-	clearBatchNumber();
-	clearPrice();
-}
-function clearBatchNumber() {
-	clearCombo(disposableGoodsBatchNumStore,'batchNumber1');
-}
-// 清空价格
-function clearPrice() {
-	clearCombo(priceStore,'combo_price');
-}
-// 设置批次
-function setBatchNumbers(batches,selectFirst) {
-	clearBatchNumber();
-	if(typeof(batches) == 'undefined' || batches == null){
-		return;
-	}
-	for(var i = 0;i<batches.length;i++){
-		var batchRecord = new BatchRecord(batches[i]);
-		disposableGoodsBatchNumStore.add(batchRecord);
-	}
-	// 默认选中第一个
-	if(selectFirst){
-		if(batches.length > 0){
-			setCmpValue('batchNumber1',batches[0].batchNumber);
-			
-			var combo = top.Ext.getCmp("batchNumber1");
-			// 触发选中事件
-			combo.fireEvent('select', combo,disposableGoodsBatchNumStore.getAt(0),0);
-		}
-	}
-}
-//设置价格
-function setPrices(prices,selectFirst) {
-	clearPrice()
-	if(typeof(prices) == 'undefined' || prices == null){
-		return;
-	}
-	for(var i = 0;i<prices.length;i++){
-		var priceRecord = new PriceRecord(prices[i]);
-		priceRecord.data.priceForDisplay = formartToFixedFloat(priceRecord.data.price,4);
-		priceStore.add(priceRecord);
-	}
-	// 选中第一个
-	if(selectFirst){
-		if(prices.length > 0){
-			setCmpValue('combo_price',prices[0].price);
-		}
-	}
-}
-//全部一次性物品
-var allDiposableGoodsStore = new Ext.data.Store({
-    pageSize: 100,
-	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes',
-		method : 'POST'
-	}),
-	reader : new Ext.data.JsonReader({
-		totalProperty : 'totalCount',
-		root : 'data'
-	}, [
-	    {name : 'id',mapping : 'id'},
-	    {name : 'spelling',mapping : 'spelling'},
-	    {name : 'name',mapping : 'name'},
-	    {name : 'displayName',mapping : 'displayName'},
-	    {name : 'referencePrice',mapping : 'referencePrice'},
-	    {name : 'specification',mapping : 'specification'},//规格
-	    {name : 'disposableGoodsName',mapping : 'disposableGoodsName'}//没拼接的名字
-	])
-});
-batchNumStore = new top.Ext.data.Store({
-	proxy : new top.Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDisposableGoodsBatchList.do',
-		method : 'POST'
-	}),
-	reader : new top.Ext.data.JsonReader({
-		fields : [
-	  	    {name : 'id'},
-	  	    {name : 'batchNumber'}
-	  	]
-	})
-});
+//表单提交的结果状态(分别表示初始、提交成功、失败等)
+var formSubmitResultInit = "0";
+var formSubmitResultSucc = "1";
+var formSubmitResultFail = "-1";
+var entryItemJsonArray = []; //退库项数组，用于Selenium自动化测试
+
+//仓库数据源
 var wareHouseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
@@ -114,15 +30,16 @@
 				// 触发选中事件
 				combo.fireEvent('select', combo,records[0],0);
 			}
-			top.Ext.getCmp("name1").enable();
 		}
 	}
 });
 
-var disposableGoodsStockStore = new Ext.data.Store({
+// 高值耗材物品定义数据源
+var expensiveGoodsStore = new Ext.data.Store({
     pageSize: 100,
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/disposableGoodsStockAction!getDisposableGoodsStockData.do',
+		url : WWWROOT + '/disinfectSystem/expensiveGoodsAction!getExpensiveGoodsData.do',
+		//url : WWWROOT + '/disinfectSystem/expensiveGoodsAction!searchExpensiveGoods.do',
 		method : 'POST'
 	}),
 	reader : new Ext.data.JsonReader({
@@ -132,63 +49,65 @@
 	    {name : 'id',mapping : 'id'},
 	    {name : 'spelling',mapping : 'spelling'},
 	    {name : 'name',mapping : 'name'},
+	    {name : 'displayName',mapping : 'displayName'},
 	    {name : 'referencePrice',mapping : 'referencePrice'},
-	    {name : 'supplierName',mapping : 'supplierName'},
-	]),
-	listeners : {
-		beforeload : function(store,option) {
-			store.baseParams['wareHouseId'] = top.Ext.getCmp('warehouseID').getValue();
-		}
-	}
+	    {name : 'validityTime',mapping : 'validityTime'},
+	    {name : 'certification',mapping : 'certification'}
+	])
 });
 
-var disposableGoodsBatchNumStore = new Ext.data.Store({
+function dateCompare(date1,date2){	
+	date1 = date1.replace(/\-/gi,"/");	
+	date2 = date2.replace(/\-/gi,"/");	
+	var time1 = new Date(date1).getTime();	
+	var time2 = new Date(date2).getTime();	
+	if(time1 > time2){		
+		return 1;	
+	}else if(time1 == time2){		
+		return 2;	
+	}else{		
+		return 3;	
+	}}
+
+//供应商(高值耗材)数据源
+var expensiveGoodsSupplierStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierData.do?supplierType='+encodeURI(expensiveGoodsSupplier),
+		method : 'POST'
+	}),
 	reader : new Ext.data.JsonReader({
-		fields : [
-		    {name : 'id'},
-		    {name : 'disposableGoodsId'},
-          	{name : 'disposableGoodsStockId'},
-          	{name : 'disposableGoodsBatchId'},
-          	{name : 'disposableGoodsBatchStockId'},
-	  	    {name : 'batchNumber'},
-	  	    {name : 'cost'},
-	  	    {name : 'supplierName'},
-	  	    {name : 'expDate'}
-		]
-	})
+		totalProperty : 'totalCount',
+		root : 'data'
+	}, [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'}
+	])
 });
 
-var BatchRecord = Ext.data.Record.create([ {
-	name: 'id',
-	name: 'disposableGoodsId',
-	name: 'disposableGoodsStockId',
-	name: 'disposableGoodsBatchId',
-	name: 'disposableGoodsBatchStockId',
-	name : 'batchNumber',
-	name : 'cost',
-	name : 'supplierName',
-	name : 'expDate'
-} ]);
+//类别数据源
+var gradeStore = new Ext.data.SimpleStore({
+	data:[['一类'],['二类'],['三类']],
+	fields:['name']
+});
 
-var GodownEntryItemRecord = Ext.data.Record.create([
-	{name : 'disposableGoodsID'},
-	{name : 'disposableGoodsStockID'},
-	{name : 'disposableGoodsBatchID'},
-	{name : 'disposableGoodsBatchStockID'},
-	{name : 'expensiveDisposableGoodsId'},
-	{name : 'localID'},
+//退库明细item
+var ExpensiveGoodsGodownEntryItemRecord = Ext.data.Record.create([
+	{name : 'localID'}, 
 	{name : 'id'}, 
-	{name : 'name'}, 
-	{name : 'amount'},
-	{name : 'canOutAmount'},
-	{name : 'cost'},
-	{name : 'batchNumber'},
-	{name : 'identification'},
-	{name : 'identificationID'}, 
-	{name : 'batchID'}, 
-	{name : 'disposableGoodsStockID'}, 
+	{name : 'supplierId'}, 
+	{name : 'supplierName'}, 
+	{name : 'expensiveGoodsId'},
+	{name : 'expensiveGoodsInstanceId'}, 
+	{name : 'expensiveGoodsStockId'}, 
+	{name : 'expensiveGoodsName'}, 
+	{name : 'status'}, 
+	{name : 'barcode'},
 	{name : 'expDate' ,type : 'date'},
-	{name : 'supplierName'}
+	{name : 'price'},
+	{name : 'firstBodyCode'},
+	{name : 'secondBodyCode'},
+	{name : 'thirdBodyCode'},
+	{name : 'grade'}
 ]);
 
 /**
@@ -200,23 +119,12 @@
 	top.Ext.getCmp('warehouseID').setValue(id);
 	top.Ext.getCmp('warehouseName').setValue(name);
 }
-
-// 获取当前选中的批次
-function getSelectedBatch(){
-	var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
-	var batch = findRecordDataByNameAndValue(disposableGoodsBatchNumStore,'batchNumber',batchNumber);
-	return batch;
-}
-// 获取当前选中的价格
-function getSelectedPriceAmount(){
-	return getSelectedDataFromCombo(priceStore,'combo_price','price');
-}
 function loadBarcodeDeviceInfo() {
-	var barcode = top.Ext.getCmp('barcode').getValue();
+	var barcode = top.Ext.getCmp('scanBarcode').getValue();
 	// 清除已加载的信息
-	top.Ext.getCmp("barcode").setValue('');// 清除条码
+	top.Ext.getCmp("scanBarcode").setValue('');// 清除条码
 	Ext.Ajax.request({
-				url : WWWROOT + '/disinfectSystem/receiveRecordAction!loadBarcodeDeviceInfo.do',
+				url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!loadBarcodeDeviceInfo.do',
 				params : {
 					barcode : barcode
 				},
@@ -230,9 +138,10 @@
 							return;
 						}
 						if(resultObj.barcodeType == '高值耗材'){
-							addExpensiveDisposablegoodsItems(resultObj.disposablegoods);
+							addItems(resultObj.expensiveGoodsInstance);
+							setTotalMoney(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'));
 						}else{
-							
+							showResult('只能扫描高值耗材条码！');
 						}
 					}else{
 						showResult('输入的条码无效！');
@@ -244,148 +153,202 @@
 				}
 			});
 }
-//验证一次性物品是否重复
-function isExpensiveDisposablegoodsRepeat(disposableGoods){
-	var store = top.Ext.getCmp('godownEntryItemGrid').getStore();
-	for(var i = 0;i < store.getCount();i++){
-		var item = store.getAt(i).data;
-		if(item.barcode == disposableGoods.barcode){
-			return true;
-		}
+function loadExpensiveGoodsInstanceByBodyBarcode() {
+	var firstBodyCode = top.Ext.getCmp('firstBodyCode1').getValue();
+	var secondBodyCode = top.Ext.getCmp('secondBodyCode1').getValue();
+	var thirdBodyCode = top.Ext.getCmp('thirdBodyCode1').getValue();
+	if(isUndefinedOrNullOrEmpty(firstBodyCode) || isUndefinedOrNullOrEmpty(secondBodyCode) || isUndefinedOrNullOrEmpty(thirdBodyCode)){
+		return;
 	}
+	Ext.Ajax.request({
+				url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!loadExpensiveGoodsInstanceByBodyBarcode.do',
+				params : {
+					firstBodyCode : firstBodyCode,
+					secondBodyCode : secondBodyCode,
+					thirdBodyCode : thirdBodyCode
+				},
+				success : function(response, options) {
+					var result = response.responseText;
+					if (result != null && result != "null") {
+						var resultObj = JSON.parse(result);
+						
+						if(!resultObj.success){
+							showResult(resultObj.errMsg);
+							return;
+						}
+						if(resultObj.barcodeType == '高值耗材'){
+							addItems(resultObj.expensiveGoodsInstance);
+							setTotalMoney(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'));
+						}else{
+							showResult('只能扫描高值耗材条码！');
+						}
+					}else{
+						showResult('输入的条码无效！');
+					}
 
-	return false;
+				},
+				failure : function(response, options) {
+					var result = Ext.decode(response.responseText);
+				}
+			});
 }
-function addExpensiveDisposablegoodsItems(diposableGood){
-	if(isExpensiveDisposablegoodsRepeat(diposableGood)){
-		showResult("该物品已存在!");
-		return;
-	}
-	
-	var tousseName = diposableGood.showName;
-	var barcode = diposableGood.barcode;
-	var batchNumber = diposableGood.batchNumber;
-	var price = diposableGood.price;
-	var expDate = diposableGood.expDate;
-	var fluctuationPrice = diposableGood.fluctuationPrice;
-	var supplierName = diposableGood.supplierName;
-	//添加操作
-	var godownEntryItem = new GodownEntryItemRecord({
-		disposableGoodsID: diposableGood.disposableGoodsID,
-		disposableGoodsStockID: diposableGood.disposableGoodsStockID,
-		disposableGoodsBatchID: diposableGood.disposableGoodsBatchID,
-		disposableGoodsBatchStockID: diposableGood.disposableGoodsBatchStockID,
-		expensiveDisposableGoodsId: diposableGood.expensiveDisposablegoodsId,
-		localID:g_localID++,
-		id : "",
-		identificationID : '',
-		name : tousseName,
-		barcode: barcode,
-		amount : 1,
-		canOutAmount : 1,
-		cost : price,
-		batchNumber : batchNumber,
-		expDate : expDate,
-		supplierName : supplierName
-	});
-	top.Ext.getCmp('godownEntryItemGrid').getStore().insert(0 , godownEntryItem);
-}
-function addItems(disposableGoodsStockID,name,amount,batch,priceAmount){
-	if(isUndefinedOrNull(batch)){
-		showResult("请填写批次!");
-		return false;
-	}
-	var batchNumber = batch.batchNumber;
-	if(top.Ext.getCmp('name1').getValue() == null || top.Ext.getCmp('name1').getValue() == ''){
-		showResult("请填写物品名称!");
-		return false;
-	}
-	
-	if(top.Ext.getCmp('amount1').getValue() == null || top.Ext.getCmp('amount1').getValue() == ''){
-		showResult("请填写数量!");
-		return false;
-	}
-	
-	if(!top.Ext.getCmp('amount1').isValid()){
-		showResult("请正确填写数量!");
-		return false;
-	}
-	if(top.Ext.getCmp('batchNumber1').getValue() == null || top.Ext.getCmp('batchNumber1').getValue() == ''){
-		showResult("请填写批次!");
-		return false;
-	}
-	if(isUndefinedOrNull(priceAmount)){
-		showResult("请选择价格!");
-		return false;
-	}
-	// 物品是否重复
-	var godownEntryItemGridStore = top.Ext.getCmp('godownEntryItemGrid').getStore();
-	for(var i = 0;i < godownEntryItemGridStore.getCount();i++){
-		var godownEntryItem = godownEntryItemGridStore.getAt(i).data;
-		if(godownEntryItem.disposableGoodsStockID == disposableGoodsStockID && godownEntryItem.batchNumber == batchNumber && godownEntryItem.cost == priceAmount.price){
+/**
+ * 添加明细
+ * @param supplierId 供应商id
+ * @param supplierName 供应商名字
+ * @param expensiveGoodsId 高值耗材定义id
+ * @param name 高值耗材名称
+ * @param cost 单价
+ * @param expDate 失效期
+ * @param certification 注册证号
+ * @param firstBodyCode 自身条码1
+ * @param secondBodyCode 自身条码2
+ * @param thirdBodyCode 自身条码3
+ * @param grade 类别
+ * @returns {Boolean}
+ */
+function addItems(expensiveGoodsInstance){
+	for(var i = 0;i < top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getCount();i++){
+		var expensiveGoodsGodownEntryItemData = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getAt(i).data;
+		if(expensiveGoodsGodownEntryItemData.id == expensiveGoodsInstance.id){
 			showResult("该物品已经存在,不能重复添加!");
 			return false;
 		}
 	}
-//	var cost = top.Ext.getCmp('cost').getValue();
-	var expDate = top.Ext.getCmp('expDate').getValue();
-	var supplierName = top.Ext.getCmp('supplierName').getValue();
+
 	//添加操作
-	var godownEntryItem = new GodownEntryItemRecord({
-		disposableGoodsID: batch.disposableGoodsId,
-		disposableGoodsStockID: batch.disposableGoodsStockId,
-		disposableGoodsBatchID: batch.disposableGoodsBatchId,
-		disposableGoodsBatchStockID: batch.id,
+	var expensiveGoodsGodownEntryItem = new ExpensiveGoodsGodownEntryItemRecord({
 		localID:g_localID++,
-		id : "",
-		identificationID : '',
-		batchID : batch.id,
-		name : name,
-		amount : amount,
-		canOutAmount : priceAmount.amount,
-//		cost : cost,
-		cost : priceAmount.price,
-		batchNumber : batch.batchNumber,
-		expDate : expDate,
-		supplierName : supplierName
+		id : null,
+		expensiveGoodsId : expensiveGoodsInstance.expensiveGoodsId,
+		expensiveGoodsInstanceId : expensiveGoodsInstance.id,
+		expensiveGoodsStockId: expensiveGoodsInstance.expensiveGoodsStockId,
+		expensiveGoodsName : expensiveGoodsInstance.expensiveGoodsName,
+		status : expensiveGoodsInstance.status,
+		barcode : expensiveGoodsInstance.barcode,
+//		certification:certification,
+//		expDate : expDate,
+		price : Ext.num(parseFloat(expensiveGoodsInstance.price),0),
+		firstBodyCode:expensiveGoodsInstance.firstBodyCode,
+		secondBodyCode:expensiveGoodsInstance.secondBodyCode,
+		thirdBodyCode:expensiveGoodsInstance.thirdBodyCode
 	});
-	//top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
-	top.Ext.getCmp('godownEntryItemGrid').getStore().insert(0 , godownEntryItem);
-//	top.Ext.getCmp('name1').setValue('');
-//	top.Ext.getCmp('amount1').setValue('');
-//	top.Ext.getCmp('batchNumber1').setValue('');
-//	top.Ext.getCmp('cost').setValue('');
-//	top.Ext.getCmp('disposableGoodsStockID').setValue('');
-//	disposableGoodsBatchNumStore.removeAll();
-//	top.Ext.getCmp('expDate').setValue('');
-//	top.Ext.getCmp('supplierName').setValue('');
-//	top.Ext.getCmp('name1').focus();
+	
+	top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().add(expensiveGoodsGodownEntryItem);
+	//top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().insert(0 , expensiveGoodsGodownEntryItem);
+//	clearAddedElementValue();
 }
 
+/**
+ * 清空每个被添加的元素的值
+ */
+function clearAddedElementValue(){
+	top.Ext.getCmp('supplier1').setValue('');
+	top.Ext.getCmp('expensiveGoodsId1').setValue('');
+	top.Ext.getCmp('name1').setValue('');
+	top.Ext.getCmp('certification1').setValue('');
+	top.Ext.getCmp('expDate1').setValue('');
+	top.Ext.getCmp('cost1').setValue('');
+	top.Ext.getCmp('firstBodyCode1').setValue('');
+	top.Ext.getCmp('secondBodyCode1').setValue('');
+	top.Ext.getCmp('thirdBodyCode1').setValue('');
+	top.Ext.getCmp('grade1').setValue('');
+}
+
 function renderDeleteButton(v,p,record){
+	//如果为修改,则隐藏删除图标
+	if(commonEntry.isOpen()){
+		return "";
+	}
 	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.localID+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
 }
+/**
+* 精确计算arg1和arg2的乘积
+* @param arg1
+* @param arg2
+* @return
+*/
+function accMul(arg1,arg2) {
+	var s1=null ,m=0;
+	if(!arg1){
+		s1 = '0.0';
+	}else{
+		s1=arg1.toString();
+	}
+	if(!arg2){
+		s2='0.0';
+	}else{
+		s2=arg2.toString();
+	}
+	try{m+=s1.split(".")[1].length;}catch(e){s1='0.0';}
+	try{m+=s2.split(".")[1].length;}catch(e){s2='0.0';}
+	return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m);
+}
+/**
+* 精确计算arg1和arg2的和
+* @param arg1
+* @param arg2
+* @return
+*/
+function accAdd(arg1,arg2){
+	var r1=null ,m=0;
+	if(!arg1){
+		r1 = '0.0';
+	}else{
+		r1=arg1.toString();
+	}
+	if(!arg2){
+		r2='0.0';
+	}else{
+		r2=arg2.toString();
+	}
+	try{r1=arg1.toString().split(".")[1].length;}catch(e){r1=0;}
+	try{r2=arg2.toString().split(".")[1].length;}catch(e){r2=0;}
+	m=Math.pow(10,Math.max(r1,r2));
+	return round((arg1*m+arg2*m)/m,2);
+} 
+function round(v,e){ 
+	var t=1; 
+	for(;e>0;t*=10,e--); 
+	for(;e<0;t/=10,e++); 
+	return Math.round(v*t)/t;
+}
+function setTotalMoney(grid) {
+	var totalMoney = 0.0;
+	grid.getStore().each(function(record){
+		var cost = Ext.num(parseFloat(record.data.cost),0.0);
+		totalMoney += cost;
+	});	
+	top.Ext.getCmp("totalPrice").setValue(Ext.util.Format.usMoney(totalMoney));
+}
+function renderTotalPrice(val,p,record){
+	var cost = Ext.num(parseFloat(record.data.cost),0.0);
+	var total = Ext.util.Format.usMoney(cost);
+	return total;
+}
 
 function deleteItem(localID){
-	var godownEntryItemGridStore = top.Ext.getCmp('godownEntryItemGrid').getStore();
-	for(var i = 0;i<godownEntryItemGridStore.getCount();i++){
-		if(godownEntryItemGridStore.getAt(i).data.localID == localID){
-			godownEntryItemGridStore.remove(godownEntryItemGridStore.getAt(i));
+	var expensiveGoodsGodownEntryItemGridStore = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
+	for(var i = 0;i<expensiveGoodsGodownEntryItemGridStore.getCount();i++){
+		if(expensiveGoodsGodownEntryItemGridStore.getAt(i).data.localID == localID){
+			expensiveGoodsGodownEntryItemGridStore.remove(expensiveGoodsGodownEntryItemGridStore.getAt(i));
 			break;
 		}
 	}
+	setTotalMoney(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'));
 }
+
 var selectModel = new top.Ext.grid.CheckboxSelectionModel();
-function addGodownEntry(type) {
-	// 清除表单数据
-	clearFormData();
+//从退库单列表点添加或点击列表中某一行的单都会调用此function
+function addExpensiveGoodsGodownEntry() {
+	Ext.getCmp("formSubmitResult").setValue(formSubmitResultInit);
 	wareHouseStore.load();
 	var form = new top.Ext.FormPanel({
-		id : 'godownEntryForm',
+		id : 'expensiveGoodsGodownEntryForm',
 		frame : true,
 		labelSeparator : '：',
-		bodyStyle : 'padding:5px 5px 0px 25px',
-		width : 800,
+		bodyStyle : 'padding:5px 5px 0px 5px',
+		width : 850,
 		autoScroll : true,
 		labelAlign : 'left',
         items:[{
@@ -400,18 +363,6 @@
 				value : TYPE_OUT
 			},{
 				xtype : 'hidden',
-				name : 'supplierName',
-				id : 'supplierName'
-			},{
-				xtype : 'hidden',
-				name : 'identification',
-				id : 'identification'
-			},{
-				xtype : 'hidden',
-				name : 'cost',
-				id : 'cost'
-			},{
-				xtype : 'hidden',
 				name : 'items',
 				id : 'items'
 			},{
@@ -436,7 +387,7 @@
 				id : 'warehouseName'
 			},{
 				id : 'serialNum',
-				columnWidth : .25,
+				columnWidth : .20,
 				layout : 'form',
 				labelWidth : 40,
 				hidden:true,
@@ -451,8 +402,8 @@
 					readOnly : true,
 					anchor : '95%'
 				}]
-			}, {
-				columnWidth : .25,
+			},{
+				columnWidth : .20,
 				layout : 'form',
 				labelWidth : 40,
 				items:[{
@@ -475,20 +426,16 @@
 						select : function(combo, record, index) {
 							setWareHouseInfo(record.data.id,record.data.name);
 							top.Ext.getCmp('wareHouse1').setValue(record.data.id);
-							top.Ext.getCmp('name1').focus();
-							top.Ext.getCmp('name1').enable();
-							disposableGoodsStockStore.removeAll();
-							//disposableGoodsStockStore.reload();
 						},
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
 								top.Ext.getCmp('name1').focus();
 							}
 						}
 					}
-				}]
-			},{
-				columnWidth : .25,
+				}]				
+			}, {
+				columnWidth : .20,
 				layout : 'form',
 				labelWidth : 60,
 				items : [{
@@ -523,20 +470,17 @@
 						}
 					}
 				}]
-			},{
-				columnWidth : .25,
+			}, {
+				columnWidth : .20,
 				layout : 'form',
-				labelWidth : 40,
+				labelWidth : 80,
 				items : [{
-					xtype : 'numberfield',
-					fieldLabel : '金额',
-					maxLength : '41',
+					xtype : 'textfield',
+					fieldLabel : '退库单总价',
 					id : 'totalPrice',
 					name : 'totalPrice',
-//					decimalPrecision:1,
+					readOnly:true,
 					cls : 'fieldReadOnlyNoRemove',
-					allowBlank : true,
-					readOnly : true,
 					anchor : '95%'
 				}]
 			}, {
@@ -551,297 +495,451 @@
 					name : 'remark',
 					maxLength : 665,
 					allowBlank : true,
-					anchor : '97.5%'
+					anchor : '100%'
 				}]
 			}]
-		},new top.Ext.grid.GridPanel({
-			id : 'godownEntryItemGrid',
+		},new top.Ext.grid.EditorGridPanel({
+			id : 'expensiveGoodsGodownEntryItemGrid',
 			bodyStyle : 'border:1px solid #afd7af',
 			frame :false,
 			sm : selectModel,
-			height : 340,
+			width :1180,
+			height : 390,
 			viewConfig: {
 	            forceFit:true
 			},
 			store : new top.Ext.data.Store({
 				proxy : new top.Ext.data.HttpProxy({
-					url : WWWROOT + '/disinfectSystem/godownEntryAction!loadGodownEntryItemByid.do',
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!getExpensiveGoodsGodownEntryItemById.do',
 					method : 'POST'
 				}),
 				reader : new top.Ext.data.JsonReader({
 					fields : [
-				  	    {name : 'id'},
-				  	    {name : 'disposableGoodsID'},
-				  	    {name : 'disposableGoodsStockID'},
-				  	    {name : 'batchID'},
-				  	    {name : 'identificationID'},
-				  	    {name : 'name'},
-				  	    {name : 'amount'},
-				  	    {name : 'canOutAmount'},
-				  	    {name : 'batchNumber'},
-				  	    {name : 'identification'},
-				  	    {name : 'cost'},
-				  	    {name : 'expDate'},
-				  	    {name : 'supplierName'},
-				  	    {name : 'deleteButton'}
+					    {name : 'localID'}, 
+						{name : 'id'}, 
+						{name : 'supplierId'}, 
+						{name : 'supplierName'}, 
+						{name : 'expensiveGoodsId'}, 
+						{name : 'expensiveGoodsInstanceId'}, 
+						{name : 'expensiveGoodsStockId'}, 
+						{name : 'expensiveGoodsName'}, 
+						{name : 'status'}, 
+						{name : 'barcode'},
+						{name : 'expDate' ,type : 'date'},
+						{name : 'price'},
+						{name : 'firstBodyCode'},
+						{name : 'secondBodyCode'},
+						{name : 'thirdBodyCode'},
+						{name : 'grade'}
 				  	]
 				})
 			}),
 			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(), selectModel,
-	        	{header : "名称",dataIndex : 'name',width : 180,menuDisabled : true}, 
-	        	{header : "数量",dataIndex : 'amount',width : 60,menuDisabled : true}, 
-	        	{header : "可退库",dataIndex : 'canOutAmount',width : 60,menuDisabled : true},
-	        	{header : "批次",width : 100,dataIndex : 'batchNumber',menuDisabled : true}, 
-	        	{header : "标识号",width : 80,dataIndex : 'identification',menuDisabled : true},
-	        	{header : "失效日期",width : 90,dataIndex : 'expDate',menuDisabled : true},//, renderer:top.Ext.util.Format.dateRenderer('Y-m-d')
-	        	{header : "单价",dataIndex : 'cost',width : 60,menuDisabled : true,renderer: function(v,p,record){
-	        		return formartToFixedFloat(v,4);
-	        	}},
-	        	{header : "金额",dataIndex : '',width : 60,menuDisabled : true,renderer: function(v,p,record){
-	        		var amount = record.data.amount;
-	        		var cost = record.data.cost;
-	        		var totalPrice = amount*cost;
-	        		return formartToFixedFloat(totalPrice,4);
-	        	}},
-	        	{header : "供应商",width : 150,dataIndex : 'supplierName',menuDisabled : true},
-	        	{id : 'expandColumn',header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton}
+	           	{header : "id",dataIndex : 'id',hidden : true},
+	           	{header : "供应商id",dataIndex : 'supplierId',width : 130,hidden : true},
+//	           	{header : "供应商",dataIndex : 'supplierName',width : 130,menuDisabled : true},
+	           	{header : "expensiveGoodsId",dataIndex : 'expensiveGoodsId',hidden : true},
+	        	{header : "物品名称",dataIndex : 'expensiveGoodsName',width : 200,menuDisabled : true},
+	        	{header : "条码",dataIndex : 'barcode',width : 100,menuDisabled : true},
+//	        	{header : "状态",dataIndex : 'status',width : 80,menuDisabled : true},
+	        	{header : "失效日期",width : 80,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d'),
+					editor : new top.Ext.form.DateExtensiableField({
+						minWidth : 177,
+						format : 'Y-m-d',
+						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+						allowBlank : false
+					})
+				},
+	        	{header : "单价",dataIndex : 'cost',width : 50,menuDisabled : true},
+    			{header : "自身条码1",dataIndex : 'firstBodyCode',width : 100,menuDisabled : true},
+				{header : "自身条码2",dataIndex : 'secondBodyCode',width : 100,menuDisabled : true},
+				{header : "自身条码3",dataIndex : 'thirdBodyCode',width : 100,menuDisabled : true},
+	        	{header : "删除",width : 50,menuDisabled : true,renderer:renderDeleteButton}
 	        ]),
-			width :835,
-			autoExpandColumn : 'expandColumn',
 			selModel : new top.Ext.grid.RowSelectionModel({
 				singleSelect : false
 			}),
 			tbar : [{
 				xtype : 'hidden',
-				name : 'disposableGoodsStockID',
-				id : 'disposableGoodsStockID'
+				name : 'expensiveGoodsId1',
+				id : 'expensiveGoodsId1'
 			},{
 				xtype : 'hidden',
 				name : 'barcode',
 				id : 'barcode'
 			},{
-				text : '扫描条码  :'
+				text : '扫描条码:'
 			},{
 				xtype : 'textfield',
-				id : 'barcode',
-				name : 'barcode',
-				width :70,
-				enableKeyEvents : true,
+				id : 'scanBarcode',
+				name : 'scanBarcode',
+				width : 100,
+				anchor : '95%',
+				allowBlank:true,
 				listeners : {
-					render : function(c) {
-						c.getEl().on('keypress',function(e) {
-										if (e.getKey() == 13) {// 输入;号键，grid重新加载
-											loadBarcodeDeviceInfo();
-										}
-									});
+					specialkey : function(field, e) {
+						if (e.getKey() == Ext.EventObject.ENTER) {
+							loadBarcodeDeviceInfo();
+						}
 					}
 				}
-			},{
-				text : '名称:'
-			},{
-				xtype : 'combo',
-				id : 'name1',
-				name : 'name1',
-				queryParam : 'spell',
-				minChars : 0,
-				valueField : 'id',
-				displayField : 'name',
-                pageSize : 100,
-                listWidth : 400,
-				store : disposableGoodsStockStore,
-                matchFieldWidth : false,
-				forceSelection : true,
-				lazyInit : false,
-				triggerAction : 'all',
-				hideTrigger : true,
-				typeAhead : false,
-				allowBlank : true,
-				disabled : true,
-				width : 110,
-				listeners : {
-					select : function(combo, record, index) {
-						top.Ext.getCmp('name1').setValue(record.data.name);
-						top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id);
-						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						
-						// 清空批次和价格
-						clearBatchNumberAndPrice();
-						var wareHouseid = top.Ext.getCmp('warehouseID').getValue();
-//						DiposableGoodsTableManager.getBatchNumbersByDiposableGoodsId(record.data.id,"inStock",function(batchNumbers){
-						DiposableGoodsTableManager.getBatchsByDisposableGoodsStockIdAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){
-							var batches = JSON.parse(batchesStr);
-							for(var i = 0;i<batches.length;i++){
-								batches[i].expDate = batches[i].expDateStr;
-							}
-							setBatchNumbers(batches, true);
-						});
-					},
-					specialkey : function(field, ee) {
-						if (ee.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('amount1').focus();
+			}],
+			listeners: {
+				render : function() {
+	        	var tbar = new top.Ext.Toolbar ({
+	        		items : [{
+	    				text : '自身条码1:'
+	    			},{
+	    				xtype : 'textfield',
+	    				id : 'firstBodyCode1',
+	    				name : 'firstBodyCode1',
+	    				width : 100,
+	    				anchor : '95%',
+	    				allowBlank:true,
+	    				listeners : {
+	    					specialkey : function(field, e) {
+	    						if (e.getKey() == Ext.EventObject.ENTER) {
+	    							var isOK = field.validate();
+	    							if(isOK){
+	    								var value = field.getValue();
+	    								field.setValue(value);
+	    								top.Ext.getCmp('secondBodyCode1').focus();
+	    								top.Ext.getCmp('secondBodyCode1').selectText();
+	    							}
+	    							
+	    						}
+	    					}
+	    				}
+	    			},{
+	    				text : '自身条码2:'
+	    			},{
+	    				xtype : 'textfield',
+	    				id : 'secondBodyCode1',
+	    				name : 'secondBodyCode1',
+	    				width : 100,
+	    				anchor : '95%',
+	    				listeners : {
+	    					specialkey : function(field, e) {
+	    						if (e.getKey() == Ext.EventObject.ENTER) {
+	    							var isOK = field.validate();
+	    							if(isOK){
+	    								var value = field.getValue();
+	    								field.setValue(value);
+	    								top.Ext.getCmp('thirdBodyCode1').focus();
+	    								top.Ext.getCmp('thirdBodyCode1').selectText();
+	    							}
+	    							
+	    						}
+	    					}
+	    				}
+	    			},{
+	    				text : '自身条码3:'
+	    			},{
+	    				xtype : 'textfield',
+	    				id : 'thirdBodyCode1',
+	    				name : 'thirdBodyCode1',
+	    				width : 100,
+	    				anchor : '95%',
+	    				allowBlank:true,
+	    				listeners : {
+	    					specialkey : function(field, e) {
+	    						if (e.getKey() == Ext.EventObject.ENTER) {
+	    							var isOK = field.validate();
+	    							if(isOK){
+	    								var value = field.getValue();
+	    								field.setValue(value);
+	    							}
+	    							
+	    						}
+	    					}
+	    				}
+	    			}]
+	        	});
+	        	tbar.render(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').tbar);
+	        	
+	        }
+		}
+		})],
+		buttons : [
+		{
+			text : '修改物品',
+			hidden : !commonEntry.isOpen(),
+			handler : function() {
+				var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
+				var modifyRecords = store.getModifiedRecords();
+				var len = modifyRecords.length;
+				var items = [];
+				for (var i = 0; i < len; i++) {
+					var record = modifyRecords[i];
+					items.push({
+						id : record.data.id,//退库明细id
+						expensiveGoodsId : record.data.expensiveGoodsId,//一次性物品定义id
+						expDate : record.data.expDate.format('Y-m-d'),//失效日期
+						supplierName : record.data.supplierName,//供应商
+						grade : record.data.grade//类别
+					});
+				}
+				top.Ext.getCmp("items").setValue(JSON.stringify(items));
+				form.form.submit({
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!modifyExpensiveGoodsGodownEntryItemBaseData.do',
+					method : 'POST',
+					waitMsg : '正在保存数据，请稍候',
+					waitTitle : '提交表单',
+					success : function(form, action) {
+						if(!isUndefinedOrNullOrEmpty(action.result.message)){
+							showResult(action.result.message);
+							return;
 						}
+						expensiveGoodsGodownEntryWin.close();
+						grid.dwrReload();
+					},
+					failure : function(form, action) {
+						alert(action.result.message);
 					}
+				});
+			}
+		},
+		{
+			text : '选择打印',
+			handler : function() {
+				if(!form.getForm().isValid()){
+					showResult('请正确填写表单各值');
+					return false;
 				}
-			},{
-				text : '数量:'
-			},{
-				xtype : 'textfield',
-				maxLength : '16',
-				id : 'amount1',
-				name : 'amount1',
-				width : 60,
-				regex: /^\d+$/,
-				regexText:'只能输入数字',
-				anchor : '95%',
-				listeners : {
-					specialkey : function(field, e) {
-						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('batchNumber1').focus();
-						}
+				var items = [];
+				var records = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getSelectionModel().getSelections();
+				if (records.length == 0) {
+					showResult("请选择要打印的一次性物品！");
+					return false;
+				}
+				
+				for ( var i = 0, len = records.length; i < len; i++) {
+					if(isUndefinedOrNullOrEmpty(records[i].data.id)){
+						showResult(records[i].data.name + "未保存！请先保存再打印");
+						return false;
 					}
+					items.push(records[i].data);
 				}
-			},
-			{text: '失效期:'},
-	        {
-	            xtype: 'textfield',
-	            fieldLabel: '失效时间',
-	            id: 'expDate',
-	            format: sstsConfig.timeSearchFmt || 'Y-m-d',
-	            readOnly: true,
-	            editable: false,
-	            width: 75
-	        },{
-				text : '批次:'
-			},{
-				xtype : 'combo',
-				id : 'batchNumber1',
-				name : 'batchNumber1',
-				valueField : 'batchNumber',
-				displayField : 'batchNumber',
-				store : disposableGoodsBatchNumStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 90,
-				anchor : '95%',
-				listeners:{
-					select : function(combo, record, index) {
-						var disposableGoodID = top.Ext.get('disposableGoodsStockID').getValue();
-						top.Ext.getCmp('cost').setValue(record.data.cost);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						top.Ext.getCmp('expDate').setValue(record.data.expDate);
-						// 清空价格
-						clearPrice();
-						// 填充价格
-						var batch = getSelectedBatch();
-						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
-							setPrices(priceAmounts,true);
-						});
+				top.Ext.getCmp("items").setValue(JSON.stringify(items));
+				form.form.submit({
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!printSomeExpensiveGoodsGodownEntryItem.do',
+					method : 'POST',
+					waitMsg : '正在保存数据，请稍候',
+					waitTitle : '提交表单',
+					success : function(form, action) {
+						if(!isUndefinedOrNullOrEmpty(action.result.errorMessage)){
+							showResult(action.result.errorMessage);
+							return;
+						}
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
+						expensiveGoodsGodownEntryWin.close();
+						grid.dwrReload();
+						//打印条码
+						commonEntry.printBarcode(action.result.items,false);
+
+					},
+					failure : function(form, action) {
+						showResult(action.failureType);
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
 					}
+				});
+			}
+		},{
+			text : '保存并打印新标签',
+			hidden:saveButton || (commonEntry.isOpen() ? true:false),
+			handler : function() {
+				if(!form.getForm().isValid()){
+					showResult('请正确填写表单各值');
+					return false;
 				}
-			},{
-				text : '单价  :'
-			},{
-				xtype : 'combo',
-				id : 'combo_price',
-				name : 'combo_price',
-				valueField : 'price',
-				displayField : 'priceForDisplay',
-				store : priceStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 70,
-				anchor : '95%'
-			},
-			{
-				text : '添加',
-				iconCls : 'btn_ext_add',
-				handler : function() {
-					var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue();
-					var name = top.Ext.getCmp('name1').getValue();
-					var count = top.Ext.getCmp('amount1').getValue();
-					var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
-					var batch = getSelectedBatch();
-					var priceAmount = getSelectedPriceAmount();
-					addItems(disposableGoodsStockID,name,count,batch,priceAmount);
+				var items = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore());
+				top.Ext.getCmp("items").setValue(items);
+				// items为json数组字符串，不会为null
+				if(items == '[]'){
+					showResult('请正确填写表单各值');
+					return false;
 				}
-			}]
-		})],
-		buttons : [{
-			id:'saveButton',
+				form.form.submit({
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!saveExpensiveGoodsGodownEntry.do',
+					method : 'POST',
+					params : {print : true},
+					waitMsg : '正在保存数据，请稍候',
+					waitTitle : '提交表单',
+					success : function(form, action) {
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
+						//保存返回的结果
+						entryItemJsonArray = action.result.items;
+						showResult(action.result.message);
+						expensiveGoodsGodownEntryWin.close();
+						grid.dwrReload();
+						
+						//打印条码
+						//commonEntry.printBarcode(entryItemJsonArray,true);
+
+					},
+					failure : function(form, action) {
+						showResult(action.result.message);
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
+					}
+				});
+			}
+		},{
 			text : '保存',
+			hidden:saveButton || (commonEntry.isOpen()?true:false),
 			handler : function() {
 				if(!form.getForm().isValid()){
 					showResult('请正确填写表单各值');
 					return false;
 				}
-				
-				var count = top.Ext.getCmp('godownEntryItemGrid').getStore().getCount();
-				if (count == 0) {
-					showResult("请选择添加要退库的一次性物品！");
-					return false;
+				var name = top.Ext.getCmp('name1').getValue();
+				var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
+				var len = store.getCount();
+				var items = [];
+				for (var i = 0; i < len; i++) {
+					var record = store.getAt(i);
+					items.push(record.data);
 				}
 				// 设置表单参数json
 				setFormParams(form,['id','remark','time','warehouseName','warehouseID']);
-				var items = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
-				top.Ext.getCmp("items").setValue(items);
+				top.Ext.getCmp("items").setValue(JSON.stringify(items));
+				
 				// items为json数组字符串，不会为null
-				if(items == '[]'){
-					showResult('请正确填写表单各值');
+				if(items.length == 0){
+					showResult('退库物品不能为空!');
 					return false;
 				}
 				form.form.submit({
-					url : WWWROOT + '/disinfectSystem/godownEntryAction!saveGodownOutEntry.do',
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!saveExpensiveGoodsGodownOutEntry.do',
 					method : 'POST',
 					waitMsg : '正在保存数据，请稍候',
 					waitTitle : '提交表单',
 					success : function(form, action) {
-						window.close();
+						showResult(action.result.message);
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
+						expensiveGoodsGodownEntryWin.close();
 						grid.dwrReload();
+						var barcodeStr = action.result.barcode;
+						var tableHtml = "";
+						if(barcodeStr != null){
+    						  var barcodeArray = barcodeStr.split(";");
+    						  for(var i = 0;i < barcodeArray.length;i++){
+    						      var items = barcodeArray[i].split("#&");
+    						      var name = items[0];
+    						      var barcode = items[2];
+    						      var expDate = items[3];
+    						      var supplierName = items[4];
+    						      var specification = items[6];
+    						      tableHtml += "<tr height='25px'><td>"+name+"</td><td>"+specification+"</td></tr>";
+    						  }
+						}
+						if(tableHtml.length > 0){
+						   var title = "<table border =1><tr height='30px'><td width='200px' align='center'>名称</td><td  width='70px' align='center'>规格</td><td  width='50px' align='center'>批次</td><td  width='60px' align='center'>条码</td><td width='70px' align='center'>失效期</td></tr>"+tableHtml+"</table>";
+						   top.Ext.MessageBox.alert("已退库物品清单", title);
+						}
+						
 					},
 					failure : function(form, action) {
 						showResult(action.result.message);
+						Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
 					}
 				});
 			}
 		},{
 			text : '取消',
 			handler : function() {
-				window.close();
+				expensiveGoodsGodownEntryWin.close();
 			}
 		}]
 	});
 	
-	var window = new top.Ext.Window( {
+	var expensiveGoodsGodownEntryWin = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
-		title : entityName + '信息',
-		width : 910,
-		height :500,
+		title : '退库单信息',
+		width : 1020,
+		height :550,
 		modal : true,
 //		autoHeight : true,
 		border :false,
 		plain : true,
-		items : [ form ]
+		items : [ form ],
+		listeners : {
+			close : function (){
+				expensiveGoodsStore.baseParams.supplierId = null;
+				expensiveGoodsStore.load();
+			}
+		}
 	});
-	window.show();
+	expensiveGoodsGodownEntryWin.show();
 	top.Ext.getCmp('name1').focus(false, 100); 
 }
 
+//添加退库明细
+function addGodown(){
+	if(!top.Ext.getCmp('expensiveGoodsGodownEntryForm').form.isValid()){
+		showResult('请正确填写表单各值');
+		return false;
+	}
+	var expensiveGoodsId = top.Ext.getCmp('expensiveGoodsId1').getValue();
+	var expensiveGoodsName = top.Ext.getCmp('name1').getValue();
+	if(expensiveGoodsName.length==0){
+		showResult('请填写物品名称!');
+		top.Ext.getCmp('name1').focus(false,100);
+		return false;
+	}
+	var cost = top.Ext.getCmp('cost1').getValue();
+	if(cost.length==0){
+		showResult('请填写物品价格!');
+		top.Ext.getCmp('cost1').focus(false,100);
+		return false;
+	}
+	var expDate = top.Ext.getCmp('expDate1').getValue();
+	var supplierId = top.Ext.getCmp('supplier1').getValue();
+	var supplierName = top.Ext.getCmp('supplier1').getRawValue();
+	var certification = top.Ext.getCmp('certification1').getRawValue();
+
+	var firstBodyCode = top.Ext.getCmp('firstBodyCode1').getValue();
+	var secondBodyCode = top.Ext.getCmp('secondBodyCode1').getRawValue();
+	var thirdBodyCode = top.Ext.getCmp('thirdBodyCode1').getRawValue();
+	    
+  	var expDateStr = top.Ext.getCmp('expDate1').getRawValue();
+  	var currentDate = new Date();
+  	var year = parseInt(currentDate.getFullYear()) + 1;
+  	var month = parseInt(currentDate.getMonth())+1;
+  	var day = currentDate.getDate();
+  	var nextYearDate = year + "-" + month + "-" + day;
+  	var grade = top.Ext.getCmp('grade1').getValue();
+  	if(expDateStr != ""){
+  		if(dateCompare(expDateStr,nextYearDate) != 1){
+	    		top.Ext.MessageBox.confirm("请确认","添加的物品失效日期在一年之内,确定要添加吗？",function(button, text){
+	    			if("yes" == button){
+	    				addItems(supplierId , supplierName , expensiveGoodsId,expensiveGoodsName,cost,expDate,certification,firstBodyCode,secondBodyCode,thirdBodyCode,grade);
+	    				var grid = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid');
+	    			  	setTotalMoney(grid);
+	    			  	top.Ext.getCmp('name1').setValue('');
+	    			  	top.Ext.getCmp('name1').setDisabled(true);
+    					top.Ext.getCmp('supplier1').focus();
+    					top.Ext.getCmp('supplier1').selectText();
+	    			}
+	    		});
+	  	}else{
+	  		addItems(supplierId , supplierName , expensiveGoodsId,expensiveGoodsName,cost,expDate,certification,firstBodyCode,secondBodyCode,thirdBodyCode,grade);
+	  		var grid = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid');
+	  	  	setTotalMoney(grid);
+	  	}
+  	}else{
+  		showResult("请填写失效日期!");
+  		top.Ext.getCmp('expDate1').focus(false,100);
+  	}
+  	
+}
+
 // 删除
-function deleteGodownEntry(grid) {
+function deleteExpensiveGoodsGodownEntry(grid) {
 	var records = grid.getSelectionModel().getSelections();
 
 	if (records.length == 0) {
-		showResult("请选择要删除的" + entityName + "！");
+		showResult("请选择要删除的退库单！");
 		return false;
 	}
 	var ids = null;
@@ -852,17 +950,18 @@
 			ids = ids + ';' + records[i].data['id'];
 		}
 	}
-	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的" + entityName + "信息？",
+	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的退库单信息？",
 		function(button, text) {
 			if ("yes" == button){
 				Ext.Ajax.request({
-					url : WWWROOT + '/disinfectSystem/godownEntryAction!deleteGodownEntryOut.do',
+					url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!deleteExpensiveGoodsGodownEntry.do',
 					params : {ids : ids},
 					success : function(response, options) {
 						var result = Ext.decode(response.responseText);
-						if (result.success) {
-							showResult(result.message);
+						var success = result.success;
+						if (success) {
 							grid.dwrReload();
+							showResult(result.message);
 						}
 					},
 					failure : function(response, options) {
@@ -872,74 +971,74 @@
 			}
 		}
 	);
+
 }
 
 var loadFormData = function(grid) {
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
-		showResult("请选择要查看的" + entityName + "！");
+		showResult("请选择要查看的退库单！");
 		return false;
 	}
 	if (records.length > 1) {
-		showResult("一次只能查看一个" + entityName + "！");
+		showResult("一次只能查看一个退库单！");
 		return false;
 	}
 	id = records[0].data['id'];
 	editRecord(id);
 };
-
+/*
+ * "根据id查看退库单信息表"
+ */
 function editRecord(id){
 	commonEntry.setId(id);
-	addGodownEntry();
-	if(!isUndefinedOrNullOrEmpty(id)){
-		top.Ext.getCmp("saveButton").hide();
-	}
+	addExpensiveGoodsGodownEntry();
 	top.Ext.getCmp("serialNum").show();
-	top.Ext.getCmp('godownEntryForm').form.load({
-		url : WWWROOT + '/disinfectSystem/godownEntryAction!loadGodownEntry.do',
+	top.Ext.getCmp('expensiveGoodsGodownEntryForm').form.load({
+		url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!loadExpensiveGoodsGodownEntry.do',
 		method : 'GET',
 		waitMsg : '正在加载数据，请稍候',
 		params : {id : id},
 		success : function(form, action) {
-			var time = action.result.data.time.time;
-			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(time), 'Y-m-d H:i'));
-			setWareHouseInfo(action.result.data.warehouseID,action.result.data.warehouseName);
-			top.Ext.getCmp("wareHouse1").setValue(action.result.data.warehouseID);
-			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
-				var specification = action.result.data.itemsList[i].diposableGoods.specification;
+			var resultEntryData = action.result.data;
+			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(resultEntryData.time.time), 'Y-m-d H:i'));
+			setWareHouseInfo(resultEntryData.warehouseID,resultEntryData.warehouseName);
+			top.Ext.getCmp("wareHouse1").setValue(resultEntryData.warehouseID);
+
+			var resultEntryItem = resultEntryData.itemsList;
+			for(var i = 0 ;i < resultEntryItem.length ;i++){
+				var specification = resultEntryItem[i].expensiveGoods.specification;
 				var b = true;
 				if(specification == null || specification.length <= 0){
 					b = false; 
 				}
-				var expDateStr = '';
-				if(!isUndefinedOrNull(action.result.data.itemsList[i].expDate)){
-					expDateStr = Ext.util.Format.date(new Date(action.result.data.itemsList[i].expDate.time), 'Y-m-d')
-				}
-				var godownEntryItem = new GodownEntryItemRecord({
+				var cost = parseFloat(resultEntryItem[i].cost);
+				var expensiveGoodsGodownEntryItem = new ExpensiveGoodsGodownEntryItemRecord({
 					localID:g_localID++,
-					id : action.result.data.itemsList[i].id,
-					disposableGoodsID: action.result.data.itemsList[i].disposableGoodsID,
-					disposableGoodsStockID: action.result.data.itemsList[i].disposableGoodsStockID,
-					disposableGoodsBatchID: action.result.data.itemsList[i].disposableGoodsBatchID,
-					disposableGoodsBatchStockID: action.result.data.itemsList[i].disposableGoodsBatchStockID,
-//					disposableGoodsStockID : action.result.data.itemsList[i].diposableGoods.id,
-					identificationID : action.result.data.itemsList[i].identificationID,
-					name : action.result.data.itemsList[i].diposableGoods.name + (b == false?"":" ["+specification+"]"),
-					amount : action.result.data.itemsList[i].amount,
-					identification : action.result.data.itemsList[i].identification,
-					cost : action.result.data.itemsList[i].cost,
-					batchNumber : action.result.data.itemsList[i].batchNumber,
-					expDate : expDateStr,
-					supplierName : action.result.data.itemsList[i].supplierName,
-					identification : action.result.data.itemsList[i].identification
+					id : resultEntryItem[i].id,
+					expensiveGoodsId : resultEntryItem[i].expensiveGoodsId,
+					//name : resultEntryItem[i].expensiveGoods.name + (b == false?"":" ["+specification+"]"),
+					expensiveGoodsName : resultEntryItem[i].expensiveGoods.name + (b == false?"":" ["+specification+"]"),
+					cost : cost,
+					certification : resultEntryItem[i].certification,
+					expDate : new Date(resultEntryItem[i].expDate.time),
+					supplierId : resultEntryItem[i].supplierId,
+					supplierName : resultEntryItem[i].supplierName,
+					firstBodyCode : resultEntryItem[i].firstBodyCode,
+					secondBodyCode : resultEntryItem[i].secondBodyCode,
+					thirdBodyCode : resultEntryItem[i].thirdBodyCode,
+					grade : resultEntryItem[i].grade
 				});
-				top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
+				
+				top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().add(expensiveGoodsGodownEntryItem);
 			}
+			setTotalMoney(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid'));
 			// 保存原始数据,只需要保存需要修改的属性
 			setOriginalFormParams(form,['id','remark','time','warehouseName','warehouseID']);
-			var originalItems = buildJSONStringFromStore(top.Ext.getCmp('godownEntryItemGrid').getStore());
+			var originalItems = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore());
 			//alert(originalItems);
 			top.Ext.getCmp("originalItems").setValue(originalItems);
+			
 		},
 		failure : function(form, action) {
 		}
@@ -956,38 +1055,14 @@
 }
 
 Ext.onReady(function() {
-	
-    top.Ext4.tip.QuickTipManager.init();
 	Ext.QuickTips.init();
 	commonEntry.setCurrentUserName(curUserName);
-	//单价数据源
-	if(priceStore == null){
-		priceStore = new Ext.data.Store({
-			reader : new Ext.data.JsonReader({
-				fields : [
-				          {name : 'price'},
-				          {name : 'fluctuationPrice'},
-				          {name : 'amount'}
-				]
-			})
-		});
-	}
-	if(PriceRecord == null){
-		PriceRecord = Ext.data.Record.create([
-		                                      	{name : 'price'},
-										        {name : 'fluctuationPrice'},
-										        {name : 'amount'}
-		                                      ]);
-	}
-	
-	var sm = new Ext.grid.CheckboxSelectionModel();
-	var columns = [sm,
-		{header : "单号",width : 150,dataIndex : 'serialNumber' , renderer : modifyRecord},
-		{header : "操作员",width : 150,dataIndex : 'operator'},
-		{header : "退库时间",width : 150,dataIndex : 'time' , renderer : myDateFormat},
-		{header : "退库金额",width : 150,dataIndex : 'totalPrice' ,renderer: function(v,p,record){
-    		return formartToFixedFloat(v,4);
-    	}},
+	var columns = [
+		{header : "单号",width : 200,dataIndex : 'serialNumber', renderer : modifyRecord
+		},
+		{header : "操作员",width : 200,dataIndex : 'operator'},
+		{header : "退库时间",width : 200,dataIndex : 'time' , renderer : myDateFormatByMinute},
+		{header : "金额",width : 200,dataIndex : 'totalPrice'},
 		{id : 'operationRemark',header : "备注",width : 120,dataIndex : 'remark'}
 	];
 
@@ -996,93 +1071,99 @@
 	    {name : 'serialNumber'},
 	    {name : 'operator'},
 	    {name : 'time'}, 
+	    {name : 'remark'},
 	    {name : 'totalPrice'}, 
-	    {name : 'remark'}
+	    {name : 'supplierName'},
+	    {name : 'dataStatus'},
+	    {name : 'subType'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({
 		filters:[
 	        {type: 'string',  dataIndex: 'serialNumber'},
 	        {type: 'string',  dataIndex: 'operator'},
 	        {type: 'date',  dataIndex: 'time'},
-	        {type: 'string',  dataIndex: 'remark'}
+	        {type: 'string',  dataIndex: 'remark'},
+	        {type: 'string',  dataIndex: 'totalPrice'},
+	        {type: 'string',  dataIndex: 'supplierName'}
 	    ]}
 	);
 
-	var tbar = [{
-		text : '添加',
-		hidden : SSTS_WarehouseEntry_Create,
-		iconCls : 'btn_ext_add',
-		handler : function() {
-			commonEntry.setId(null);
-			addGodownEntry('insert');
-		}
-	},'-'/*,{
-		text : '删除',
-		hidden : true,
-		iconCls : 'btn_ext_application_del',
-		handler : function() {
-			deleteGodownEntry(grid);
-		}
-	},'-'*/,{
+	var sign = true;
+	//grid顶部工具栏,通过权限与配置项判定是否需要添加到工具栏
+	var tbar = [];
+	//添加
+	if(!SSTS_ExpensiveGoodsPurchaseGodownEntry_Create){
+		tbar.push({
+			text : '添加',
+			iconCls : 'btn_ext_application_add',
+			handler : function() {
+				commonEntry.setId(null);
+				addExpensiveGoodsGodownEntry();
+			}
+		});
+		tbar.push('-');
+	}
+	tbar.push({
 		text : '查看',
-		hidden : SSTS_WarehouseEntry_Update,
-		iconCls : 'btn_ext_refresh',
+		hidden : SSTS_ExpensiveGoodsPurchaseGodownEntry_Update,
+		iconCls : 'btn_ext_application_edit',
 		id : 'editTbar',
 		handler : function() {
 			loadFormData(grid);
 		}
-	},'-',{
+	});
+	tbar.push('-');
+	
+	tbar.push({
 		text : '打印',
-//		hidden : SSTS_WarehouseEntry_Delete,
 		iconCls : 'icon_print',
-		handler : function(){
+		hidden: true,
+		handler : function() {
 			commonEntry.onPrintEntryDetail(grid,entityName);
 		}
 	},'-',{
 		text : '打印列表',
-//		hidden : SSTS_WarehouseEntry_Delete,
 		iconCls : 'icon_print',
+		hidden: true,
 		handler : function() {
 			//加载打印数据
 			var map = {};
-			map["code"] = Ext.getCmp('code').getValue();
-			map["batchNumber"] = Ext.getCmp('batchNumber').getValue();
+			map["code"] = Ext.getCmp('expensiveGoodsCombo').getValue();
 			map["startDate"] = Ext.getCmp('startDate').getRawValue();
 			map["endDate"] = Ext.getCmp('endDate').getRawValue();
 			map["type"] = entityName;
 			  
 			commonEntry.onPrintEntryList(map,entityName);
 		}
-	}];
-
+	});
+	
+	//表单提交结果(用于自动化测试验证)
+	tbar.push({id:'formSubmitResult',xtype:'hidden',value:formSubmitResultInit});
+	
 	grid = new Ext.ux.ForgonPageGrid( {
 		tbar : tbar,
 		pageSize : 20,
 		defaultSortField : 'id',
-		title :  entityName + '列表',
-		defaultSortDirection : 'desc',
-		isCheckboxSelectionModel : false,
+		title : '退库单列表',
+		defaultSortDirection : 'DESC',
+		isCheckboxSelectionModel : true,
 		rememberSelected : false,
 		isShowSearchField : true,
 		columns : columns,
 		plugins: filters,
-		sm:sm,
 		autoExpandColumn : 'operationRemark',
 		renderTo : 'gridDiv',
 		frame : false
 	}, readerDetail,
-		GodownEntryTableManager.findGodownEntryTableList2,
+		ExpensiveGoodsGodownEntryTableManager.findExpensiveGoodsGodownOutEntryTableList,
 		null 
 	);
-
+	
 	function initQueryValueAndReload() {
 		var startDate = Ext.getCmp('startDate').getRawValue();
 		var endDate = Ext.getCmp('endDate').getRawValue();
-		var code = Ext.getCmp('code').getValue();
-		var batchNumber = Ext.getCmp('batchNumber').getValue();
-		var disposableGoodsName = Ext.getCmp('disposableGoodsName').getValue();
-		var specification = Ext.getCmp('specification').getValue();
+		var expensiveGoodsId = Ext.getCmp('expensiveGoodsCombo').getValue();
 		if(startDate || endDate){
 			if(!compareDate(startDate,endDate)){
 				showResult("开始时间不能大于结束时间");
@@ -1092,10 +1173,7 @@
 		
 		$Id('parm_s_startDate').value = startDate;
 		$Id('parm_s_endDate').value = endDate;
-		$Id('parm_s_code').value = code;
-		$Id('parm_s_batchNumber').value = batchNumber;
-		$Id('parm_s_disposableGoodsName').value = disposableGoodsName;
-		$Id('parm_s_specification').value = specification;
+		$Id('parm_s_expensiveGoodsId').value = expensiveGoodsId;
 		grid.dwrReload();
 	}
 	var dt = new Date();
@@ -1118,8 +1196,8 @@
 			layout : 'column',
 			items:[{
 				xtype:'hidden',
-				name : 'disposableGoodsName',
-				id : 'disposableGoodsName'
+				name : 'expensiveGoodsName',
+				id : 'expensiveGoodsName'
 		    },{
 				xtype:'hidden',
 				name : 'specification',
@@ -1131,15 +1209,16 @@
 				items : [{
 					fieldLabel : '关键字',
 					xtype : 'combo',
-					id : 'code',
-					name : 'code',
+					id : 'expensiveGoodsCombo',
+					name : 'expensiveGoodsCombo',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'id',
 					displayField : 'displayName',
 					width : 600,
-					store : allDiposableGoodsStore,
+					store : expensiveGoodsStore,
                     pageSize : 100,
+                    width : 400,
                     listConfig: {width: 300},
 					forceSelection : true,
 					lazyInit : true,
@@ -1150,44 +1229,13 @@
 					anchor : '97%',
 					listeners : {
 						select : function(combo, record, index) {
-							Ext.getCmp('batchNumber').setValue();
-							Ext.getCmp('code').setValue(record.data.name);
-							Ext.getCmp('disposableGoodsName').setValue(record.data.disposableGoodsName);
+							Ext.getCmp('expensiveGoodsCombo').setValue(record.data.id);
+							Ext.getCmp('expensiveGoodsName').setValue(record.data.name);
 							Ext.getCmp('specification').setValue(record.data.specification);
-							batchNumStore.baseParams['disposableGoodsID'] = record.data.id;
-							batchNumStore.load();
 						}
 					}
 				}]
 			},{
-				columnWidth : .25,
-				layout : 'form',
-				labelWidth : 60,
-				items : [{
-					xtype : 'combo',
-					id : 'batchNumber',
-					name : 'batchNumber',
-					fieldLabel : '物品批次',
-					maxLength : '30',
-					minChars : 0,
-					valueField : 'batchNumber',
-					displayField : 'batchNumber',
-					store : batchNumStore,
-					forceSelection : true,
-					lazyInit : false,
-					triggerAction : 'all',
-					hideTrigger : false,
-					typeAhead : false,
-					selectOnFocus :true,
-					anchor : '94%',
-					listeners :{
-						select:function(combo,  record, index ){
-							var batchNumber = record.data.batchNumber;
-							Ext.getCmp('batchNumber').setValue(batchNumber);
-						}
-					}
-				}]
-			},{
 				columnWidth : .5,
 				layout : 'form',
 				labelWidth : 60,
@@ -1244,17 +1292,17 @@
 					minWidth : 70,
 					iconCls : 'icon_set',
 					handler : function() {
-						Ext.getCmp('code').setValue("");
+						Ext.getCmp('expensiveGoodsCombo').setValue("");
 						Ext.getCmp('startDate').setValue("");
 						Ext.getCmp('endDate').setValue("");
-						Ext.getCmp('batchNumber').setValue("");
+						Ext.getCmp('expensiveGoodsId').setValue("");
 					}
 				}]
 			}]
 		}]
 	});
 	
-	var viewport = new Ext.Viewport( {
+	var viewport = new Ext.Viewport({
 		layout : 'border',
 		items : [form,{
 			region : 'center',
@@ -1280,55 +1328,48 @@
 			var content = "";
 			var id=record.data['id'];
 			 Ext.Ajax.request({
-		            url: WWWROOT + '/disinfectSystem/godownEntryAction!getGodownEntryItemById.do', 
+		            url: WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!getExpensiveGoodsGodownEntryItemById.do', 
 		            params : {
 						id : id
 					},
 		            success: function(response, options) {//请求成功的回调函数
 		            	var result = Ext.decode(response.responseText);
-		            if(result!=null){
-		            	var itemsList = result.data;
-		            for(var i=0;i<itemsList.length;i++){
-		            	var amount=itemsList[i].amount;
-		            	var cost=itemsList[i].cost;
-		            	var specification =itemsList[i].diposableGoods.specification;//规格
-						var b = true;
-						if(specification == null || specification.length <= 0){
-							b = false; 
-						}
-					//预览表格列
-					content +="<tr height=30 >"
-							+"<td align='left' width='350px'>&nbsp" + itemsList[i].diposableGoods.name+ (b == false?"":" ["+specification+"]")
-	            			+"</td><td width='100px' align='center'>"+ itemsList[i].batchNumber
-	            			+"</td><td width='100px' align='center'>"+ amount
-	            			+"</td><td width='100px' align='center'>"+ cost
-	            			+"</td><td width='150px' align='center'>"+ amount*cost
-	            			+"</td><td width='150px' align='center'>"+ (itemsList[i].supplierName == ""?'&nbsp':itemsList[i].supplierName) 
-	            			+"</td><td width='150px' align='center'>" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd")
-	            			+"</td>"+"</tr>";
-						}
-		              }
-		            //预览表格行
-		            tableContent = ("<table height='100%' border='1' align='center' cellpadding='0' cellspacing='0'>" 
-		            			 +"<tr bgcolor='#D7EBD9'height=25><td width='550px' align='center'><h3>物品名称</h3></td>"
-		            			 +"<td width='100px' align='center'><h3>批次</h3></td>"
-		            			 +"<td width='100px' align='center'><h3>数量</h3></td>"
-		            			 +"<td width='100px' align='center'><h3>单价</h3></td>" 
-		            			 +"<td width='100px' align='center'><h3>金额</h3></td>" 
-		            			 +"<td width='150px' align='center'><h3>供应商</h3></td>"
-		            			 +"<td width='150px' align='center' ><h3>失效时间</h3></td>");
-		            tableContent +="</tr>" + content + "</table></br>";
-		            record.set("htmlContent",tableContent);
+			            if(result!=null){
+			            	var itemsList = result;
+				            for(var i=0;i < itemsList.length;i++){
+				            	var cost = itemsList[i].cost;
+				            	var specification = itemsList[i].specification;//规格
+								var b = true;
+								if(specification == null || specification.length <= 0){
+									b = false; 
+								}
+								//预览表格列
+								content +="<tr height=30 >"
+										+"<td align='left' width='350px'>&nbsp" + itemsList[i].name+ (b == false?"":" ["+specification+"]")
+				            			+"</td><td width='60px' align='center'>"+ cost
+				            			+"</td><td width='200px' align='center'>" + (itemsList[i].supplierName == ""?'&nbsp':itemsList[i].supplierName)
+				            			+"</td><td width='200px' align='center'>" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd");
+				            			+"</td>"+"</tr>";
+							}
+			            }
+			            //预览表格行
+			            tableContent = ("<table height='100%' border='1' align='center' cellpadding='0' cellspacing='0'>" 
+			            			 +"<tr bgcolor='#D7EBD9'height=25><td width='550px' align='center'><h3>物品名称</h3></td>"
+			            			 +"<td width='60px' align='center'><h3>单价</h3></td>" 
+			            			 +"<td width='200px' align='center'><h3>供应商</h3></td>" 
+			            			 +"<td width='200px' align='center' ><h3>失效时间</h3></td>");
+			            tableContent +="</tr>" + content + "</table></br>";
+			            record.set("htmlContent",tableContent);
 		            }, 
 		            failure : function(response, options) {//请求失败的回调函数
 					}
 		         });
-			   }
+			 }
 				var rowEl = Ext4.fly(e.getTarget());
 				rowEl.set({
 					'data-qtip' :tableContent,
-					'data-qwidth':550,
+					'data-qwidth': 1000,
 					'data-qtitle':'&nbsp<font size=10>退库单信息表:</font>'});
-			}
-		});
-	});
\ No newline at end of file
+		}
+	});
+});
\ No newline at end of file
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r20861 -r20980
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 20861)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 20980)
@@ -1968,7 +1968,12 @@
 		return inventroy;
 	}
 	
+	public ExpensiveGoodsInstance getExpensiveGoodsInstanceByBodyCode(String firstBodyCode,String secondBodyCode,String thirdBodyCode){
+		String sql = String.format(" where po.firstBodyCode='%s' and po.secondBodyCode='%s' and po.thirdBodyCode='%s'", firstBodyCode,secondBodyCode,thirdBodyCode);
+		return (ExpensiveGoodsInstance)objectDao.getBySql(ExpensiveGoodsInstance.class.getSimpleName(), sql);
+	}
 	
+	
 	/**
 	 * 查询某个供应室处理的高值耗材品数据.
 	 * @param handleDepartCode					处理科室的科室编码
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
===================================================================
diff -u -r20841 -r20980
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java	(.../ExpensiveGoodsGodownEntryItemManagerImpl.java)	(revision 20841)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java	(.../ExpensiveGoodsGodownEntryItemManagerImpl.java)	(revision 20980)
@@ -95,16 +95,27 @@
 		
 		Long itemId = JSONUtil.optLong(itemObject,"id",null);
 		Long expensiveGoodsId = JSONUtil.optLong(itemObject,"expensiveGoodsId",null);
+		Long expensiveGoodsStockId = JSONUtil.optLong(itemObject,"expensiveGoodsStockId",null);
+		Long expensiveGoodsInstanceId = JSONUtil.optLong(itemObject,"expensiveGoodsInstanceId",null);
 		String barcode = itemObject.optString("barcode");// 条码(一般用于高值耗材),可以为空
-		Date expDate;
+		Date expDate = new Date();
 		try {
-			expDate = new SimpleDateFormat(DateTools.COMMON_DATE_ONLY).parse(itemObject.optString("expDate"));
+			String expDateStr = JSONUtil.optString(itemObject,"expDate",null);
+			if(StringUtils.isNotBlank(expDateStr)){
+				expDate = new SimpleDateFormat(DateTools.COMMON_DATE_ONLY).parse(expDateStr);
+			}
+			
 		} catch (ParseException e) {
 			e.printStackTrace();
 			throw new RuntimeException("日期格式错误!");
 		}
 
-		double cost = Double.valueOf(itemObject.optString("cost"));// 价格
+		double cost = 0;
+		String costStr = JSONUtil.optString(itemObject,"cost",null);
+		if(StringUtils.isNotBlank(costStr)){
+			cost = Double.valueOf(costStr);// 价格
+		}
+		
 		String certification = itemObject.optString("certification");// 注册证号
 		String supplierId = itemObject.optString("supplierId");// 供应商id
 		String supplierName = itemObject.optString("supplierName");// 供应商名字
@@ -117,6 +128,8 @@
 		godownEntryItem.setSupplierId(supplierId);
 		godownEntryItem.setSupplierName(supplierName);
 		godownEntryItem.setExpensiveGoodsId(expensiveGoodsId);
+		godownEntryItem.setExpensiveGoodsInstanceId(expensiveGoodsInstanceId);
+		godownEntryItem.setExpensiveGoodsStockId(expensiveGoodsStockId);
 		godownEntryItem.setCertification(certification);
 		godownEntryItem.setExpDate(expDate);
 		godownEntryItem.setCost(cost);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp
===================================================================
diff -u -r20841 -r20980
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp	(.../expensiveGoodsGodownOutEntryView.jsp)	(revision 20841)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp	(.../expensiveGoodsGodownOutEntryView.jsp)	(revision 20980)
@@ -1,62 +1,90 @@
-<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry"%>
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Css.jsp"%>
 <%@ page import="com.forgon.tools.SpringBeanManger" %>
 <%
     String userName = AcegiHelper.getLoginUser().getUserFullName();
     request.setAttribute("userName",userName);
 %>
+
 <%@ include file="/common/includeExtJs4_2.jsp"%>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>退库单信息</title>
+<title>高值耗材退库单信息</title>
+<script type="text/javascript">
+//退库单
+var TYPE_OUT = '<%=ExpensiveGoodsGodownEntry.TYPE_OUT%>';
+</script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/GodownEntryTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/DiposableGoodsTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ExpensiveGoodsGodownEntryTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ExpensiveGoodsTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script>
+//高值耗材供应商
+var expensiveGoodsSupplier = '<%=Supplier.SUPPLIER_TYPE_EXPENSIVEGOODSSUPPLIER%>';
+</script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/assestManagement/godownEntry/commonEntry.js"></script>
-<script type="text/javascript" src="godownOutView.js"></script>
+<script type="text/javascript" src="expensiveGoodsGodownOutEntryView.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" /></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
 
 <script type="text/javascript">
-var TYPE_OUT = '<%=GodownEntry.TYPE_OUT%>';
-</script>
-<script type="text/javascript">
 	var curUserName = '${userName}';
-    var SSTS_WarehouseEntry_Create = true;
-    <operation:authorize ifAnyGranted="SSTS_WarehouseEntry_Create">
-    SSTS_WarehouseEntry_Create = false;
+    var SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager">
+    SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager = false;
     </operation:authorize>
-    var SSTS_WarehouseEntry_Update = true;
-    <operation:authorize ifAnyGranted="SSTS_WarehouseEntry_Update">
-    SSTS_WarehouseEntry_Update = false;
+
+    var SSTS_ExpensiveGoodsPurchaseGodownEntry_Create = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Create">
+    SSTS_ExpensiveGoodsPurchaseGodownEntry_Create = false;
     </operation:authorize>
-    var SSTS_WarehouseEntry_Delete = true;
-    <operation:authorize ifAnyGranted="SSTS_WarehouseEntry_Delete">
-    SSTS_WarehouseEntry_Delete = false;
+
+    var SSTS_ExpensiveGoodsPurchaseGodownEntry_Update = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Update">
+    SSTS_ExpensiveGoodsPurchaseGodownEntry_Update = false;
     </operation:authorize>
-    var SSTS_WarehouseEntry_Import = true;
-    <operation:authorize ifAnyGranted="SSTS_WarehouseEntry_Import">
-    SSTS_WarehouseEntry_Import = false;
+
+    var SSTS_ExpensiveGoodsPurchaseGodownEntry_Delete = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPurchaseGodownEntry_Delete">
+    SSTS_ExpensiveGoodsPurchaseGodownEntry_Delete = false;
     </operation:authorize>
+
+    var SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPrepareGodownEntry_Manager">
+    SSTS_ExpensiveGoodsPrepareGodownEntry_Manager = false;
+    </operation:authorize>
+
+    var SSTS_ExpensiveGoodsPrepareGodownEntry_Create = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPrepareGodownEntry_Create">
+    SSTS_ExpensiveGoodsPrepareGodownEntry_Create = false;
+    </operation:authorize>
+
+    var SSTS_ExpensiveGoodsPrepareGodownEntry_Update = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPrepareGodownEntry_Update">
+    SSTS_ExpensiveGoodsPrepareGodownEntry_Update = false;
+    </operation:authorize>
+
+    var SSTS_ExpensiveGoodsPrepareGodownEntry_Delete = true;
+    <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsPrepareGodownEntry_Delete">
+    SSTS_ExpensiveGoodsPrepareGodownEntry_Delete = false;
+    </operation:authorize>
     
-    //是否隐藏一次性物品退库单列表添加功能按钮
-    var hiddenGodownOutAddButton = false;
-    if(sstsConfig.hiddenGodownOutAddButton == true){
-    	hiddenGodownOutAddButton = true;
-    }
+    var saveButton = SSTS_ExpensiveGoodsPrepareGodownEntry_Create && SSTS_ExpensiveGoodsPurchaseGodownEntry_Create;
+    
 </script>
 </head>
 <body>
@@ -73,14 +101,13 @@
     </tr>
 </table>
 <input type="hidden" id="userName" value="${userName}">
+<input type="hidden" id="entryType" value="${entryType}">
 
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_startDate" name="parm_s_startDate" value="">
+    <input type="hidden" id="parm_s_subType" name="parm_s_subType" value="${entryType}">
     <input type="hidden" id="parm_s_endDate" name="parm_s_endDate" value="">
-    <input type="hidden" id="parm_s_code" name="parm_s_code" value="">
-    <input type="hidden" id="parm_s_batchNumber" name="parm_s_batchNumber" value="">
-    <input type="hidden" id="parm_s_disposableGoodsName" name="parm_s_disposableGoodsName" value="">
-    <input type="hidden" id="parm_s_specification" name="parm_s_specification" value="">
+    <input type="hidden" id="parm_s_expensiveGoodsId" name="parm_s_expensiveGoodsId" value="">
 </form>
 
 </body>
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
===================================================================
diff -u -r20772 -r20980
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 20772)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 20980)
@@ -11,6 +11,7 @@
 
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
 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.expensivegoods.ExpensiveGoodsServiceContext;
 import com.forgon.disinfectsystem.inventorymanagement.model.Inventory;
@@ -226,4 +227,5 @@
 	 */
 	public Inventory getHrpExpensiveGoodsByInventorySerialNumber(String InventorySerialNumber);
 	
+	public ExpensiveGoodsInstance getExpensiveGoodsInstanceByBodyCode(String firstBodyCode,String secondBodyCode,String thirdBodyCode);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsStock.java
===================================================================
diff -u -r20779 -r20980
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsStock.java	(.../ExpensiveGoodsStock.java)	(revision 20779)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsStock.java	(.../ExpensiveGoodsStock.java)	(revision 20980)
@@ -30,6 +30,8 @@
 	private String name;
 
 	private Long amount = 0L; // 总数
+	
+	private Long preAmount = 0L;
 
 	private Double referencePrice; // 参考价
 
@@ -91,7 +93,19 @@
 			this.amount = amount;
 		}
 	}
+	
+	public Long getPreAmount() {
+		return preAmount;
+	}
 
+	public void setPreAmount(Long preAmount) {
+		if (preAmount == null) {
+			this.preAmount = 0L;
+		} else {
+			this.preAmount = preAmount;
+		}
+	}
+
 	public Double getReferencePrice() {
 		return referencePrice;
 	}
@@ -174,4 +188,12 @@
 		this.amount = amount;
 	}
 
+	// 调整库存,只是在原有库存上调整，不整个重新计算
+	public void adjustPreAmount(long amountChange) {
+		long preAmount = this.preAmount + amountChange;
+		if (preAmount < 0) {
+			throw new RuntimeException("库存不能小于0!");
+		}
+		this.preAmount = preAmount;
+	}
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
===================================================================
diff -u -r20841 -r20980
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 20841)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 20980)
@@ -29,8 +29,10 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem;
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.barcodeinformation.BarcodeInformation;
 import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsGodownEntryManager;
+import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsManager;
 import com.forgon.tools.MapTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
@@ -49,6 +51,7 @@
 
 	private ExpensiveGoodsGodownEntry godownEntry = new ExpensiveGoodsGodownEntry();
 
+	private ExpensiveGoodsManager expensiveGoodsManager;
 	private ExpensiveGoodsGodownEntryManager expensiveGoodsGodownEntryManager;
 	
 	private DateQueryAdapter dateQueryAdapter;
@@ -61,6 +64,9 @@
 		this.dateQueryAdapter = dateQueryAdapter;
 	}
 
+	public void setExpensiveGoodsManager(ExpensiveGoodsManager expensiveGoodsManager) {
+		this.expensiveGoodsManager = expensiveGoodsManager;
+	}
 
 	public void setExpensiveGoodsGodownEntryManager(ExpensiveGoodsGodownEntryManager expensiveGoodsGodownEntryManager) {
 		this.expensiveGoodsGodownEntryManager = expensiveGoodsGodownEntryManager;
@@ -569,7 +575,7 @@
 
 	public String loadBarcodeDeviceInfo() {
 		String barcode = StrutsParamUtils.getPraramValue("barcode", "");
-		Map<String,Object> returnMsg = new HashMap<String, Object>();
+		JSONObject returnMsg = new JSONObject();
 		returnMsg.put("success", false);
 		returnMsg.put("errMsg", "加载失败");
 		
@@ -582,9 +588,13 @@
 			if (barcodeDevice == null){
 				throw new RuntimeException("查无此物品");
 			}
-			if(barcodeDevice instanceof BarcodeInformation){// 高值耗材处理
+			if(barcodeDevice instanceof BarcodeInformation){
 				returnMsg.put("barcodeType", BarcodeDevice.BARCODE_TYPE_BARCODEINFORMATION);
 				returnMsg.put("barcodeInformation", barcodeDevice);
+			}else if(barcodeDevice instanceof ExpensiveGoodsInstance){// 高值耗材处理
+				JSONObject obj = buildExpensiveGoodsInfo((ExpensiveGoodsInstance)barcodeDevice);
+				returnMsg.put("barcodeType", BarcodeDevice.BARCODE_TYPE_EXPENSIVEGOODS);
+				returnMsg.put("expensiveGoodsInstance", obj);
 			}else{
 				throw new RuntimeException("不支持的条码类型!");
 			}
@@ -603,6 +613,62 @@
 		}
 		return null;
 	}
+	
+	public String loadExpensiveGoodsInstanceByBodyBarcode(){
+
+		String firstBodyCode = StrutsParamUtils.getPraramValue("firstBodyCode", "");
+		String secondBodyCode = StrutsParamUtils.getPraramValue("secondBodyCode", "");
+		String thirdBodyCode = StrutsParamUtils.getPraramValue("thirdBodyCode", "");
+		JSONObject returnMsg = new JSONObject();
+		returnMsg.put("success", false);
+		returnMsg.put("errMsg", "加载失败");
+		
+		try {
+			if (StringUtils.isBlank(firstBodyCode)) {
+				throw new RuntimeException("条码1不能为空!");
+			}
+			if (StringUtils.isBlank(secondBodyCode)) {
+				throw new RuntimeException("条码2不能为空!");
+			}
+			if (StringUtils.isBlank(thirdBodyCode)) {
+				throw new RuntimeException("条码3不能为空!");
+			}
+			ExpensiveGoodsInstance expensiveGoodsInstance = expensiveGoodsManager.getExpensiveGoodsInstanceByBodyCode(firstBodyCode, secondBodyCode, thirdBodyCode);
+			if (expensiveGoodsInstance == null){
+				throw new RuntimeException("查无此物品");
+			}
+			JSONObject obj = buildExpensiveGoodsInfo(expensiveGoodsInstance);
+			returnMsg.put("barcodeType", BarcodeDevice.BARCODE_TYPE_EXPENSIVEGOODS);
+			returnMsg.put("expensiveGoodsInstance", obj);
+			
+			returnMsg.put("success", true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			returnMsg.put("errMsg", e.getMessage());
+		}
+		StrutsResponseUtils.output(returnMsg);
+		return null;
+	
+	}
+	
+	private JSONObject buildExpensiveGoodsInfo(ExpensiveGoodsInstance expensiveGoodsInstance){
+		
+		JSONObject obj = new JSONObject();
+		ExpensiveGoods expensiveGoods = expensiveGoodsInstance.getExpensiveGoods();
+		obj.put("id", expensiveGoodsInstance.getId());
+		obj.put("expensiveGoodsId", expensiveGoods.getId());
+		obj.put("expensiveGoodsStockId", expensiveGoodsInstance.getExpensiveGoodsStockId());
+		obj.put("showName", expensiveGoods.getShowName());
+		obj.put("expensiveGoodsName", expensiveGoods.getShowName());
+		obj.put("status", expensiveGoodsInstance.getStatus());
+		obj.put("barcode", expensiveGoodsInstance.getBarcode());
+		obj.put("firstBodyCode",expensiveGoodsInstance.getFirstBodyCode());
+		obj.put("secondBodyCode", expensiveGoodsInstance.getSecondBodyCode());
+		obj.put("thirdBodyCode", expensiveGoodsInstance.getThirdBodyCode());
+		obj.put("price", expensiveGoodsInstance.getPrice());
+		
+		return obj;
+	}
 	@Override
 	public ExpensiveGoodsGodownEntry getModel() {
 		return godownEntry;
@@ -634,6 +700,6 @@
 		}
 		return null;
 	}
-
+	
 }
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java
===================================================================
diff -u -r20841 -r20980
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java	(.../ExpensiveGoodsGodownEntryItem.java)	(revision 20841)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java	(.../ExpensiveGoodsGodownEntryItem.java)	(revision 20980)
@@ -36,6 +36,10 @@
 	private Long expensiveGoodsId;
 	
 	/**
+	 * 高值耗材库存id,退库时有值
+	 */
+	private Long expensiveGoodsStockId;
+	/**
 	 * 高值耗材实例id(一般扫条码退库的情况才会有值,入库时为空)
 	 */
 	private Long expensiveGoodsInstanceId;
@@ -213,6 +217,14 @@
 		this.expensiveGoodsId = expensiveGoodsId;
 	}
 
+	public Long getExpensiveGoodsStockId() {
+		return expensiveGoodsStockId;
+	}
+
+	public void setExpensiveGoodsStockId(Long expensiveGoodsStockId) {
+		this.expensiveGoodsStockId = expensiveGoodsStockId;
+	}
+
 	public Long getExpensiveGoodsInstanceId() {
 		return expensiveGoodsInstanceId;
 	}