Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r12780 -r12834
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 12780)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 12834)
@@ -1268,6 +1268,10 @@
 	top.Ext.getCmp("remark").setValue(returnGoodsRecord.remark);
 	top.Ext.getCmp("returnOfPeople").setValue(returnGoodsRecord.returnOfPeople);
 	top.Ext.getCmp("departCoding").setValue(returnGoodsRecord.departCoding);
+	var warehouse = top.Ext.getCmp("warehouse");
+	if(warehouse != null){
+		warehouse.setValue(returnGoodsRecord.warehouseName);
+	}
 }
 
 //TODO 器械包退货