Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
===================================================================
diff -u -r21026 -r21027
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 21026)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 21027)
@@ -1039,9 +1039,11 @@
 					expensiveGoodsId : resultEntryItem[i].expensiveGoodsId,
 					//name : resultEntryItem[i].expensiveGoods.name + (b == false?"":" ["+specification+"]"),
 					expensiveGoodsName : resultEntryItem[i].expensiveGoods.name + (b == false?"":" ["+specification+"]"),
-					cost : cost,
+					barcode : resultEntryItem[i].barcode,
+					price : cost,
 					certification : resultEntryItem[i].certification,
-					expDate : new Date(resultEntryItem[i].expDate.time),
+//					expDate : new Date(resultEntryItem[i].expDate.time),
+					expDateStr: resultEntryItem[i].expDateStr,
 					supplierId : resultEntryItem[i].supplierId,
 					supplierName : resultEntryItem[i].supplierName,
 					firstBodyCode : resultEntryItem[i].firstBodyCode,
@@ -1379,7 +1381,7 @@
 										+"<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><td width='200px' align='center'>" + itemsList[i].expDateStr;
 				            			+"</td>"+"</tr>";
 							}
 			            }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
===================================================================
diff -u -r21024 -r21027
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 21024)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 21027)
@@ -40,6 +40,7 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.json.JsonPropertyFilter;
+import com.forgon.tools.util.ForgonDateUtils;
 import com.opensymphony.xwork2.ModelDriven;
 
 @ParentPackage(value = "default")
@@ -296,6 +297,7 @@
 				expensiveGoodsGodownEntryItemJson.put("name", expensiveGoods.getName());
 				expensiveGoodsGodownEntryItemJson.put("specification", expensiveGoods.getSpecification());
 				expensiveGoodsGodownEntryItemJson.put("expDate", expensiveGoodsGodownEntryItem.getExpDate());
+				expensiveGoodsGodownEntryItemJson.put("expDateStr", ForgonDateUtils.safelyFormatDate(expensiveGoodsGodownEntryItem.getExpDate(), Constants.SIMPLEDATEFORMAT_YYYYMMDD, ""));
 				expensiveGoodsGodownEntryItemJson.put("cost", expensiveGoodsGodownEntryItem.getCost());
 				data.add(expensiveGoodsGodownEntryItemJson);
 			}
@@ -404,10 +406,13 @@
 				itemData.put("expensiveGoods", expensiveGoodsData);
 				
 				itemData.put("cost", expensiveGoodsGodownEntryItem.getCost());
+				itemData.put("price", expensiveGoodsGodownEntryItem.getCost());
 				itemData.put("id", expensiveGoodsGodownEntryItem.getId());
 				itemData.put("expensiveGoodsId", expensiveGoodsGodownEntryItem.getExpensiveGoodsId());
 				itemData.put("expensiveGoodsName", expensiveGoods.getShowName());
+				itemData.put("barcode", expensiveGoodsGodownEntryItem.getBarcode());
 				itemData.put("expDate", expensiveGoodsGodownEntryItem.getExpDate());
+				itemData.put("expDateStr", ForgonDateUtils.safelyFormatDate(expensiveGoodsGodownEntryItem.getExpDate(), Constants.SIMPLEDATEFORMAT_YYYYMMDD, ""));
 				itemData.put("supplierName", expensiveGoodsGodownEntryItem.getSupplierName());
 				itemData.put("grade", expensiveGoodsGodownEntryItem.getGrade());