Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r39540 -r39708
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39540)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39708)
@@ -53,6 +53,7 @@
       <operation operationId="SSTS_storageLocation_Update" operationName="��λ�����޸�"></operation>
       <operation operationId="SSTS_storageLocation_Delete" operationName="��λ����ɾ��"></operation>
       <operation operationId="SSTS_storageLocationLook_Manager" operationName="���鿴"></operation>
+      <operation operationId="SSTS_storageLocationLook_Update" operationName="��λ�鿴����"></operation>
        <operation operationId="SSTS_goodsAccess_Manager" operationName="��Ʒ��ȡ"></operation>
        <operation operationId="SSTS_accessList_Manager" operationName="��ȡ��¼"></operation>
     </modelName> 
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r38749 -r39708
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 38749)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 39708)
@@ -382,6 +382,10 @@
   enableInterventionToRemoveToussesShortcutsOfUserRecord:true,
   //启用使用记录预约加急功能
   enableScheduleExpeditedOfUseRecord:true,
+  //库位查看的扩展查询项
+  expandQueryFieldsConfigOfStorageLocationLook:[{"fieldName":"locationStatus","queryName":"库位状态"}],
+  //启用库位查看的废弃并取出功能
+  enableTheScrapAndTakeAutFeatureOfstorageLocationLookView:true,
   //PDA桌面图标别名设置(GDSRMYY-581)
   aliasNameOfPDADesktopIcons:{"instrumentGoodsManagement":"v1"}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js
===================================================================
diff -u -r38706 -r39708
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 38706)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js	(.../storageLocationLookView.js)	(revision 39708)
@@ -10,6 +10,18 @@
 if (sstsConfig.enableSurgicalInstrumentsManagement && sstsConfig.enableWarehousePositionModule) {
 	enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction = sstsConfig.enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction;
 }
+var expandQueryFieldsConfigOfStorageLocationLook = sstsConfig.expandQueryFieldsConfigOfStorageLocationLook || [];
+var locationStatusHidden = true;
+var locationStatusName = '库位状态';
+if(expandQueryFieldsConfigOfStorageLocationLook.length > 0){
+	for(var i=0;i<expandQueryFieldsConfigOfStorageLocationLook.length;i++){
+		var item = expandQueryFieldsConfigOfStorageLocationLook[i];
+		if(item.fieldName == 'locationStatus'){
+			locationStatusHidden = false;
+			locationStatusName = item.queryName;
+		}
+	}
+}
 /**
  * 点击某个库位列表点执行的函数
  * @param id				id
@@ -59,6 +71,10 @@
 		loadFirstStorageLocation(params.type, params.id);
 		return
 	}
+	if(!locationStatusHidden){
+		Ext.getCmp('locationStatus').setValue('在库');
+		$Id("parm_s_locationStatus").value = '在库';
+	}
 	grid.dwrReload();
 }
 
@@ -220,15 +236,20 @@
 	var warseHouseNames = Ext.getCmp("warseHouseName").getValue();
 	var queryMode = Ext.getCmp("queryMode").getValue();
 	var instrumentSetTypeIds = '';
+	var locationStatus = '';
 	if (sstsConfig.enableInstrumentSetTypeSetting) {
 		instrumentSetTypeIds = Ext.getCmp("instrumentSetTypeIds").getValue();
 	}
+	if(!locationStatusHidden){
+		locationStatus = Ext.getCmp("locationStatus").getValue();
+	}
 
 	$Id("parm_s_goodsName").value = goodsName;
 	$Id("parm_s_barcode").value = barcode;
 	$Id("parm_s_warseHouseNames").value = warseHouseNames;
 	$Id("parm_s_queryMode").value = queryMode;
 	$Id("parm_s_instrumentSetTypeIds").value = instrumentSetTypeIds;
+	$Id("parm_s_locationStatus").value = locationStatus;
 
 	//BJDXZLYY-47：存入扫描多个条码
 	$Id('parm_s_scanTousseBarcodes').value = '';
@@ -271,6 +292,9 @@
 		Ext.getCmp('instrumentSetTypeIds').setValue("");
 		Ext.getCmp('tousseSetTypeName').setValue("");
 	}
+	if(!locationStatusHidden){
+		Ext.getCmp("locationStatus").setValue('在库');
+	}
 	if (sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer) {
 		$Id("parm_s_id").value = '';
 		$Id("parm_s_orgUnitRoomName").value = '';
@@ -433,6 +457,27 @@
 	});
 }
 
+//GDSRMYY-625：取出和废弃
+function batchTakeOutStorageTousseInstance(tousseInstanceIds,autoDiscard){
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/storageLocationGoodsAccessAction!batchTakeOutStorageTousseInstance.do',
+		params: {
+			tousseInstanceIds: tousseInstanceIds,
+			autoDiscard:autoDiscard
+		},
+		success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			if (result.success) {
+				grid.dwrReload();
+			}
+			showResult(result.message);
+		},
+		failure: function () {
+			showResult('物品取出失败！');
+		}
+	});
+}
+
 function compareDate(DateOne, DateTwo) {
 	var newDateOne;
 	var newDateTwo;
@@ -466,6 +511,10 @@
 	var validUntil = record.data.validUntil;
 	var warningUntil = record.data.warningUntil;
 
+	if(warningUntil == '' || validUntil == ''){
+		return 0
+	}
+
 	//由客户端时间改为和服务器时间进行比较
 	var b = compareDate(myDateFormat(warningUntil, v, record), serverDate);//预警期
 	var f = compareDate(myDateFormat(validUntil, v, record), serverDate);//失效期
@@ -887,6 +936,30 @@
 						}
 					}
 				}]
+			}, {
+				columnWidth: .33,
+				layout: 'form',
+				labelAlign: "right",
+				height: 30,
+				hidden:locationStatusHidden,
+				items: [{
+					xtype: 'combo',
+					id: 'locationStatus',
+					name: 'locationStatus',
+					valueField: 'name',
+					displayField: 'name',
+					fieldLabel: locationStatusName,
+					mode: 'local',
+					readOnly: true,
+					value: '在库',
+					triggerAction: 'all',
+					forceSelection: true,
+					anchor: '95%',
+					store: new Ext.data.SimpleStore({
+						fields: ['name'],
+						data: [['全部'], ['在库'], ['出库']]
+					})
+				}]
 			}]
 		}, {
 			layout: 'column',
@@ -1046,6 +1119,12 @@
 									Ext.getCmp('tousseLabel').hide();
 									Ext.getCmp('tousseNames').hide();
 									Ext.getCmp('searchTousses').hide();
+									if(!SSTS_storageLocationLook_Update){
+										Ext.getCmp('retrievalBtn').show();
+										if(sstsConfig.enableTheScrapAndTakeAutFeatureOfstorageLocationLookView){
+											Ext.getCmp('deleteAndRetrievalBtn').show();
+										}
+									}
 									resetStorageLocation();
 									//BJDXZLYY-47：存入扫描多个条码
 									$Id('parm_s_scanTousseBarcodes').value = '';
@@ -1061,6 +1140,10 @@
 									Ext.getCmp('tousseLabel').hide();
 									Ext.getCmp('tousseNames').hide();
 									Ext.getCmp('searchTousses').hide();
+									if(!SSTS_storageLocationLook_Update){
+										Ext.getCmp('retrievalBtn').hide();
+										Ext.getCmp('deleteAndRetrievalBtn').hide();
+									}
 									resetStorageLocation();
 									drawerStore.load();
 								} else if (group == "取出") {
@@ -1075,6 +1158,9 @@
 									Ext.getCmp('tousseNames').show();
 									Ext.getCmp('searchTousses').show();
 									Ext.getCmp('tousseNames').setValue('')
+									if(!SSTS_storageLocationLook_Update){
+										Ext.getCmp('deleteAndRetrievalBtn').hide();
+									}
 									resetStorageLocation();
 									drawerStore.load();
 								}
@@ -1157,7 +1243,7 @@
 	var tbar = [{
 		text: '取出',
 		id: 'retrievalBtn',
-		hidden: true,
+		hidden: SSTS_storageLocationLook_Update,
 		handler: function () {
 			var records = grid.getSelectionModel().getSelections();
 			if (records.length == 0) {
@@ -1172,9 +1258,43 @@
 				ids[i] = tousseInstanceId;
 			}
 
-			storageLocationItemRetrieval(ids.join(';'))
+			var checkedType = Ext.getCmp('queryType').getValue();
+
+			if(checkedType == '取出'){
+				storageLocationItemRetrieval(ids.join(';'))
+			}else {
+				top.Ext.MessageBox.confirm("删除确认","是否取出该物品？",function(btn){
+					if(btn == "yes"){
+						batchTakeOutStorageTousseInstance(ids.join(';'), false)
+					}
+				});
+			}
 		}
 	}, {
+		text: '废弃并取出',
+		id: 'deleteAndRetrievalBtn',
+		hidden: !(!SSTS_storageLocationLook_Update && sstsConfig.enableTheScrapAndTakeAutFeatureOfstorageLocationLookView),
+		handler: function () {
+			var records = grid.getSelectionModel().getSelections();
+			if (records.length == 0) {
+				showResult("请先勾选物品后再进行取出操作");
+				return;
+			}
+
+			var ids = [];
+
+			for (var i = 0; i < records.length; i++) {
+				var tousseInstanceId = records[i].data.tousseInstanceId;
+				ids[i] = tousseInstanceId;
+			}
+
+			top.Ext.MessageBox.confirm("删除确认","是否废弃并取出该物品？",function(btn){
+				if(btn == "yes"){
+					batchTakeOutStorageTousseInstance(ids.join(';'), true);
+				}
+			});
+		}
+	}, {
 		text: '器械包名称:',
 		id: 'tousseLabel',
 		hidden: true
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp
===================================================================
diff -u -r37756 -r39708
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp	(.../storageLocationLookView.jsp)	(revision 37756)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.jsp	(.../storageLocationLookView.jsp)	(revision 39708)
@@ -33,6 +33,10 @@
 				kardexContainerAddr = arr[1];
 			}
 		}
+		var SSTS_storageLocationLook_Update = true;
+		<operation:authorize ifAnyGranted="SSTS_storageLocationLook_Update">
+			SSTS_storageLocationLook_Update = false;
+		</operation:authorize>
 	</script>
 	<script type="text/javascript" src="storageLocationLookView.js?version=${svnRevision}"></script>	
 </head>
@@ -85,6 +89,7 @@
 		<input type="hidden" id="parm_s_parentStorageLocationPath" name="parm_s_parentStorageLocationPath" value="" />
 		<input type="hidden" id="parm_s_wareHouseName" name="parm_s_wareHouseName" value="" />
 		<input type="hidden" id="parm_s_orgUnitName" name="parm_s_orgUnitName" value="" />
+		<input type="hidden" id="parm_s_locationStatus" name="parm_s_locationStatus" value="" />
 
 		<input type="hidden" id="parm_s_instrumentSetTypeIds" name="parm_s_instrumentSetTypeIds" value="" />
 	</form>