Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
===================================================================
diff -u -r22125 -r22158
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java	(.../ExpensiveGoodsGodownEntryManager.java)	(revision 22125)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java	(.../ExpensiveGoodsGodownEntryManager.java)	(revision 22158)
@@ -75,7 +75,7 @@
 	/**
 	 * 一键退库
 	 */
-	public void godownOutEntryAllPreInInstance();
+	public void godownOutEntryAllPreInInstance(String ids);
 	
 	/**
 	 *改变高值耗材入库单,对应实例的验收状态
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
===================================================================
diff -u -r22134 -r22158
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 22134)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java	(.../ExpensiveGoodsGodownEntryAction.java)	(revision 22158)
@@ -487,7 +487,8 @@
 	public void godownOutEntryAllPreInInstance() {
 		String message = "退库成功!";
 		try {
-			expensiveGoodsGodownEntryManager.godownOutEntryAllPreInInstance();
+			String ids = StrutsParamUtils.getPraramValue("ids", "");
+			expensiveGoodsGodownEntryManager.godownOutEntryAllPreInInstance(ids);
 		} catch (Exception e) {
 			e.printStackTrace();
 			message = e.getMessage();
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp
===================================================================
diff -u -r21949 -r22158
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp	(.../expensiveGoodsGodownEntryView.jsp)	(revision 21949)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp	(.../expensiveGoodsGodownEntryView.jsp)	(revision 22158)
@@ -94,6 +94,11 @@
     SSTS_ExpensiveGoodsGodownEntry_PrepareCheck = false;
     </operation:authorize>
     
+    var SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu = true;
+	<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsGodownOutEntry_Create">
+	SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu = false;
+	</operation:authorize>
+	
     var saveButton = SSTS_ExpensiveGoodsPrepareGodownEntry_Create && SSTS_ExpensiveGoodsPurchaseGodownEntry_Create;
     
   	//验收状态数组
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r22136 -r22158
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22136)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22158)
@@ -1553,8 +1553,11 @@
 	 * 一键退库
 	 */
 	@Override
-	public void godownOutEntryAllPreInInstance(){
-		String sql = String.format(" where po.entryType='%s' and po.status!='%s' and po.useRecord.id is null  ", ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE,ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
+	public void godownOutEntryAllPreInInstance(String ids){
+		if(StringUtils.isBlank(ids)){
+			throw new RuntimeException("入库单id不能为空!");
+		}
+		String sql = String.format(" where po.godownEntryId in(%s) and po.entryType='%s' and po.status!='%s' and po.useRecord.id is null  ",ids, ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE,ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
 //		String sql = String.format(" where po.status='%s' ", ExpensiveGoodsInstance.STATUS_PRE_IN_WAREHOUSE);
 		
 		String expensiveGoodsSql = String.format(" where po.id in(select egi.expensiveGoods.id from %s egi where egi.entryType='%s' and egi.status!='%s' and egi.useRecord.id is null)  ",ExpensiveGoodsInstance.class.getSimpleName(), ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE,ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
===================================================================
diff -u -r22149 -r22158
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 22149)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js	(.../expensiveGoodsGodownOutEntryView.js)	(revision 22158)
@@ -866,29 +866,7 @@
 	id = records[0].data['id'];
 	editRecord(id);
 };
-function godownOutEntryAllPreInInstance(grid){
-	top.Ext.MessageBox.confirm("请确认","是否确定要退库所有预入库的高值耗材？",
-			function(button, text) {
-				if ("yes" == button){
-					Ext.Ajax.request({
-						url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!godownOutEntryAllPreInInstance.do',
-//						params : {ids : ids},
-						success : function(response, options) {
-							var result = Ext.decode(response.responseText);
-							var success = result.success;
-							if (success) {
-								grid.dwrReload();
-								showResult(result.message);
-							}
-						},
-						failure : function(response, options) {
-							showResult(response.responseText);
-						}
-					});
-				}
-			}
-		);
-}
+
 /*
  * "根据id查看退库单信息表"
  */
@@ -1018,17 +996,6 @@
 		}
 	});
 	tbar.push('-');
-	// 一键退库
-	tbar.push({
-		text : '一键退库',
-		hidden : SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu,
-		iconCls : 'btn_ext_application_edit',
-		id : 'editTbar',
-		handler : function() {
-			godownOutEntryAllPreInInstance(grid);
-		}
-	});
-	tbar.push('-');
 	
 	tbar.push({
 		text : '打印',
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
===================================================================
diff -u -r22136 -r22158
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 22136)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 22158)
@@ -595,6 +595,43 @@
 	invoicePlanId = records[0].data['invoicePlanId'];
 	editRecord(id,invoicePlanId);
 };
+function godownOutEntryAllPreInInstance(grid){
+	var records = grid.getSelectionModel().getSelections();
+	if (records.length == 0) {
+		showResult("请选择入库单！");
+		return false;
+	}
+	var ids = null;
+	for ( var i = 0, len = records.length; i < len; i++) {
+		if (ids == null) {
+			ids = records[i].data['id'];
+		} else {
+			ids = ids + ',' + records[i].data['id'];
+		}
+	}
+	
+	top.Ext.MessageBox.confirm("请确认","是否确定要退库选中入库单的高值耗材？",
+			function(button, text) {
+				if ("yes" == button){
+					Ext.Ajax.request({
+						url : WWWROOT + '/disinfectSystem/expensiveGoodsGodownEntryAction!godownOutEntryAllPreInInstance.do',
+						params : {ids : ids},
+						success : function(response, options) {
+							var result = Ext.decode(response.responseText);
+							var success = result.success;
+							if (success) {
+								grid.dwrReload();
+								showResult(result.message);
+							}
+						},
+						failure : function(response, options) {
+							showResult(response.responseText);
+						}
+					});
+				}
+			}
+		);
+}
 /*
  * "根据id查看入库单信息表"
  */
@@ -752,6 +789,18 @@
 	});
 	tbar.push('-');
 	
+	// 一键退库
+	if((entryType == '预入库') && !SSTS_ExpensiveGoodsGodownOutEntry_Create_Hidden_Menu){
+		tbar.push({
+			text : '一键退库',
+			iconCls : 'btn_ext_application_edit',
+			id : 'editTbar',
+			handler : function() {
+				godownOutEntryAllPreInInstance(grid);
+			}
+		});
+		tbar.push('-');
+	}
 	//删除
 	if(!SSTS_ExpensiveGoodsPurchaseGodownEntry_Delete){
 		tbar.push({