Index: ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakemanager/service/StockTakeInfoManagerImpl.java
===================================================================
diff -u -r12804 -r12901
--- ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakemanager/service/StockTakeInfoManagerImpl.java	(.../StockTakeInfoManagerImpl.java)	(revision 12804)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakemanager/service/StockTakeInfoManagerImpl.java	(.../StockTakeInfoManagerImpl.java)	(revision 12901)
@@ -387,6 +387,7 @@
 					entryItem.setDisposableGoodsStockID(jsonObject.optLong("diposableGoodsStockID"));
 					entryItem.setDisposableGoodsBatchStockID(jsonObject.optLong("diposableGoodsBatchStockID"));
 					entryItem.setBatchNumber(jsonObject.optString("batchNumber"));
+					entryItem.setGodownEntry(entry);
 					entry.getItemsList().add(entryItem);
 				}
 				try {
@@ -420,6 +421,7 @@
 					entryItem.setDisposableGoodsStockID(jsonObject.optLong("diposableGoodsStockID"));
 					entryItem.setDisposableGoodsBatchStockID(jsonObject.optLong("diposableGoodsBatchStockID"));
 					entryItem.setBatchNumber(jsonObject.optString("batchNumber"));
+					entryItem.setGodownEntry(entry);
 					entry.getItemsList().add(entryItem);
 				}
 				try {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
===================================================================
diff -u -r12775 -r12901
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java	(.../DisposableGoodsBatchStock.java)	(revision 12775)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java	(.../DisposableGoodsBatchStock.java)	(revision 12901)
@@ -125,6 +125,9 @@
 
 	@Transient // 用于页面显示
 	public String getExpDateStr() {
+		if(expDate == null){
+			return "";
+		}
 		return Constants.FASTDATEFORMAT_YYYYMMDD.format(expDate);
 	}