Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r41535 -r41541
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 41535)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 41541)
@@ -456,7 +456,7 @@
 				if(sstsConfig.enableAbnormalItemListFixedDisplay){
 					var typeInfoOnScanned = result.data[0].typeInfoOnScanned;
 					if (typeInfoOnScanned !== "orgUnit") {
-						if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.isUseAbnormalGoodsTable == true) {
+						if (sstsConfig.isUseAbnormalGoodsTable) {
 							//加入异常物品列表
 							if (result.data[0].barcode != null) {
 								addAbnormalGoods(result.data[0]);
@@ -492,7 +492,7 @@
 				}
 				if(sstsConfig.enableAbnormalItemListFixedDisplay){
 					if(goods.errorMsg){
-						if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.isUseAbnormalGoodsTable == true) {
+						if (sstsConfig.isUseAbnormalGoodsTable) {
 							addAbnormalGoods(goods);
 						}
 						if (sstsConfig.enableTheAlarmConfirmationDialogBoxPopsUpWhenTheShipmentScansAbnormalItems) {
@@ -1341,7 +1341,14 @@
 	});
 
 	function doSaveAction(printInvoiceCallback) {
-
+		//异常物品处理完毕与否
+		if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.enableAbnormalItemListFixedDisplay) {
+			var AbnormalGoodsNum = top.Ext.getCmp('sendOutAbnormalGoods').getStore();
+			if (AbnormalGoodsNum.getCount() > 0) {
+				showResult('请处理完异常物品再提交', null, sstsConfig.messagePauseTimeOnInvoiceplanPage);
+				return false;
+			}
+		}
 		if (!form.getForm().isValid()) {
 			showResult('请正确填写表单各值');
 			return false;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r41535 -r41541
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 41535)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 41541)
@@ -765,7 +765,7 @@
 				if (sstsConfig.enableAbnormalItemListFixedDisplay) {
 					var typeInfoOnScanned = result.data[0].typeInfoOnScanned;
 					if (typeInfoOnScanned !== "orgUnit") {
-						if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.isUseAbnormalGoodsTable == true) {
+						if (sstsConfig.isUseAbnormalGoodsTable) {
 							//加入异常物品列表
 							if (result.data[0].barcode != null) {
 								addAbnormalGoods(result.data[0]);
@@ -855,7 +855,7 @@
 
 				if (sstsConfig.enableAbnormalItemListFixedDisplay) {
 					if (goods.errorMsg) {
-						if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.isUseAbnormalGoodsTable == true) {
+						if (sstsConfig.isUseAbnormalGoodsTable) {
 							//加入异常物品列表
 							addAbnormalGoods(goods);
 						}
@@ -1110,6 +1110,14 @@
 
 //BJDXZLYY-42：saveType：save保存，saveAndInvoice保存并继续发货，saveAndPrintPage保存并打印当前页，saveAndPrintAll保存并打印所有
 function doSaveAction(form, window, saveType, allowInvoiceStorageLocGoodsWithOutChangeStorageLoc) {
+	//异常物品处理完毕与否
+	if (sstsConfig.isUseAbnormalGoodsTable && sstsConfig.enableAbnormalItemListFixedDisplay) {
+		var AbnormalGoodsNum = top.Ext.getCmp('sendOutAbnormalGoods').getStore();
+		if (AbnormalGoodsNum.getCount() > 0) {
+			showResult('请处理完异常物品再提交', null, sstsConfig.messagePauseTimeOnInvoiceplanPage);
+			return false;
+		}
+	}
 	if (!form.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;