Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r28014 -r28815
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 28014)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 28815)
@@ -257,7 +257,9 @@
 					json.put("tousseName", returnGoodsItem.getTousseName());
 					json.put("unit", unit);
 					json.put("amount", returnGoodsItem.getAmount());
-					json.put("barcode", barcode);
+					//json.put("barcode", barcode);
+					//退货记录查看时,如果是退的高值耗材,则显示为高值耗材条码(之前为显示的一次性物品批次条码)
+					json.put("barcode", returnGoodsItem.getBarcode());
 					json.put("isDelivery", returnGoodsItem.getIsDelivery());
 					json.put("batchNumber", batchNumber);
 					json.put("price", returnGoodsItem.getPrice());
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r28687 -r28815
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 28687)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 28815)
@@ -552,6 +552,10 @@
 		objectDao.saveOrUpdate(targetDgStock);
 		expensiveDisposablegoods.setDisposableGoodsBatchStock(targetBatchStock);
 		expensiveDisposablegoods.setDisposableGoodsStockID(targetDgStock.getId());
+
+		//修改高值耗材的仓库
+		expensiveDisposablegoods.setWarehouseID(targetWarehouseID);
+		expensiveDisposablegoods.setWarehouseName(targetBatchStock.getWarehouseName());
 		
 		//库存调整记录(高值耗材库存变动记录)
 		List<DisposableGoodsStorageAdjustVo> result = new ArrayList<DisposableGoodsStorageAdjustVo>();