Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js
===================================================================
diff -u -r12680 -r12741
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js	(.../wareHouseForm.js)	(revision 12680)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseForm.js	(.../wareHouseForm.js)	(revision 12741)
@@ -20,7 +20,8 @@
 		items : [{
 			xtype : 'hidden',
 			name : 'id',
-			id : 'id'
+			id : 'id',
+			value : id
 		},{
 			xtype : 'hidden',
 			name : 'orgUnitId',
@@ -174,24 +175,45 @@
 		thiz.enable();
 		return false;
 	}
-	top.Ext.MessageBox.confirm("请确认","是否确定要保存仓库？",
-		function(button, text) {
-			if ("yes" == button){
-				formObj.form.submit( {
-					url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!saveWareHouse.do',
-					method : 'POST',
-					waitMsg : '正在保存数据，请稍候',
-					waitTitle : '提交表单',
-					success : function(form, action) {
-						wareHouseWin.close();
-						showResult('保存成功');
-						grid.dwrReload();
-					},
-					failure : function(form, action) {
-						showResult('failure = ' + action.result.message,'error');
-						top.Ext.getCmp('saveBtn').enable();
+	//验证仓库名是否已经存在
+	Ext.Ajax.request( {
+		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!validateWareHouseNameExists.do',
+		params : {id : top.Ext.getCmp('id').getValue() , name : top.Ext.getCmp('name').getValue()},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			var success = result.success;
+			if (true != success) {
+				showResult(result.message);
+			} else {
+				top.Ext.MessageBox.confirm("请确认","是否确定要保存仓库？",
+						function(button, text) {
+					if ("yes" == button){
+						formObj.form.submit( {
+							url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!saveWareHouse.do',
+							method : 'POST',
+							waitMsg : '正在保存数据，请稍候',
+							waitTitle : '提交表单',
+							success : function(form, action) {
+								if(action.result.success == true){
+									wareHouseWin.close();
+									showResult('保存成功');
+									grid.dwrReload();
+								}else{
+									showResult(action.result.message,'error');
+								}
+							},
+							failure : function(form, action) {
+								showResult(action.result.message,'error');
+								top.Ext.getCmp('saveBtn').enable();
+							}
+						});
 					}
 				});
 			}
+		},
+		failure : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			showResult(result.message);
+		}
 	});
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js
===================================================================
diff -u -r12677 -r12741
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js	(.../wareHouseView.js)	(revision 12677)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/warehouse/wareHouseView.js	(.../wareHouseView.js)	(revision 12741)
@@ -78,16 +78,19 @@
 		var columns = [
 		    {header : "仓库id",dataIndex : 'id', hidden:true},
 		    {header : "仓库名称",width : 120,dataIndex : 'name',renderer:modifyRecord}, 
-		    {header : "所属供应室编码",width : 120,dataIndex : 'orgUnitName'},
+		    {header : "所属供应室编码",width : 120,dataIndex : 'orgUnitCode'},
 		    {header : "所属供应室名称",width : 120,dataIndex : 'orgUnitName'},
+		    {header : "仓库条码",width : 120,dataIndex : 'barcode'},
 		    {header : "顺序",width : 50,dataIndex : 'sequence'}, 
 		    {header : "备注",width : 100,dataIndex : 'remark',id:'remark'}
 		];
 
 		var readerDetail = [
 		    {name : 'id'}, 
 		    {name : 'name'}, 
-		    {name : 'orgUnitName'}, 
+		    {name : 'orgUnitCode'},
+		    {name : 'orgUnitName'},
+		    {name : 'barcode'},
 		    {name : 'sequence'},
 		    {name : 'remark'}
 		];