Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r40802 -r40821
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40802)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40821)
@@ -5981,6 +5981,46 @@
 			onPackingTousseBtnClickComplete();
 			return;
 		}
+
+		var operator = '';
+		var reviewer = '';
+
+		if(Ext4.getCmp('operator').getValue()){
+			operator = Ext4.getCmp('operator').getValue();
+		}
+
+		if(Ext4.getCmp('reviewer').getValue()){
+			reviewer = Ext4.getCmp('reviewer').getValue();
+		}
+
+		//DGSDBZXYY-260：增加装配人与审核人是否相同的检查
+		if (sstsConfig.operatorAndReviewerIsSameCheckMode == 1) {
+			if(operator == reviewer){
+				var tipsMsg = "装配人和审核人相同，是否继续操作？";
+				Ext.MessageBox.confirm("请确认", tipsMsg, function (btn) {
+					if (btn == 'yes') {
+						showPackingTousseBtnClick_mask();
+						setTimeout(packingTousseBtnClick_DeferredExecution, 100);
+					}else {
+						onPackingTousseBtnClickComplete();
+					}
+				})
+				return
+			}
+        } else if (sstsConfig.operatorAndReviewerIsSameCheckMode == 2) {//值为2：相同时进行提示，并且不允许进行下一步操作再提示信息
+			if(operator == reviewer){
+				var tipsMsg = "装配人和审核人相同，请更换人员！";
+				Ext.Msg.show({
+					title: '提示',
+					msg: tipsMsg,
+					buttons: Ext.Msg.OK,// 指 确认按钮
+					icon: Ext.Msg.ERROR // 错误标识
+				});
+				onPackingTousseBtnClickComplete();
+				return;
+			}
+        }
+
 		showPackingTousseBtnClick_mask();
 		// 延迟100ms执行
 		setTimeout(packingTousseBtnClick_DeferredExecution, 100);