Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
===================================================================
diff -u -r20994 -r21024
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 20994)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 21024)
@@ -210,12 +210,11 @@
 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){
+		if(expensiveGoodsGodownEntryItemData.expensiveGoodsInstanceId == expensiveGoodsInstance.id){
 			showResult("该物品已经存在,不能重复添加!");
 			return false;
 		}
 	}
-
 	//添加操作
 	var expensiveGoodsGodownEntryItem = new ExpensiveGoodsGodownEntryItemRecord({
 		localID:g_localID++,
@@ -227,7 +226,7 @@
 		status : expensiveGoodsInstance.status,
 		barcode : expensiveGoodsInstance.barcode,
 //		certification:certification,
-//		expDate : expDate,
+		expDate : expensiveGoodsInstance.expDate,
 		price : Ext.num(parseFloat(expensiveGoodsInstance.price),0),
 		firstBodyCode:expensiveGoodsInstance.firstBodyCode,
 		secondBodyCode:expensiveGoodsInstance.secondBodyCode,
@@ -316,7 +315,7 @@
 function setTotalMoney(grid) {
 	var totalMoney = 0.0;
 	grid.getStore().each(function(record){
-		var cost = Ext.num(parseFloat(record.data.cost),0.0);
+		var cost = Ext.num(parseFloat(record.data.price),0.0);
 		totalMoney += cost;
 	});	
 	top.Ext.getCmp("totalPrice").setValue(Ext.util.Format.usMoney(totalMoney));
@@ -542,15 +541,8 @@
 	        	{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 : "失效日期",width : 80,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d')},
+	        	{header : "单价",dataIndex : 'price',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},
@@ -794,7 +786,6 @@
 					showResult('请正确填写表单各值');
 					return false;
 				}
-				var name = top.Ext.getCmp('name1').getValue();
 				var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
 				var len = store.getCount();
 				var items = [];
@@ -874,7 +865,7 @@
 		}
 	});
 	expensiveGoodsGodownEntryWin.show();
-	top.Ext.getCmp('name1').focus(false, 100); 
+	top.Ext.getCmp('scanBarcode').focus(false, 100); 
 }
 
 //添加退库明细
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
===================================================================
diff -u -r20993 -r21024
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 20993)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 21024)
@@ -679,6 +679,8 @@
 		obj.put("expensiveGoodsStockId", expensiveGoodsInstance.getExpensiveGoodsStockId());
 		obj.put("showName", expensiveGoods.getShowName());
 		obj.put("expensiveGoodsName", expensiveGoods.getShowName());
+		obj.put("expDateStr", expensiveGoodsInstance.getExpDateStr());
+		obj.put("expDate", expensiveGoodsInstance.getExpDate());
 		obj.put("status", expensiveGoodsInstance.getStatus());
 		obj.put("barcode", expensiveGoodsInstance.getBarcode());
 		obj.put("firstBodyCode",expensiveGoodsInstance.getFirstBodyCode());
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r20993 -r21024
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 20993)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 21024)
@@ -150,7 +150,7 @@
 		this.save(expensiveGoodsGodownEntry);
 		Map<Long, ExpensiveGoods> idToExpensiveGoodsMap = context.getIdToExpensiveGoodsMap();
 		Map<Long, ExpensiveGoodsInstance> idToExpensiveGoodsInstanceMap = context.getIdToExpensiveGoodsInstanceMap();
-		Map<Long, ExpensiveGoodsStock> idToExpensiveGoodsStockMap = context.getExpensiveGoodsIdToExpensiveGoodsStockMap();
+		Map<Long, ExpensiveGoodsStock> idToExpensiveGoodsStockMap = context.getIdToExpensiveGoodsStockMap();
 		List<ExpensiveGoodsGodownEntryItem> itemList = expensiveGoodsGodownEntry.getItemsList();
 		for (int i = 0; i < itemList.size(); ++i) {
 			ExpensiveGoodsGodownEntryItem godownEntryItem = itemList.get(i);