Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java
===================================================================
diff -u -r20841 -r20978
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java	(.../ExpensiveGoodsGodownEntryTableManager.java)	(revision 20841)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java	(.../ExpensiveGoodsGodownEntryTableManager.java)	(revision 20978)
@@ -98,7 +98,7 @@
 			sqlCondition += " and time <= "+ dateQueryAdapter.dateAdapter(sqlWhereParamMap.get("endDate"));
 		}
 		if(sqlWhereParamMap.containsKey("expensiveGoodsId") && DatabaseUtil.isPoIdValid(sqlWhereParamMap.get("expensiveGoodsId"))){
-			sqlCondition += " and id in (select expensiveGoodsEntry.id from "+ ExpensiveGoodsGodownEntryItem.class.getSimpleName() +" where expensiveGoodsId = "+ sqlWhereParamMap.get("expensiveGoodsId") + ")";
+			sqlCondition += " and id in (select ei.expensiveGoodsGodownEntry.id from "+ ExpensiveGoodsGodownEntryItem.class.getSimpleName() +"  ei where ei.expensiveGoodsId = "+ sqlWhereParamMap.get("expensiveGoodsId") + ")";
 		}
 		return sqlCondition;
 	}
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r20841 -r20978
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 20841)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 20978)
@@ -417,6 +417,7 @@
 		expensiveGoodsInstance.setSecondBodyCode(expensiveGoodsGodownEntryItem.getSecondBodyCode());
 		expensiveGoodsInstance.setThirdBodyCode(expensiveGoodsGodownEntryItem.getThirdBodyCode());
 		expensiveGoodsInstance.setEntryType(expensiveGoodsGodownEntryItem.getExpensiveGoodsGodownEntry().getSubType());
+		expensiveGoodsInstance.setExpDate(expensiveGoodsGodownEntryItem.getExpDate());
 		if(StringUtils.isBlank(expensiveGoodsInstance.getBarcode())){
 			String barcode = serialNumManager
 					.getSerialNumberStr(SerialNum.TYPE_BARCODE);