Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r29364 -r29379
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29364)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29379)
@@ -295,7 +295,7 @@
     return node;
 }
 
-function createNodeForPendingStarilizationGoods(isParentNode,barcode,name,type,depart,reviewTime,amount){
+function createNodeForPendingStarilizationGoods(isParentNode,barcode,name,type,depart,reviewTime,amount,sterilingMode){
     var node;
     if(isParentNode==true){
         //创建父节点（灭菌筐节点或者没有入灭菌筐的器械包节点）
@@ -322,6 +322,7 @@
     node.attributes.depart = depart;
     node.attributes.reviewTime = reviewTime;
     node.attributes.objAmount = amount;
+    node.attributes.sterilingMode = sterilingMode;
     return node
 }
 
@@ -832,12 +833,13 @@
               var type = pNode.attributes.type;
               var depart = pNode.attributes.depart;
               var reviewTime = pNode.attributes.reviewTime;
+              var sterilingMode = pNode.attributes.sterilingMode;
               var amountRight = parseInt(pNode.attributes.objAmount);//右边的数量
               var rootNode = sterilizationColumnTree.getRootNode();
               pNode.remove();//移除对应右边的节点
               //修改数量 ：当前数量-扫描的数量 amountRight-scanAmount
               if(amountRight-scanAmount>0){
-                  var myNode = createNodeForPendingStarilizationGoods(true,fixedBarcode,name,type,depart,reviewTime,amountRight-scanAmount)
+                  var myNode = createNodeForPendingStarilizationGoods(true,fixedBarcode,name,type,depart,reviewTime,amountRight-scanAmount,sterilingMode)
                   pendingSterilizationColumnTree.getRootNode().appendChild(myNode);   
               }
           }
@@ -862,9 +864,9 @@
                 var stockAmount = pNode.attributes.stockAmount ;
                 var barcode = pNode.attributes.barcode ;
                 var name = pNode.attributes.name ;
-                
+                var sterilingMode = pNode.attributes.sterilingMode ;
                 var rootNode = sterilizationColumnTree.getRootNode();
-                var parentNode = createNode(true, barcode, name, typeForSterilizationStatistics, department, '器械包', position, amount, reviewTime,0,null);
+                var parentNode = createNode(true, barcode, name, typeForSterilizationStatistics, department, '器械包', position, amount, reviewTime,0,sterilingMode);
                 var firstChildNode = rootNode.item(0);
                 pNode.remove();//删除修改后的节点数据
                 rootNode.appendChild(parentNode);//追加修改前的数据
@@ -892,6 +894,7 @@
               var reviewTime = pNode.attributes.reviewTime;
               var amountRight = parseInt(pNode.attributes.objAmount);//右边的数量
               var rootNode = sterilizationColumnTree.getRootNode();
+              var sterilingMode = pNode.attributes.sterilingMode;
               pNode.remove();//移除对应右边的节点
               var resultAmount = 0;
               if(editType==1){//如果是增加了数量，则对应右边要减少
@@ -900,7 +903,7 @@
                   resultAmount = amountRight
               }
               if(resultAmount>0){
-                  var myNode = createNodeForPendingStarilizationGoods(true,fixedBarcode,name,type,"","",resultAmount)
+                  var myNode = createNodeForPendingStarilizationGoods(true,fixedBarcode,name,type,"","",resultAmount,sterilingMode)
                   pendingSterilizationColumnTree.getRootNode().appendChild(myNode);   
               }
           }
@@ -923,9 +926,9 @@
                     var stockAmount = pNode.attributes.stockAmount ;
                     var barcode = pNode.attributes.barcode ;
                     var name = pNode.attributes.name ;
-                    
+                    var sterilingMode = pNode.attributes.sterilingMode ;
                     var rootNode = sterilizationColumnTree.getRootNode();
-                    var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,"TOUSSE","","",editCompleteAmount)
+                    var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,"TOUSSE","","",editCompleteAmount,sterilingMode)
                     pendingSterilizationColumnTree.getRootNode().appendChild(myNode);   
                 }  
             }
@@ -1024,7 +1027,6 @@
             var speakContent = null;
             var speakBasket = new SpeakBasket();
             if (result && result != 'null') {
-            
             	var sterilingModeFromSterilingGoodsDetailGrid = getSterilingModeFromSterilingGoodsDetailGrid();
             	if(sterilingModeFromSterilingGoodsDetailGrid.length > 1){
 					showResult("该篮筐有多种不同灭菌方式的物品,不能装载器械包,请先将灭菌框内灭菌方式不同的物品移除!");
@@ -1237,6 +1239,7 @@
                         var reviewTime = tousseInstan.reviewTime;  //审核时间
                         var amount = parseInt(tousseInstan.amount || 0); //每次扫描数量
                         var stockAmount =parseInt(tousseInstan.stockAmount);//库存数量
+                        var sterilingMode =tousseInstan.sterilingMode;//灭菌方式
                         if(checkRepeat(tousseBarcode) && !isFiexdBarcode){
                             showResult("输入的条码已存在！", null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
                             sterilizationRecordWin.getEl().unmask();
@@ -1250,7 +1253,7 @@
                             myBarcodes3[0]=tousseInstan.tousseBarcode;//临时存放固定条码
                             //添加到灭菌物品视图列表的第一行
                             var rootNode = sterilizationColumnTree.getRootNode();
-                            var parentNode = createNode(true, tousseBarcode, tousseName, typeForSterilizationStatistics, "", '器械包', position, amount, reviewTime,stockAmount,null);
+                            var parentNode = createNode(true, tousseBarcode, tousseName, typeForSterilizationStatistics, "", '器械包', position, amount, reviewTime,stockAmount,sterilingMode);
                             var firstChildNode = rootNode.item(0);
                             if(firstChildNode == null || firstChildNode == undefined){//第一行数据为空
                                 rootNode.appendChild(parentNode);
@@ -1676,10 +1679,11 @@
                 var type = pNode.attributes.type;
                 var depart = pNode.attributes.depart;
                 var reviewTime = pNode.attributes.reviewTime;
+                var sterilingMode = pNode.attributes.sterilingMode;
                 var amount = parseInt(pNode.attributes.objAmount);//右边的数量
                 var rootNode = sterilizationColumnTree.getRootNode();
                 pNode.remove();//移除对应右边的节点
-                var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,type,depart,reviewTime,finalAmount)
+                var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,type,depart,reviewTime,finalAmount,sterilingMode)
                 pendingSterilizationColumnTree.getRootNode().appendChild(myNode); 
             }
         }
@@ -1703,11 +1707,12 @@
                 var type = pNode.attributes.type;
                 var depart = pNode.attributes.depart;
                 var reviewTime = pNode.attributes.reviewTime;
+                var sterilingMode = pNode.attributes.sterilingMode;
                 var amount = pNode.attributes.objAmount;//右边的数量
                 var rootNode = sterilizationColumnTree.getRootNode();
                 //var finalAmount = parseInt(amount)+parseInt(objAmount)
                 pNode.remove();//移除对应右边的节点
-                var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,type,depart,reviewTime,parseInt(objAmount))
+                var myNode = createNodeForPendingStarilizationGoods(true,barcode,name,type,depart,reviewTime,parseInt(objAmount),sterilingMode)
                 pendingSterilizationColumnTree.getRootNode().appendChild(myNode); 
             }
         }
@@ -1955,9 +1960,9 @@
         var amount = editNode.attributes.amount ;
         var reviewTime = editNode.attributes.reviewTime ;
         var stockAmount = editNode.attributes.stockAmount ;
-        
+        var sterilingMode = editNode.attributes.sterilingMode ;
         var rootNode = sterilizationColumnTree.getRootNode();
-        var parentNode = createNode(true, barcode, name, typeForSterilizationStatistics, department, '器械包', position, oldValue, reviewTime,stockAmount,null);
+        var parentNode = createNode(true, barcode, name, typeForSterilizationStatistics, department, '器械包', position, oldValue, reviewTime,stockAmount,sterilingMode);
         var firstChildNode = rootNode.item(0);
         editNode.remove();//删除修改后的节点数据
         rootNode.appendChild(parentNode);//追加修改前的数据