Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
===================================================================
diff -u -r39756 -r40899
--- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java	(.../ReceiveRecordAction.java)	(revision 39756)
+++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java	(.../ReceiveRecordAction.java)	(revision 40899)
@@ -4,7 +4,6 @@
 package com.forgon.disinfectsystem.receiverecord.action;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -14,35 +13,23 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.Constants;
-import com.forgon.directory.acegi.tools.AcegiHelper;
-import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
-import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
-import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
-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.materialdefinition.MaterialDefinition;
 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.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
-import com.forgon.exception.SystemException;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
@@ -67,22 +54,6 @@
 	
 	private DiposableGoodBatchStockManager diposableGoodBatchStockManager;
 	
-	private BarcodeManager barcodeManager;
-	
-	private SupplyRoomConfigManager supplyRoomConfigManager;
-
-	private MaterialDefinitionManager materialDefinitionManager;
-	
-	private DiposableGoodsManager diposableGoodsManager;
-
-	public void setDiposableGoodsManager(DiposableGoodsManager diposableGoodsManager) {
-		this.diposableGoodsManager = diposableGoodsManager;
-	}
-
-	public void setMaterialDefinitionManager(MaterialDefinitionManager materialDefinitionManager) {
-		this.materialDefinitionManager = materialDefinitionManager;
-	}
-
 	public void setReceiveRecord(ReceiveRecord receiveRecord) {
 		this.receiveRecord = receiveRecord;
 	}
@@ -96,15 +67,6 @@
 		this.diposableGoodBatchStockManager = diposableGoodBatchStockManager;
 	}
 
-	public void setBarcodeManager(BarcodeManager barcodeManager) {
-		this.barcodeManager = barcodeManager;
-	}
-
-	public void setSupplyRoomConfigManager(
-			SupplyRoomConfigManager supplyRoomConfigManager) {
-		this.supplyRoomConfigManager = supplyRoomConfigManager;
-	}
-
 	// 设置ReceiveRecord参数
 	private void setReceiveRecordPropertiesFromParams(ReceiveRecord entry,
 			String formParams, String items) {
@@ -203,14 +165,14 @@
 		String barcode = StrutsParamUtils.getPraramValue("barcode", "");
 		String warehouseId = StrutsParamUtils.getPraramValue("warehouseId", "");
 		boolean selectAll = StrutsParamUtils.getBoolPraramValue("selectAll", true);
-		Map<String,Object> returnMsg = null;
+		Map<String,Object> returnMsg = new HashMap<String, Object>();
 		
-		
 		// 需要从发货单和退货记录生成该批次可以退货的价格列表
 		try {
 			returnMsg = receiveRecordManager.loadBarcodeDeviceInfo(barcode, warehouseId, selectAll);
 		} catch (Exception e) {
 			e.printStackTrace();
+			returnMsg.put("success", false);
 			returnMsg.put("errMsg", e.getMessage());
 		}finally{
 			StrutsResponseUtils.output(JSONUtil.toJSONString(returnMsg,true));
Index: ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
===================================================================
diff -u -r39756 -r40899
--- ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java	(.../ReceiveRecordManagerImpl.java)	(revision 39756)
+++ ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java	(.../ReceiveRecordManagerImpl.java)	(revision 40899)
@@ -115,6 +115,10 @@
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	public void setSupplyRoomConfigManager(SupplyRoomConfigManager supplyRoomConfigManager) {
+		this.supplyRoomConfigManager = supplyRoomConfigManager;
+	}
+
 	private Logger logger = Logger.getLogger(ReceiveRecordManagerImpl.class);
 	
 	public void setGoodsStockManager(GoodsStockManager goodsStockManager) {