Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r41374 -r41520
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 41374)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 41520)
@@ -2520,13 +2520,18 @@
 		}
 		isScanAmountEqualsAppAmountConfirmed = false;
 		getTousseGridData1();
+		var signStorageLocationId = '';
+		if(sstsConfig.enableDesignatedWarehouseReceiving){
+			signStorageLocationId = top.Ext.getCmp("storageLocationName").getValue()
+		}
 		form.form.submit({
 			//url : WWWROOT + '/disinfectSystem/invoiceAction!saveDepartInvoice.do',
 			url: WWWROOT + '/disinfectSystem/invoiceAction!saveInvoiceByDepartOrInvoicePlanId.do',
 			method: 'POST',
 			waitMsg: '正在保存数据，请稍候',
 			waitTitle: '提交表单',
 			timeout: 60,
+			params: { signStorageLocationId: signStorageLocationId },
 			success: function (form, action) {
 				var result = action.result;
 				//DGSETYY-80：4.2提示发货失败信息
@@ -3425,6 +3430,49 @@
 								if (tousseType == '一次性物品') {
 									recalcDisposableGoodsAmount(name);
 								}
+							},
+							render : function() {
+								if(sstsConfig.enableDesignatedWarehouseReceiving){
+									var orgUnitCoding = top.Ext.getCmp('orgUnitCoding').getValue()
+									var warseHouseStore = new Ext.data.Store({
+										proxy: new Ext.data.HttpProxy({
+											url: WWWROOT + '/disinfectSystem/baseData/storageLocationAction!searchStorageLocationByKeyword.do',
+											method: 'POST'
+										}),
+										baseParams: { orgUnitCode: orgUnitCoding,searchLeafStorageLocation:true },
+										reader: new Ext.data.JsonReader({
+											totalProperty: 'totalCount',
+											root: 'data'
+										}, [
+											{ name: 'id', mapping: 'id' },
+											{ name: 'storageLocationName', mapping: 'storageLocationName' },
+											{ name: 'storageLocationPath', mapping: 'storageLocationPath' }
+										])
+									})
+									var tbar = new top.Ext.Toolbar({
+										items :[{
+											text : '签收库房:'
+										},{
+											xtype: 'combo',
+											id: 'storageLocationName',
+											name: 'storageLocationName',
+											queryParam: 'keyword',
+											minChars: 0,
+											valueField: 'id',
+											displayField: 'storageLocationPath',
+											anchor: '95%',
+											width:500,
+											store: warseHouseStore,
+											forceSelection: true,
+											lazyInit: true,
+											triggerAction: 'all',
+											hideTrigger: false,
+											typeAhead: false,
+											listWidth: 400
+										}]
+									});
+									tbar.render(this.tbar); 
+								}
 							}
 						}
 					})
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r39749 -r41520
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 39749)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 41520)
@@ -650,6 +650,9 @@
 		{ header: "结算科室", dataIndex: 'settleAccountsDepart', width: 60, menuDisabled: true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView },
 		{ header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true }
 	]);
+	if(sstsConfig.enableDesignatedWarehouseReceiving){
+		recyclingApplicationFormHeight += 30
+	}
 	var form = new top.Ext.FormPanel({
 		id: 'recyclingApplicationForm',
 		frame: true,
@@ -950,6 +953,26 @@
 				},
 				{
 					layout: 'form',
+					labelWidth: 70,
+					columnWidth: .5,
+					hidden: !sstsConfig.enableDesignatedWarehouseReceiving,
+					items: [{
+						xtype:'hidden',
+						id:'signStorageLocationId',
+						name:'signStorageLocationId'
+					},{
+						xtype: 'textfield',
+						fieldLabel: '签收库房',
+						maxLength: '41',
+						id: 'signStorageLocationName',
+						name: 'signStorageLocationName',
+						readOnly: true,
+						anchor: '99%',
+						cls: 'fieldReadOnlyNoRemove'
+					}]
+				},
+				{
+					layout: 'form',
 					columnWidth: 1,
 					labelWidth: 70,
 					items: [{