Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r35777 -r35787
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 35777)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 35787)
@@ -1362,7 +1362,14 @@
     var tousseInstan = tousseInstanMap.get(barcodeStr);
     //如果扫描固定条码，发现已存在，则累加数量
     if (tousseInstan && tousseInstan.isTraceable == '否') {
-        scanFixedBarcode(barcodeStr)
+        var hiddenSterilingMode2 = top.Ext.getCmp('hiddenSterilingMode2').getValue();
+        var sterilingMode = tousseInstan.sterilingMode;
+        var name = tousseInstan.objName;
+        if (sterilingMode !== hiddenSterilingMode2) {
+            noticeDiffSterilingMessage(top.Ext, getDiffSterilingModeMessage(name, sterilingMode, hiddenSterilingMode2));
+        } else {
+            scanFixedBarcode(barcodeStr)
+        }
     } else {//否则当唯一条码处理
         loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout);
     }
@@ -3305,6 +3312,8 @@
                 return;
             }
 
+            var hiddenSterilingMode2 = top.Ext.getCmp('hiddenSterilingMode2').getValue();
+
             //先将节点的条码存储到集合变量中
             var waitSterilingBarcodeArray = [];
             var fixedBarcodeArr = [];
@@ -3313,7 +3322,13 @@
                 if (cNode != null && cNode.attributes && cNode.attributes.objBarcode) {
                     var objBarcode = cNode.attributes.objBarcode;
                     if (cNode.attributes["isTraceable"] == '否') {
-                        fixedBarcodeArr.push(objBarcode);
+                        var sterilingMode = cNode.attributes["sterilingMode"];
+                        var name = cNode.attributes["objName"];
+                        if (sterilingMode !== hiddenSterilingMode2) {
+                            noticeDiffSterilingMessage(top.Ext, getDiffSterilingModeMessage(name, sterilingMode, hiddenSterilingMode2));
+                        } else {
+                            fixedBarcodeArr.push(objBarcode);
+                        }
                     } else {
                         waitSterilingBarcodeArray.push(objBarcode);
                     }
@@ -3348,7 +3363,6 @@
                                 showMultipleResult('篮筐内物品含有植入物，请做生物监测', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                             }
 
-                            var hiddenSterilingMode2 = top.Ext.getCmp('hiddenSterilingMode2').getValue();
                             var newDatas = [];
                             var barcodes = [];
                             for (var i = 0; i < result.datas.length; i++) {
@@ -3401,7 +3415,7 @@
 
                             if (newDatas.length > 0) {
                                 //将篮筐与器械包加载到灭菌列表中
-                                loadContainerAndTousseToGrid(result.datas);
+                                loadContainerAndTousseToGrid(newDatas);
                             }
                             if (barcodes.length > 0) {
                                 for (var i = 0; i < waitSterilingBarcodeArray.length; i++) {