Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r37396 -r37410
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 37396)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 37410)
@@ -1087,7 +1087,7 @@
 }
 
 //BJDXZLYY-42：saveType：save保存，saveAndInvoice保存并继续发货，saveAndPrintPage保存并打印当前页，saveAndPrintAll保存并打印所有
-function doSaveAction(form,window,saveType){
+function doSaveAction(form,window,saveType,allowInvoiceStorageLocGoodsWithOutChangeStorageLoc){
 	if (!form.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;
@@ -1097,6 +1097,11 @@
 	if(!bool){
 		return false;
 	}
+
+	//BJDXZLYY-46：保存时二次提醒用户相关物品不会更改托盘位置
+	if(allowInvoiceStorageLocGoodsWithOutChangeStorageLoc){
+		top.Ext.getCmp('allowInvoiceStorageLocGoodsWithOutChangeStorageLoc').setValue(true);
+	}
 	
 	getTousseGridData();
 	
@@ -1108,9 +1113,17 @@
 		waitMsg : '正在保存数据，请稍候',
 		waitTitle : '提交表单',
 		timeout:2.5*60*1000,
-		success : function(form, action) {
-			// 一定要事务提交成功才返回发货计划列表界面
-			showResult(action.result.message);
+		success : function(res, action) {
+			//BJDXZLYY-46：保存时二次提醒用户相关物品不会更改托盘位置
+			if(action.result.alertUserAllowInvoiceStorageLocGoodsWithOutChangeStorageLoc){
+				top.Ext.Msg.confirm('请确认', '已经存在申请科室库位中的物品，本次发货将不更改库房位置，是否继续？', function (btn) {
+					if (btn == 'yes') {
+						doSaveAction(form,window,saveType,true);
+					}
+				})
+			}else {
+				showResult(action.result.message);
+			}
 			if(action.result.success){
 				if(sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer){
 					var storageLocationName = top.Ext.getCmp('storageLocationName').getRawValue();
@@ -1140,9 +1153,18 @@
 				}
 			}
 		},
-		failure : function(form, action) {
+		failure : function(res, action) {
 			if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.message)){
-				showResult(action.result.message);
+				//BJDXZLYY-46：保存时二次提醒用户相关物品不会更改托盘位置
+				if(action.result.alertUserAllowInvoiceStorageLocGoodsWithOutChangeStorageLoc){
+					top.Ext.Msg.confirm('请确认', '已经存在申请科室库位中的物品，本次发货将不更改库房位置，是否继续？', function (btn) {
+						if (btn == 'yes') {
+							doSaveAction(form,window,saveType,true);
+						}
+					})
+				}else {
+					showResult(action.result.message);
+				}
 			}else{
 				showResult("发货超时，请稍后查看发货单以确定发货是否成功，避免重复发货!");
 				window.close();
@@ -1390,6 +1412,10 @@
 					name : 'sendOutGoodsStoreData',
 					id : 'sendOutGoodsStoreData'
 				},{
+					xtype : 'hidden',
+					name : 'allowInvoiceStorageLocGoodsWithOutChangeStorageLoc',
+					id : 'allowInvoiceStorageLocGoodsWithOutChangeStorageLoc'
+				},{
 					xtype :'hidden',
 					name : 'recyclingappStoreData',
 					id : 'recyclingappStoreData'