Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
===================================================================
diff -u -r14638 -r15326
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 14638)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js	(.../godownOutToSupplyRoomView.js)	(revision 15326)
@@ -413,7 +413,7 @@
 function initQueryValueAndReload() {
 	var startDate = $Id('startDate').value;
 	var endDate = $Id('endDate').value;
-	var code = Ext.getCmp('code').getValue();
+	var code = $Id('code').value;
 	if(startDate || endDate){
 		if(!compareDate(startDate,endDate)){
 			showResult("开始时间不能大于结束时间");
Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
===================================================================
diff -u -r15035 -r15326
--- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java	(.../ReceiveRecordAction.java)	(revision 15035)
+++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java	(.../ReceiveRecordAction.java)	(revision 15326)
@@ -14,6 +14,8 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
+import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -31,14 +33,12 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord;
 import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordItem;
 import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord;
 import com.forgon.disinfectsystem.receiverecord.service.ReceiveRecordManager;
 import com.forgon.disinfectsystem.receiverecord.vo.ReceiveRecordItemVo;
 import com.forgon.disinfectsystem.receiverecord.vo.ReceiveRecordVo;
-import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.json.JSONUtil;
 import com.opensymphony.xwork2.ModelDriven;
@@ -62,7 +62,13 @@
 	private BarcodeManager barcodeManager;
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
-	
+
+	private MaterialDefinitionManager materialDefinitionManager;
+
+	public void setMaterialDefinitionManager(MaterialDefinitionManager materialDefinitionManager) {
+		this.materialDefinitionManager = materialDefinitionManager;
+	}
+
 	public void setReceiveRecord(ReceiveRecord receiveRecord) {
 		this.receiveRecord = receiveRecord;
 	}
@@ -151,6 +157,22 @@
 
 				String type = obj.optString("type");// type
 				receiveRecordItem.setType(type);
+
+				//设置diposableGoodBatchStock_id
+				if (DisposableGoods.TYPE_NAME.equals(type) && disposableGoodsBatchStockId != null){
+					DisposableGoodsBatchStock dgbs = diposableGoodBatchStockManager.getDiposableGoodBatchStockById(disposableGoodsBatchStockId.toString());
+					if (dgbs != null){
+						receiveRecordItem.setDiposableGoodBatchStock(dgbs);
+					}
+				}
+				//设置materialDefinition_id
+				if (MaterialDefinition.TYPE_NAME.equals(type) && objID != null){
+					MaterialDefinition materialDefinition = materialDefinitionManager.getMaterialDefinitionById(objID.toString());
+					if (materialDefinition != null){
+						receiveRecordItem.setMaterialDefinition(materialDefinition);
+					}
+				}
+
 				receiveRecordItem.setReceiveRecord(entry);
 
 				receiveRecordItems.add(receiveRecordItem);