Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r40813 -r40840
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 40813)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 40840)
@@ -1639,6 +1639,28 @@
             });
             DWREngine.setAsync(true);
         }
+
+        if(!isConfirm){
+			//DGSDBZXYY-260：增加装配人与审核人是否相同的检查
+			if (sstsConfig.operatorAndReviewerIsSameCheckMode == 1) {
+				if(operator == reviewer){
+					var tipsMsg = "装配人和审核人相同，是否继续操作？";
+					top.Ext4.MessageBox.confirm("请确认", tipsMsg, function (btn) {
+						if (btn == 'yes') {
+							splitForeignTousse_packingTousseBtnClick(btn, true);
+						}
+					})
+					return
+				}
+			} else if (sstsConfig.operatorAndReviewerIsSameCheckMode == 2) {//值为2：相同时进行提示，并且不允许进行下一步操作再提示信息
+				if(operator == reviewer){
+					var tipsMsg = "装配人和审核人相同，请更换人员！";
+					top.Ext4.MessageBox.alert('提示',tipsMsg);
+					return;
+				}
+			}
+		}
+        
         var params = {
             taskIds: ids,
             inspector: inspector,
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r40713 -r40840
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 40713)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 40840)
@@ -1466,7 +1466,7 @@
 	});
     
     // 装配按钮处理
-    function onPackingBtnClick(btn){
+    function onPackingBtnClick(btn, isConfirm){
 
     	if (!packingComboToussePanel.form.isValid()) {
             showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -1510,8 +1510,7 @@
         	showResult("装配物品不能为空！" , null , sstsConfig.messagePauseTimeOnPackingPage);
             return false;
         }
-        
-        
+
         operator = top.Ext4.getCmp('operator3').getValue();
         operatorCode = top.Ext4.getCmp('operatorCode3').getValue();
         reviewer = top.Ext4.getCmp('reviewer3').getValue();
@@ -1531,10 +1530,26 @@
 			});
         }
         
-        // 校验数量是否有效
-//        if(!isAmountSufficient()){
-//        	return false;
-//        }
+        if(!isConfirm){
+			//DGSDBZXYY-260：增加装配人与审核人是否相同的检查
+			if (sstsConfig.operatorAndReviewerIsSameCheckMode == 1) {
+				if(operator == reviewer){
+					var tipsMsg = "装配人和审核人相同，是否继续操作？";
+					top.Ext4.MessageBox.confirm("请确认", tipsMsg, function (btn) {
+						if (btn == 'yes') {
+							onPackingBtnClick(btn, true);
+						}
+					})
+					return
+				}
+			} else if (sstsConfig.operatorAndReviewerIsSameCheckMode == 2) {//值为2：相同时进行提示，并且不允许进行下一步操作再提示信息
+				if(operator == reviewer){
+					var tipsMsg = "装配人和审核人相同，请更换人员！";
+					top.Ext4.MessageBox.alert('提示',tipsMsg);
+					return;
+				}
+			}
+		}
         var comboToussePacking_depart = top.Ext4.getCmp('comboToussePacking_orgUnit').getRawValue();
         var comboToussePacking_departCoding = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
         if(isUndefinedOrNullOrEmpty(comboToussePacking_depart)){