Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r37356 -r37396
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 37356)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 37396)
@@ -60,6 +60,102 @@
 	editRecord(data['id']);
 }
 
+//BJDXZLYY-46：智能货柜查询
+function showOperationReservationStorageTousse(id){
+	var operationReservationStore = new Ext.data.Store({
+        proxy : new Ext.data.HttpProxy({
+            url : WWWROOT + '/disinfectsystem/operationReservationAction!loadOperationReservationStorageTousse.do',
+            method : 'POST'
+        }),
+        baseParams : {id : id},
+        reader : new Ext.data.JsonReader({
+			root : 'data'
+		}, [
+			{name : 'id',mapping : 'id'}, 
+			{name : 'showTousseName',mapping : 'showTousseName'},
+			{name : 'barcode',mapping : 'barcode'},
+			{name : 'storageLocation',mapping : 'storageLocation'},
+			{name : 'validUntilStr',mapping : 'validUntilStr'}
+		])
+    });
+    operationReservationStore.load();
+
+	var selectModel = new top.Ext.grid.CheckboxSelectionModel();
+	
+    var operationReservationGrid = new top.Ext.grid.GridPanel({
+        id :'operationReservationlGrid',
+        store: operationReservationStore,
+        cm:  new top.Ext.grid.ColumnModel([selectModel,
+			{
+				menuDisabled: true,
+				header : "器械包名称",
+				width:250,
+				dataIndex : 'showTousseName'
+			},{
+				menuDisabled: true,
+				header : "器械包条码",
+				width:80,
+				dataIndex : 'barcode'
+			},{
+				menuDisabled: true,
+				header : "抽屉名称",
+				width:130,
+				dataIndex : 'storageLocation'
+			},{
+				menuDisabled: true,
+				header : "失效日期",
+				width:120,
+				dataIndex : 'validUntilStr'
+			}
+	   	]),
+		sm:selectModel,
+		viewConfig: {forceFit:true},
+        height: 240,
+		frame : false
+    });
+
+	var configWin = new top.Ext.Window({
+		id: 'configWin',
+		layout: 'border',
+		title: '智能货柜查询结果',
+		width: 700,
+		height: 430,
+		border: false,
+		plain: true,
+		modal: true,
+		buttonAlign:'center',
+		items: [{
+			region: 'center',
+			width: 500,
+			layout: 'fit',
+			items: [operationReservationGrid]
+		}],
+		buttons: [{
+			text: '保存',
+			handler: function () {
+				var records = operationReservationGrid.getSelectionModel().getSelections();
+				if(records.length > 0){
+					var orgUnitCoding = top.Ext.getCmp('orgUnitCoding').getValue();
+					for(var i=0;i<records.length;i++){
+						var barcode = records[i].data.barcode;
+						loadGoodsByBarcode(orgUnitCoding,barcode);
+					}
+					configWin.close();
+				}else {
+					showResult('请选择器械包！');
+				}
+			}
+		}, {
+			text: '取消',
+			handler: function(){
+				configWin.close();
+			}
+		}]
+	});
+
+	configWin.show();
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	
@@ -589,13 +685,16 @@
 	}
 	return null;
 }
-function preprocessBeforeGetBarcodeInfo(){
+function preprocessBeforeGetBarcodeInfo(newBarcode){
 	var barcode = top.Ext.getCmp("scanText").getValue().Trim();
 	var barcodeEnd = top.Ext.getCmp("scanTextEnd").getValue().Trim();
 	var singleMode = true;
 	if(barcodeEnd != ''){
 		singleMode = false;
 	}
+	if(newBarcode){
+		barcode = newBarcode;
+	}
 	var sourceWarehouseId = top.Ext.getCmp("sourceWarehouseId").getValue();
 	if(isUndefinedOrNullOrEmpty(sourceWarehouseId)){
 		showResult('请先选择仓库!');
@@ -628,21 +727,24 @@
 	return true;
 }
 //扫描发货物品
-function loadGoodsByBarcode(orgUnitCoding) {
+function loadGoodsByBarcode(orgUnitCoding,newBarcode) {
 	var barcode = top.Ext.getCmp("scanText").getValue().Trim();
 	var barcodeEnd = top.Ext.getCmp("scanTextEnd").getValue().Trim();
 	var singleMode = true;
 	if(barcodeEnd != ''){
 		singleMode = false;
 	}
 	var sourceWarehouseId = top.Ext.getCmp("sourceWarehouseId").getValue();
-	if(!preprocessBeforeGetBarcodeInfo()){
+	if(!preprocessBeforeGetBarcodeInfo(newBarcode)){
 		return;
 	}
 	// 如果条码/篮筐(尾)不为空
 	if(barcodeEnd != ''){
 		barcode += ";" + barcodeEnd;
 	}
+	if(newBarcode){
+		barcode = newBarcode;
+	}
 	// 开始查询条码信息
 	top.Ext.getCmp("sendOutGoods").getEl().mask("后台处理中,请稍候...");
 	Ext.Ajax.timeout=300*1000;
@@ -1252,7 +1354,15 @@
 	if(sstsConfig.kardexContainerOpeningConfig){
 		kardexContainerOpeningStore = sstsConfig.kardexContainerOpeningConfig;
 	}
-	
+
+	var hiddenOperationReservation = true;
+	if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer){
+		if(sstsConfig.extendedFunctionalityOfGoodsDepartShareConfig && sstsConfig.extendedFunctionalityOfGoodsDepartShareConfig.indexOf('warehousePosition') >= 0){
+			if(operationReservation.deliverStatus == '部分发货' || operationReservation.deliverStatus == '待发货'){
+				hiddenOperationReservation = false;
+			}
+		}
+	}
 	var form = new top.Ext.FormPanel({
 		id : 'recyclingApplicationForm',
 		frame : true,
@@ -1890,6 +2000,12 @@
 					]
 				}],
 				buttons : [{
+					text : '智能货柜查询',
+					hidden:hiddenOperationReservation,
+					handler : function() {
+						showOperationReservationStorageTousse(operationReservation.id);
+					}
+				},{
 					text : '保存',
 					disabled : committedStatus ? false : true,//未提交则保存按钮置灰
 					id:'saveButton',