Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
===================================================================
diff -u -r37423 -r37429
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 37423)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 37429)
@@ -204,6 +204,38 @@
 	grid.dwrReload();
 }
 
+//重置
+function resetStorageLocation() {
+	Ext.getCmp("goodsName").setValue("");
+	Ext.getCmp("barcode").setValue("");
+	Ext.getCmp("warseHouseName").setValue("");
+	$Id("parm_s_barcode").value = "";
+	$Id("parm_s_goodsName").value = "";
+	$Id("parm_s_warseHouseNames").value = "";
+	if (sstsConfig.enableInstrumentSetTypeSetting) {
+		Ext.getCmp('instrumentSetTypeIds').setValue("");
+		Ext.getCmp('tousseSetTypeName').setValue("");
+	}
+	if (sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer) {
+		$Id("parm_s_id").value = '';
+		$Id("parm_s_orgUnitRoomName").value = '';
+		$Id("parm_s_orgUnitNameTree").value = '';
+		$Id("parm_s_orgUnitCoding").value = '';
+		$Id("parm_s_nodeType").value = '';
+		$Id("parm_s_warse").value = '';
+		$Id("parm_s_warseCode").value = '';
+		$Id("parm_s_parentStorageLocation").value = '';
+		$Id("parm_s_parentStorageLocationId").value = '';
+		Ext.getCmp('addr').setValue(kardexContainerAddr);
+		Ext.getCmp('warsehouse').setValue("");
+		Ext.getCmp('superiorWarsehouse').setValue("");
+		Ext.getCmp('drawerName').setValue("");
+		Ext.getCmp('drawerCode').setValue("");
+		Ext.getCmp('goodIdsList').setValue("");
+		Ext.getCmp('goodNamesList').setValue("");
+	}
+}
+
 //BJDXZLYY-44：取出托盘
 function sendKardexContainerTCPCommand() {
 	var storageLocationAddr = Ext.getCmp("addr").getValue() || '';
@@ -932,6 +964,8 @@
 									Ext.getCmp('btn3').hide();
 									Ext.getCmp('btn4').hide();
 									Ext.getCmp('btn5').hide();
+									resetStorageLocation();
+									grid.dwrReload();
 								} else if (group == "存入") {
 									Ext.getCmp('queryType1').hide();
 									Ext.getCmp('queryType2').show();
@@ -969,34 +1003,7 @@
 			minWidth: 70,
 			id: 'btn2',
 			handler: function () {  //查询条件全部重置
-				Ext.getCmp("goodsName").setValue("");
-				Ext.getCmp("barcode").setValue("");
-				Ext.getCmp("warseHouseName").setValue("");
-				$Id("parm_s_barcode").value = "";
-				$Id("parm_s_goodsName").value = "";
-				$Id("parm_s_warseHouseNames").value = "";
-				if (sstsConfig.enableInstrumentSetTypeSetting) {
-					Ext.getCmp('instrumentSetTypeIds').setValue("");
-					Ext.getCmp('tousseSetTypeName').setValue("");
-				}
-				if (sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer) {
-					$Id("parm_s_id").value = '';
-					$Id("parm_s_orgUnitRoomName").value = '';
-					$Id("parm_s_orgUnitNameTree").value = '';
-					$Id("parm_s_orgUnitCoding").value = '';
-					$Id("parm_s_nodeType").value = '';
-					$Id("parm_s_warse").value = '';
-					$Id("parm_s_warseCode").value = '';
-					$Id("parm_s_parentStorageLocation").value = '';
-					$Id("parm_s_parentStorageLocationId").value = '';
-					Ext.getCmp('addr').setValue(kardexContainerAddr);
-					Ext.getCmp('warsehouse').setValue("");
-					Ext.getCmp('superiorWarsehouse').setValue("");
-					Ext.getCmp('drawerName').setValue("");
-					Ext.getCmp('drawerCode').setValue("");
-					Ext.getCmp('goodIdsList').setValue("");
-					Ext.getCmp('goodNamesList').setValue("");
-				}
+				resetStorageLocation();
 			}
 		}, {
 			xtype: 'button',