Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.js
===================================================================
diff -u -r20185 -r22402
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.js	(.../batchStockCompare.js)	(revision 20185)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.js	(.../batchStockCompare.js)	(revision 22402)
@@ -26,6 +26,35 @@
 	}
 });*/
 
+//判断是否为ie6或ie7
+var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
+//遮罩层对象
+var objMask = {
+	'processMask' : null
+};
+var mask;
+//开启进度条
+function beginMask(){
+	if (!isIE6OrIE7){
+		createMask.call(objMask,'processMask','请求正在处理中，请稍候...',Ext.getBody(),true);
+		objMask.processMask.show();
+	}
+	else{
+		mask = new Ext.LoadMask(Ext.getBody(), { msg: '请求正在处理中，请稍候...'});
+		mask.show();
+	}
+}
+
+//结束进度条
+function hiddenMask(){
+	if (!isIE6OrIE7){
+		objMask.processMask.hide();
+	}
+	else {
+		mask.hide();
+	}
+}
+
 // 全部一次性物品
 var allDiposableGoodsStore = new Ext.data.Store({
     pageSize: 100,
@@ -44,6 +73,7 @@
 	])
 });
 
+//打开物资库存excel导入文档
 function openFileImportWindow(){
 	var dialog = new top.Ext.ux.UploadDialog.Dialog({
         title: "导入数据(只能上传一个文件)",
@@ -78,6 +108,17 @@
   }); //定义上传完成回调函数 
 }
 
+//同步物资库存数据
+function syncInventoryStockData(){
+	beginMask();
+	DWREngine.setAsync(false);
+	InventoryTableManager.syncInventoryStockData(function (result){
+		hiddenMask();
+		grid.dwrReload();
+	});
+	DWREngine.setAsync(true);
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	var columns = [
@@ -168,10 +209,10 @@
 				}]
 			}]
 		},{
-			width :300,
+			width :400,
 			layout : 'column',
 			items : [{
-				columnWidth : .32,
+				columnWidth : .25,
 				layout :'form',
 				items : [{
 					xtype : 'button',
@@ -183,7 +224,7 @@
 					}
 				}]
 			},{
-				columnWidth : .32,
+				columnWidth : .25,
 				layout :'form',
 				items : [{
 					xtype : 'button',
@@ -196,7 +237,7 @@
 					}
 				}]
 			},{
-				columnWidth : .36,
+				columnWidth : .25,
 				layout :'form',
 				items : [{
 					xtype : 'button',
@@ -208,6 +249,19 @@
 						openFileImportWindow();
 					}
 				}]
+			},{
+				columnWidth : .25,
+				layout :'form',
+				items : [{
+					xtype : 'button',
+					text : '同步物资库存',
+					minWidth : 100,
+					iconCls : 'icon_set',
+					handler : function() {
+						//同步物资库存数据
+						syncInventoryStockData();
+					}
+				}]
 			}]
 		}]
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp
===================================================================
diff -u -r20183 -r22402
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp	(.../batchStockCompare.jsp)	(revision 20183)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp	(.../batchStockCompare.jsp)	(revision 22402)
@@ -19,6 +19,7 @@
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js" /></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/DiposableGoodsTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/InventoryTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <script type="text/javascript" src="batchStockCompare.js"></script>