Index: ssts-web/src/main/webapp/common/selectOrgByExt.jsp
===================================================================
diff -u -r27246 -r29300
--- ssts-web/src/main/webapp/common/selectOrgByExt.jsp	(.../selectOrgByExt.jsp)	(revision 27246)
+++ ssts-web/src/main/webapp/common/selectOrgByExt.jsp	(.../selectOrgByExt.jsp)	(revision 29300)
@@ -73,9 +73,11 @@
 if(search !== ''){
     codes = getQueryVariable('departCodes');
     departNames =getQueryVariable('departNames');
+    orgUnitIds =getQueryVariable('orgUnitIds');
 }else {
     codes = window.dialogArguments.departCodes;
     departNames = window.dialogArguments.departNames;
+    orgUnitIds = window.dialogArguments.orgUnitIds;
 } 
 
 if(tabType != null && tabType.length > 0){
Index: ssts-web/src/main/webapp/js/org.js
===================================================================
diff -u -r27770 -r29300
--- ssts-web/src/main/webapp/js/org.js	(.../org.js)	(revision 27770)
+++ ssts-web/src/main/webapp/js/org.js	(.../org.js)	(revision 29300)
@@ -77,7 +77,7 @@
 	}
 ]);
 
-function addItem(code,name){
+function addItem(code,name,orgUnitId){
 	//var name = top.Ext.getCmp('departName2').getRawValue(); 
     if(name==null||name==''){
     	showResult('请选择科室！');
@@ -92,7 +92,8 @@
     //var departCode =top.Ext.getCmp('departCode').getValue();
     var record = new Ext.data.Record({
     	departCode:code,
-    	name:name
+		name:name,
+		orgUnitId:orgUnitId
     });
     supplyRoom1Store.add(record);
     Ext.getCmp("departName2").setValue("");
@@ -123,8 +124,9 @@
 			select:function(combo,  record, index ){
 				var tem = record.data.departCode;
 				var name = record.data.name;
+				var orgUnitId = record.json.orgUnitId;
 				top.Ext.getCmp('departCode').setValue(tem);
-				addItem(tem,name);
+				addItem(tem,name,orgUnitId);
 			}
 		}
 	},{
@@ -199,23 +201,27 @@
 					showResult('请选择科室！');
 					return false;
 				}
-          	  var tempName ='';
-          	  var tempCode ='';
-          	  var returnVal = new Array();
-          	  for(var i =0;i<len;i++){
-          		  var record = supplyRoom1Store.getAt(i);
-          		  if(i==len-1){
-          			  tempCode += record.data['departCode'];
-          			  tempName += record.data['name'];
-          		  }else{
-          			  tempCode += record.data['departCode'] + ";";
-          			  tempName += record.data['name'] + ";";
-          		  }
-          	  }
-          	  returnVal.push(tempCode);
-          	  returnVal.push(tempName);
-          	  self.returnValue = returnVal;
-          	  self.close();
+          	  	var tempName ='';
+				var tempCode ='';
+				var tempId = '';
+				var returnVal = new Array();
+          	  	for(var i =0;i<len;i++){
+					var record = supplyRoom1Store.getAt(i);
+					if(i==len-1){
+						tempCode += record.data['departCode'];
+						tempName += record.data['name'];
+						tempId += record.data['orgUnitId'];
+					}else{
+						tempCode += record.data['departCode'] + ";";
+						tempName += record.data['name'] + ";";
+						tempId += record.data['orgUnitId'] + ";";
+					}
+          	  	}
+				returnVal.push(tempCode);
+				returnVal.push(tempName);
+				returnVal.push(tempId);
+				self.returnValue = returnVal;
+				self.close();
 			}
 		},{
 			id : 'cancleBtn',
@@ -240,13 +246,16 @@
 	if(codes != null && codes != "" && codes != undefined){
 		var idArray = codes.split(";");
 		var nameArray = departNames.split(";");
+		var orgUnitIdArray = orgUnitIds.split(";");
 		for(var i=0;i<idArray.length;i++){
 				var id = idArray[i];
 				if(!Ext.isEmpty(id)){
 					var name = nameArray[i];
+					var orgUnitId = orgUnitIdArray[i];
 					var record = new Ext.data.Record({
 						departCode:id,
-				    	name:name
+						name:name,
+						orgUnitId:orgUnitId
 				 });
 				supplyRoom1Store.add(record);
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
===================================================================
diff -u -r27353 -r29300
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 27353)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 29300)
@@ -250,8 +250,8 @@
 	});
 }
 
-function addInvoiceSignGoods() {	
-	
+function addInvoiceSignGoods(isShowSing) {	
+	isShowSing = isShowSing || '';
 	//异常物品列表--Ext.data.Store
 	invoiceSignAbnormalDetailGoodsStore = new Ext.data.Store({
 		reader : new Ext.data.JsonReader({
@@ -296,13 +296,22 @@
 		])
 	});
 	
-	//默认传近2天
-	waitInvoiceSignGoodsStore.load({
-		params : { 
-			beginDate:sendoutTimeArrSplit[0],
-			endDate:sendoutTimeArrSplit[1]
-		}
-	});
+	if(isShowSing == ''){
+		//默认传近2天
+		waitInvoiceSignGoodsStore.load({
+			params : { 
+				beginDate:sendoutTimeArrSplit[0],
+				endDate:sendoutTimeArrSplit[1]
+			}
+		});
+	}else {
+		waitInvoiceSignGoodsStore.load({
+			params : { 
+				beginDate:'',
+				endDate:''
+			}
+		});
+	}
 	
 	var	waitInvoiceSignCm = new Ext.grid.ColumnModel([
 		{header : "物品名称",dataIndex : 'tousseName',width : 150,menuDisabled: true},
@@ -450,10 +459,14 @@
 						getRowClass : function(record,rowIndex,rowParams,store){
 							var rowColor;
 							if(record.data.signAmount == 0){//未扫描
-								if(record.data.signTime == 0){//当天待签收的物品背景色为白色
-									rowColor = 'my_row_white';
-								}else if(record.data.signTime == 1){//昨天或昨天之前的背景色为黄色，如果全是今天发货的；如果同一种物品，内含今天发货的和非今天发货的，则为黄色
-									rowColor = 'my_row_yellow';
+								if(record.data.warnTime == 1){
+									if(record.data.signTime == 0){//当天待签收的物品背景色为白色
+										rowColor = 'my_row_white';
+									}else if(record.data.signTime == 1){//昨天或昨天之前的背景色为黄色，如果全是今天发货的；如果同一种物品，内含今天发货的和非今天发货的，则为黄色
+										rowColor = 'my_row_yellow';
+									}
+								}else {
+									rowColor = 'my_row_red';
 								}
 							}else{//扫描以后
 								if(record.data.signAmount > 0 && record.data.amount > 0){//还存在待签收的物品，即已扫描的数量大于0，并且待签收数量大于0时，物品的背景色为蓝色 
@@ -556,8 +569,13 @@
 	});
 	
 	invoiceSignGoodsWin.show();	
-	top.Ext.getCmp("sendoutTime").setValue(sendoutTimeArr[1][1]);
-	top.Ext.getCmp("sendoutTime").setRawValue(sendoutTimeArr[1][0]);
+	if(isShowSing == 'true'){
+		top.Ext.getCmp("sendoutTime").setValue(sendoutTimeArr[3][1]);
+		top.Ext.getCmp("sendoutTime").setRawValue(sendoutTimeArr[3][0]);
+	}else {
+		top.Ext.getCmp("sendoutTime").setValue(sendoutTimeArr[1][1]);
+		top.Ext.getCmp("sendoutTime").setRawValue(sendoutTimeArr[1][0]);
+	}
     top.Ext.getCmp('scanText').focus(false,100);
 	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
===================================================================
diff -u -r26979 -r29300
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js	(.../invoiceSignViewVersion2.js)	(revision 26979)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js	(.../invoiceSignViewVersion2.js)	(revision 29300)
@@ -2,6 +2,9 @@
 var invoiceSignDetailStore;
 var goodsNameTotalStore;
 var invoiceSignRecordId = null;
+if(isShowSing == 'true'){
+	addInvoiceSignGoods(isShowSing);
+}
  
 function queryInvoiceSignRecord(){
 	var startDate = Ext.getCmp('startDate').getRawValue();
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp
===================================================================
diff -u -r27353 -r29300
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp	(.../invoiceSignVersion2.jsp)	(revision 27353)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp	(.../invoiceSignVersion2.jsp)	(revision 29300)
@@ -12,6 +12,7 @@
 	<script type="text/javascript">
 		var project = '${profile}';
 		var messagePromptType = '<%=messagePromptType%>';
+		var isShowSing = '${param.isShowSign}';
 	</script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 </head>
Index: ssts-web/src/main/webapp/systemmanage/timeoutSetting.js
===================================================================
diff -u -r14288 -r29300
--- ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 14288)
+++ ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 29300)
@@ -295,6 +295,116 @@
 					triggerAction : 'all'
 				}]
 			}]
+		},{
+			xtype : "panel",
+			title : '发货到签收',
+			layout:'column',
+			autoHeight :true ,
+			items : [{
+				xtype : "fieldset",
+				title : '超时时间',
+				layout:'column',
+				autoHeight :true ,
+				columnWidth:1,
+				items : [{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'deliveryToSignHour',
+						name:'deliveryToSignHour',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '小时',
+						allowBlank:false,
+						regex:/^[0-9]\d*$/,
+						regexText:'请输入数字',
+						blankText:'请输入数字',
+						listeners:{
+							focus:onTextfieldFoucus
+						}
+					}]
+				},{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'textfield',
+						id:'deliveryToSignMinute',
+						name:'deliveryToSignMinute',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '分钟',
+						allowBlank:false,
+						regex:/^[0-9]$|^[0-5][0-9]$/,
+						regexText:'请输入0到59的数字',
+						blankText:'请输入0到59的数字',
+						listeners:{
+							focus:onTextfieldFoucus
+						}
+					}]
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 0.8,
+				border:0,
+				items : [{
+					xtype : 'textarea',
+					fieldLabel : '提醒科室',
+					labelWidth:'110',
+					labelAlign: 'right',
+					id : 'departNames',
+					name : 'departNames',
+					height : 100,
+					allowBlank : false,
+					readOnly:true,
+					anchor : '95%'
+				}]
+			},{
+				xtype:'hidden',
+				id:'departCodes',
+				name:'departCodes'
+			},{
+				xtype:'hidden',
+				id:'orgUnitIds',
+				name:'orgUnitIds'
+			},{
+				columnWidth : .2,
+				layout : 'form',
+				border:0,
+				items : [{
+					xtype : 'button',
+					text : '选择科室',
+					listeners:{
+						click : function(){
+							var departNames = Ext4.getCmp('departNames').getValue();
+							var codes = Ext4.getCmp("departCodes").getValue();
+							var orgUnitIds = Ext4.getCmp("orgUnitIds").getValue();
+							openSelectReceiverOrganization(departNames,codes,orgUnitIds);
+						} 								
+					}
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				border:0,
+				items : [{
+					xtype:'combobox',
+					id:'deliveryToSignShowMessageBox',
+					name: 'deliveryToSignShowMessageBox',
+					store:yesNoStore,
+					labelWidth:'110',
+					labelAlign: 'right',
+			        fieldLabel: '是否显示提示框',
+			        valueField : 'value',
+					displayField : 'text',
+					forceSelection : true,
+					editable:false,
+					allowBlank:false,
+					triggerAction : 'all'
+				}]
+			}]
 		}],
 
         buttons: [{
@@ -329,13 +439,77 @@
 				Ext4.getCmp('reviewToSterileHour').setValue(result.reviewToSterileHour);
 				Ext4.getCmp('reviewToSterileMinute').setValue(result.reviewToSterileMinute);
 				Ext4.getCmp('reviewToSterileShowMessageBox').setValue(result.reviewToSterileShowMessageBox);
+
+				Ext4.getCmp('deliveryToSignHour').setValue(result.deliveryToSignHour);
+				Ext4.getCmp('deliveryToSignMinute').setValue(result.deliveryToSignMinute);
+				Ext4.getCmp('deliveryToSignShowMessageBox').setValue(result.deliveryToSignShowMessageBox);
+				Ext4.getCmp('departNames').setValue(result.deliveryToSignOrgUnitNames);
+				Ext4.getCmp('orgUnitIds').setValue(result.deliveryToSignOrgUnitIds);
+				Ext4.getCmp('departCodes').setValue(result.deliveryToSignOrgUnitCodes);
 			}
 		},
 		failure : function(response, options) {
 		}
 	});
     
-    function checkModuleTextIsExist(moduleStr,poModuleName,moduleCmpId){}
+	function checkModuleTextIsExist(moduleStr,poModuleName,moduleCmpId){}
+	
+	function openSelectReceiverOrganization(departNames,codes,orgUnitIds){
+		var param = {
+			allowNull:true,
+			onlyOneOrg : true,
+			resultType:'code',
+			tabType : 'orgUnit',
+			sameLevel :'yes',
+			range : 'all',
+			departNames :departNames,
+			departCodes : codes,
+			orgUnitIds:orgUnitIds
+		};
+		var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
+		//org_3306;org_3219,口腔科;妇科
+		var codes ='';
+		
+		if(selectedOrgUnitArray == undefined){
+			return;
+		}else if(selectedOrgUnitArray[0] !== undefined){
+			codes = '';
+			var tem ='';
+	
+			var tempArray = selectedOrgUnitArray[0].split(';');
+			for(var i=0;i<tempArray.length;i++){
+				codes += tempArray[i]+";";
+			}
+			for(var j=0;j<codes.length-1;j++){
+				tem += codes.charAt(j);
+			}
+			Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
+			Ext4.getCmp("orgUnitIds").setValue(selectedOrgUnitArray[2]);
+			Ext4.getCmp("departCodes").setValue(tem);
+		}else {
+			var loop = setInterval(function() {
+				  if(selectedOrgUnitArray.closed) {
+					clearInterval(loop);
+	
+					   codes = '';
+					var tem ='';
+					var returnValue = selectedOrgUnitArray.returnValue || [];
+					if(returnValue.length > 0){
+						var tempArray = selectedOrgUnitArray.returnValue[0].split(';');
+						for(var i=0;i<tempArray.length;i++){
+							codes += tempArray[i]+";";
+						}
+						for(var j=0;j<codes.length-1;j++){
+							tem += codes.charAt(j);
+						}
+						Ext4.getCmp("departNames").setValue(selectedOrgUnitArray.returnValue[1]);
+						Ext4.getCmp("orgUnitIds").setValue(selectedOrgUnitArray.returnValue[2]);
+						Ext4.getCmp("departCodes").setValue(tem);
+					}
+				  }
+			},500);
+		}
+	}
     
     function save(){
     	if(!formObj.isValid()){