Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r40351 -r41547
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 40351)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 41547)
@@ -320,6 +320,8 @@
 	  disableDeviceInterface:false,
 	  //在系统的日志表中记录详细的设备接口连接和文件读取的信息，便于异常时进行排错。
 	  enableDetailedDeviceInformation:true,
+    //启用chas系统标记推送功能
+    enableChasSystemTagPush:true,
 	  //启用发货管理的一次性物品树状结构模式
 	  enableTheDisposableGoodsTreeModeForiInvoiceView:true
 
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r38510 -r41547
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 38510)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 41547)
@@ -103,7 +103,7 @@
 	if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){
 		consumptiveMaterialUseData.push(['灭菌耗材']);
 	}
-
+	
 	//耗材用途
 	var consumptiveMaterialUseStore = new Ext.data.SimpleStore( {
 		fields : [ 'value'],
@@ -960,6 +960,31 @@
 						triggerAction : 'all',
 						anchor : '95%'
 					}]
+				},{
+					columnWidth : 1,
+					layout : 'form',
+					labelWidth : 110,
+					hidden : !sstsConfig.enableChasSystemTagPush,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : 'CHAS管控标识',
+						id : 'controlTagCHAS',
+						name : 'controlTagCHAS',
+						width : 130,
+						valueField : 'value',
+						displayField : 'value',
+						store : new Ext.data.SimpleStore({
+							fields : ['value'],
+							data : [['是'],['否']]
+						}),
+						forceSelection : true,
+						allowBlank: false,
+						mode : 'local',
+						editable : false,
+						value:'否',
+						triggerAction : 'all',
+						anchor : '95%'
+					}]
 				}, {
 					columnWidth : 0.9,
 					layout : 'form',
@@ -1730,6 +1755,7 @@
   //********* 2、ForgonGrid ***********
 	var columns = [
    		{header : externalCodeName,width : 130,dataIndex : 'externalCode',hidden:externalCodeHidden},
+		{header : "CHAS标识",width : 80,dataIndex : 'controlTagCHAS',hidden: !sstsConfig.enableChasSystemTagPush},
    		{header : "物资编码",width : 130,dataIndex : 'inventorySerialNumber',hidden: !sstsConfig.disposableGoodsInventorySerialNumber},
 		{header : "名称",width : 150,dataIndex : 'name', renderer : rendeColor},
 		{header : "规格",width : 100,dataIndex : 'specification'},
@@ -1759,6 +1785,7 @@
 	    {name : 'id'}, 
 	    {name : 'name'},
 	    {name : 'externalCode'},
+		{name : 'controlTagCHAS'},
 	    {name : 'inventorySerialNumber'},
 	    {name : 'specification'},
 	    {name : 'barcode'},
@@ -1951,48 +1978,36 @@
 				}
 			})
 		}
-	}/*
-	, '-' , {
-		//用于程序员调试
-		text : '更新旧数据',
-		hidden : false,
-		handler : function() {
-			DiposableGoodsTableManager.updateOldData(function(msg){showResult(msg);});
-		}
 	}, '-' , {
-		//将属于供应室领用的一次性物品进行分类
-		text : '分类供应室领用类型',
-		hadden : false,
-		handler : function() {
-			DiposableGoodsTableManager.updateSupplyRoomDiposableGoodsType(function(msg){showResult('更新成功，请刷新页面')});
+		text : '同步CHAS标识',
+		hidden : !sstsConfig.enableChasSystemTagPush,
+		iconCls : 'btn_ext_refresh',
+		handler : function(){
+			Ext.MessageBox.confirm("请确认","是否确定要同步CHAS标识？",function(button, text){
+				if("yes" == button){
+					var mask = new Ext.LoadMask(Ext.getBody(), {
+						msg : "同步CHAS标识中..."
+					});
+					mask.show();
+					Ext.Ajax.request({
+						url : WWWROOT + '/disinfectSystem/diposableGoodsAction!syncDisposableGoodsControlTagCHAS.do',
+						success : function(response, options){
+							var result = Ext.util.JSON.decode(response.responseText);
+							showResult(result.message);
+							mask.hide();
+							if(result.success){
+								grid.dwrReload();
+							}
+						},
+						failure : function(response, options){
+							showResult("同步失败，请联系管事员！");
+							mask.hide();
+						}
+					});
+				}
+			});
 		}
 	}
-	, '-' , {
-		text : '导出一次性物品库存',
-		handler : function() {
-			window.location.href = WWWROOT+"/disinfectsystem/reportforms/diposableGoodsStorageReportExportForm.jsp";
-		}
-	}, '-' , {
-		text : '导出物资收发存汇总',
-		handler : function() {
-			window.location.href = WWWROOT+"/disinfectsystem/reportforms/diposableGoodsPriceStatisticsReportExportForm.jsp";
-		}
-	}, '-' , {
-		//用于程序员调试
-		text : '更新旧数据',
-		hidden : false,
-		handler : function() {
-			DiposableGoodsTableManager.updateOldData(function(msg){showResult(msg);});
-		}
-	}, '-', {
-		text : '导入一次性物品库存EXCEL',
-		hidden : false,
-		handler : function() {
-			location.href = WWWROOT
-					+ "/disinfectsystem/basedatamanager/importbasedata/amendDiposableGoodsStorage.mhtml";
-		}
-	}
-	*/
 	];
 
 	var defaultSortField = 'sequence';