Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
===================================================================
diff -u -r29513 -r31828
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp	(.../invoiceView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp	(.../invoiceView.jsp)	(revision 31828)
@@ -126,6 +126,7 @@
     <input type="hidden" id="parm_s_goodsId" name="parm_s_goodsId">
     <input type="hidden" id="parm_s_selectedTousseType" name="parm_s_selectedTousseType">
     <input type="hidden" id="parm_s_print" name="parm_s_print">
+    <input type="hidden" id="parm_s_invoiceSerialNumberSetBarcode" name="parm_s_invoiceSerialNumberSetBarcode">
     <input type="hidden" id="parm_s_goodsType" name="parm_s_goodsType">
     <input type="hidden" id="parm_s_startTime" name="parm_s_startTime">
     <input type="hidden" id="parm_s_endTime" name="parm_s_endTime">
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
===================================================================
diff -u -r31774 -r31828
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 31774)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 31828)
@@ -155,6 +155,8 @@
 		  useRecordConvertRecyclingApplicationMergeRegular : "depart",
 			  //不进行合并申请单的科室编码
 			  useRecordConvertRecyclingApplicationNotMergeDeptCodes:["203"],
+			  //开启【发货单号集合码】查询功能
+			  enableInvoiceSerialNumberCollectionCodeFunction:true,
 				  //启用使用记录转换配置
 			  enableUseRecordConvertConfig:true
 		}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r30700 -r31828
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 30700)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 31828)
@@ -1686,6 +1686,81 @@
 	return values;
 }
 
+//发货单号集合码
+function callSerialNumbersFunction(that){
+	var number = that.innerText || '';
+	if(number !== ''){
+		showSerialNumbersWin(number);
+	}
+}
+
+function renderSerialNumbers(v, p, record){
+	var arr = [];
+	if(record.get('invoiceSerialNumberSetBarcode') !== ''){
+		arr = record.get('invoiceSerialNumberSetBarcode').split(',');
+	}
+	var values = '';
+	for(var i=0;i<arr.length;i++){
+		values += '<a href="#" onclick="callSerialNumbersFunction(this);return false;">'+arr[i]+'</a>';
+		if(i < (arr.length-1)){
+			values += ',';
+		}
+	}
+	return values;
+}
+
+//弹出发货单集合码的窗口
+function showSerialNumbersWin(number){
+	var store = new top.Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/invoiceAction!getInvoiceSerialNumberSetBarcodeDetail.do?barcode='+number,
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+			{name : 'createUserID'},
+				{name : 'createUserName'},
+				{name : 'objectBarcodes'},
+				{name : 'barcode'},
+				{name : 'createDateTime'}
+		   ]
+		)
+	});
+	var cm = new top.Ext.grid.ColumnModel([
+		{header : "发货单号集合码",dataIndex : 'barcode',width : 100,menuDisabled : true},
+		{header : "生成时间",dataIndex : 'createDateTime',width : 130,menuDisabled : true},
+		{header : "生成人",dataIndex : 'createUserName',width : 70,menuDisabled : true},
+		{header : "发货单流水号",dataIndex : 'objectBarcodes',width : 140,menuDisabled : true}
+	]);
+	store.load();
+	var grid = new top.Ext.grid.GridPanel({
+		store : store,
+		cm : cm,
+		width : 350,
+		height : 385,
+		autoExpandColumn : 'objectBarcodes',
+		stripeRows: true,
+		viewConfig: {
+			forceFit:true
+		}
+	})
+	var serialNumbersWin = new top.Ext.Window({
+		id : 'serialNumbersWin',
+		layout : 'fit',
+		title : '发货单号集合码信息',
+		width : 600,
+        height : 300,
+		border : false,
+		modal : true,
+		plain : true,
+		items : [grid]
+	});
+
+	serialNumbersWin.show();
+}
+
 function formartPrice(v, p, record) {
 	if (v != null && v != "") {
 		var temp = parseFloat(v);
@@ -1829,7 +1904,7 @@
 var searchTbar3Width = 0;						//第3行过滤tbar的宽度
 var searchTbar4 = [];							//第4行过滤tbar
 var searchTbar4Width = 0;						//第4行过滤tbar的宽度
-var searchTbarMaxWidth = top.screen.width - 30;	//每一行搜索的工具栏的最大宽度
+var searchTbarMaxWidth = document.documentElement.clientWidth - 30;	//每一行搜索的工具栏的最大宽度
 var searchTbarWidth = 0;						//过滤tbar的总宽度
 /**
  * 把过滤的tbar加到对应的组内（自适应各个分辨率）.
@@ -2263,6 +2338,12 @@
 		document.getElementById('print').value = '';
 		document.getElementById('parm_s_print').value = '';
 	}
+
+	if(!sstsConfig.notShowPrintSearchTbar){
+		//发货单号集合码
+		document.getElementById('idNumber').value = '';
+		document.getElementById('parm_s_invoiceSerialNumberSetBarcode').value = '';
+	}
 	
 	grid.dwrReload();
 
@@ -2381,6 +2462,28 @@
 		printSearchTbarArr.push(createPrintCombo());
 		addSearchTbar(printSearchTbarArr, 150);
 	}
+
+	//8、发货单号集合码(width=100)
+	if(!sstsConfig.notShowPrintSearchTbar){
+		var invoiceSerialNumberSetBarcode = [];
+		invoiceSerialNumberSetBarcode.push({text: '发货单号集合码:'});
+		invoiceSerialNumberSetBarcode.push({
+			xtype : 'textfield',
+			id : 'idNumber',
+			name : 'idNumber',
+			width:100,
+			anchor : '95%',
+			listeners : {
+				specialkey : function(field, ee) {
+					if (ee.getKey() == Ext.EventObject.ENTER) {
+						var value = Ext.getCmp('idNumber').getValue();
+						reloadConditionPara(value, 'parm_s_invoiceSerialNumberSetBarcode');
+					}
+				}
+			}
+		});
+		addSearchTbar(invoiceSerialNumberSetBarcode, 100);
+	}
 	
 	//simon-update
 	//刷新按钮
@@ -2390,7 +2493,7 @@
 		iconCls: 'btn_ext_refresh1',
         handler: refresh
 	};
-	addSearchTbar(refreshBtn, 200);
+	addSearchTbar(refreshBtn, 100);
 	
 	//重置按钮
 	var resetBtn={
@@ -2399,7 +2502,7 @@
 			iconCls: 'icon_set',
 	        handler: reset
 	};
-	addSearchTbar(resetBtn, 200);
+	addSearchTbar(resetBtn, 100);
 	
 }
 var invoicePrintModule;
@@ -2438,7 +2541,8 @@
 	var columns = [
 	    {header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction},
 	    {header : "状态",width : 70,dataIndex : 'status',renderer : renderColor},
-	    {header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor},
+		{header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor},
+		{header : "发货单号集合码",width : 140,renderer : renderSerialNumbers,hidden:!sstsConfig.enableInvoiceSerialNumberCollectionCodeFunction},
 		{header : "申请科室",width : 120,dataIndex : 'depart'},
 		{header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute},
 		{header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute},
@@ -2469,7 +2573,8 @@
 	    {name : 'depart'},
 	    {name : 'printTime'},
 	    {name : 'settleAccountsDepart'},
-	    {name : 'isPrint'},
+		{name : 'isPrint'},
+		{name : 'invoiceSerialNumberSetBarcode'},
 	    {name : 'spelling'},
 	    {name : 'wbCode'},
 	    {name : 'applicationTime'},
@@ -2914,7 +3019,6 @@
 	grid.on('mouseover',function(e) {// 添加mouseover事件
 		var index = grid.getView().findRowIndex(
 				e.getTarget());// 根据mouse所在的target可以取到列的位置
-		//console.log("index=" + index);
 		if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
 			var record = this.getStore().getAt(index);
 			var recordID = record.get('id');