Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r21831 -r21832
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 21831)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 21832)
@@ -745,6 +745,15 @@
      * @return
      */
     public boolean checkTousseInsBarcodeIsTraceable(String barcode);
+
     
+    /**
+     * 多次扫描固定条码，累加数量
+     * @param fixedBarcode 固定条码
+     * @param barcodes 已有的条码集合，用逗号分割
+     * @return
+     */
+    public String scanFixedBarcode(String fixedBarcode, String barcodes);
+    
 }
 
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r21831 -r21832
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 21831)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 21832)
@@ -1771,5 +1771,27 @@
 	    StrutsResponseUtils.output(result);
 	}
 	
+    /**
+     * 多次扫描固定条码，累加数量
+     * @param fixedBarcode 固定条码
+     * @param barcodes 已有的条码集合，用逗号分割
+     * @return
+     */
+	public void scanFixedBarcode(){
+	    String fixedBarcode = StrutsParamUtils.getPraramValue("fixedBarcode", "");//固定条码
+        String myBarcodes = StrutsParamUtils.getPraramValue("myBarcodes", "");//已扫描的条码集合
+        myBarcodes = myBarcodes.replace("\"","").replace("[","").replace("]","").replace(" ", "");
+        String barcodeResult = tousseInstanceManager.scanFixedBarcode(fixedBarcode,myBarcodes);
+        if("0"==barcodeResult){
+            JSONObject jSONObj = JSONUtil.buildJsonObject(false, "已经全部加载完毕");
+            StrutsResponseUtils.output(jSONObj);
+        }else if("-1"==barcodeResult){
+            JSONObject jSONObj = JSONUtil.buildJsonObject(false, "-1");
+            StrutsResponseUtils.output(jSONObj);
+        }
+        JSONObject jSONObj = JSONUtil.buildJsonObject(true, barcodeResult);
+        StrutsResponseUtils.output(jSONObj);
+	}
 	
+	
 }
\ No newline at end of file
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r21831 -r21832
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 21831)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 21832)
@@ -259,6 +259,8 @@
 					}
 				}
 			}
+			
+
 			Map<String,String> barcodePositionMap = new HashMap<String,String>();
 			// barcodePositionInfo 前台传入的格式 barcode,position;barcode2,position2;
 			String[] barcodePositionArray = StringUtils.split(barcodePositionInfo,
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r21831 -r21832
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21831)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21832)
@@ -3845,4 +3845,45 @@
             }
         }
     }
+    
+    
+    /**
+     * 多次扫描固定条码，累加数量
+     * @param fixedBarcode 固定条码
+     * @param barcodes 已有的条码集合，用逗号分割
+     * @return
+     */
+    @Override
+    public String scanFixedBarcode(String fixedBarcode, String barcodes) {
+        if(!StringUtils.isNotBlank(barcodes) || !StringUtils.isNotBlank(fixedBarcode)){
+            return "-1";
+        }
+        List<String> barcodeList =getTousseInsDataByFixedBarcode(fixedBarcode,barcodes,"灭菌记录"); //库存
+
+
+        if(barcodeList.size()==0){
+            return "0";
+        }
+        String id = checkIsFixedBarcode(fixedBarcode);
+        TousseDefinition ti=new TousseDefinition();
+        if(StringUtils.isNotBlank(id)){
+            ti= (TousseDefinition) objectDao.getByProperty(TousseDefinition.class.getSimpleName(), "id", Long.parseLong(id));
+        }
+        String resultStr="";
+        
+        if(StringUtils.isNotBlank(barcodes)){
+            //如果库存小于每次扫描的数量，则将剩余的库存全部加载
+            if(barcodeList.size()<ti.getScanAmount()){
+                for(int i =0;i<barcodeList.size();i++){
+                    resultStr+=barcodeList.get(i)+",";
+                }  
+            }else{//否则按定义好的扫描数量数量加载
+                for(int i =0;i<ti.getScanAmount();i++){
+                    resultStr+=barcodeList.get(i)+",";
+                } 
+            }
+            return resultStr = resultStr.substring(0,resultStr.length() - 1).replace(" ", "");
+        }
+        throw new RuntimeException("没有可以增加的数量");
+    }
 }
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r21831 -r21832
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21831)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21832)
@@ -511,7 +511,73 @@
     DWREngine.setAsync(true);
     return canAddTousse;
 }
+
+
 /**
+ * 针对固定条码多次扫描,累加数量
+ * @param fixedBarcode
+ */
+function scanFixedBarcode(fixedBarcode){
+    Ext.Ajax.request({
+        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!scanFixedBarcode.do',
+        params : {
+            fixedBarcode :fixedBarcode,
+            myBarcodes: JSON.stringify(myBarcodes)//将数组已json格式传入后台
+        },
+        waitMsg : '正在处理,请稍候...',
+        success : function(response, options) {
+            var result = Ext.decode(response.responseText);
+            if(result.success){
+                var newBarcode = result.message.split(",")
+                myBarcodes=myBarcodes.concat(newBarcode);//将返回的条码添加到全局中
+                updateLeftNodeAmount(newBarcode.length,fixedBarcode)//累加数量
+            }else{
+                showResult(result.message);
+            }
+        },
+        failure : function(response, options) {
+            showResult("系统发生异常，请勿提交数据");
+            formObj.getEl().unmask();
+        }
+    });
+}
+
+
+/**
+ * 修改左边节点的数量
+ */
+function updateLeftNodeAmount(addAmount,fixedBarcode){
+    var rootNode = sterilizationColumnTree.getRootNode();
+    var  i =0
+    rootNode.eachChild(function(pNode){
+        if (pNode != null && pNode.attributes && pNode.attributes.barcode){
+            if(pNode.attributes.barcode == fixedBarcode && i<1) {//找到对应的条码  
+                i++
+                var isParentNode = pNode.attributes.isParentNode;
+                var typeForSterilizationStatistics =pNode.attributes.typeForSterilizationStatistics;
+                var department = pNode.attributes.depart;
+                var position = pNode.attributes.position ;
+                var amount = parseInt(pNode.attributes.amount)+parseInt(addAmount);
+                var reviewTime = pNode.attributes.reviewTime ;
+                var stockAmount = pNode.attributes.stockAmount ;
+                var todayAmount = pNode.attributes.todayAmount ;
+                var barcode = pNode.attributes.barcode ;
+                var name = pNode.attributes.name ;
+                
+                var rootNode = sterilizationColumnTree.getRootNode();
+                var parentNode = createNode(true, barcode, name, typeForSterilizationStatistics, department, '器械包', position, amount, reviewTime,stockAmount,todayAmount);
+                var firstChildNode = rootNode.item(0);
+                pNode.remove();//删除修改后的节点数据
+                rootNode.appendChild(parentNode);//追加修改前的数据
+            }  
+        }
+    });
+    statisticsTousseAndBasket();//统计总数量
+}
+
+
+
+/**
  * 扫描器械包、灭菌篮筐、虚拟篮筐的条码（注意：如果config的配置是强制要扫描位置的，则需要先扫描位置）
  * @param barcodeStr            器械包、灭菌篮筐、虚拟篮筐（还有可能是器械包或者虚拟篮筐的条码段）
  * @param sterilizationRecordId 灭菌记录id
@@ -526,36 +592,20 @@
             }
         }
     }
-//    if(myFixedBarcodes.indexOf(barcodeStr)!=-1){
-//        scanFixedBarcode(barcodeStr)
-//        addTousseInsAmount(barcodeStr,1);
-//        alert(myBarcodes)
-//    }else{
-//        Ext.Ajax.request({ 
-//            url : WWWROOT + '/disinfectSystem/tousseInstanceAction!equalsBarcode.do?',
-//            cache:false, 
-//            async:false, 
-//            params : {
-//                barcode : barcodeStr
-//            },
-//             success:function(response, options){ 
-//                 var result = Ext.decode(response.responseText);
-//                 loadTousseInstance(barcodeStr,sterilizationRecordId,result.success);
-//            },
-//            failure : function(response, options) {
-//                showResult(result);
-//            }
-//        });   
-//    }
     
+    //如果扫描固定条码，发现已存在，则累加数量
+    if(myFixedBarcodes.indexOf(barcodeStr)!=-1){
+        scanFixedBarcode(barcodeStr,myBarcodes)
+    }else{
+        loadTousseInstance(barcodeStr,sterilizationRecordId,false);
+    }
     
-    loadTousseInstance(barcodeStr,sterilizationRecordId,false);
+    
+    //loadTousseInstance(barcodeStr,sterilizationRecordId,false);
 }
 
 
-function isFixedBarcode(barcodeStr){
 
-}
 
 
 /**
@@ -730,7 +780,7 @@
                         }else if (surplusAmount<=amount){
                             finalAmount = surplusAmount
                         } 
-                        removeAndUpdateAmountToFixedBarcodes(tousseBarcode,finalAmount)//针对不追溯的包，动态修改右边对应的数量
+                        //removeAndUpdateAmountToFixedBarcodes(tousseBarcode,finalAmount)//针对不追溯的包，动态修改右边对应的数量
                     }
                     Array.prototype.push.apply(myBarcodes,myBarcodes2);//将所有的包实例条码存入全局条码中
                     speakContent = sterilizationColumnTree.getRootNode().text;
@@ -1423,6 +1473,9 @@
     var delAmount = clickNode.attributes.amount
     var fixedBarcode = clickNode.attributes.barcode
     delTousseInsAmount(delAmount,fixedBarcode);
+    clickNode.remove();//将当前节点移除
+    statisticsTousseAndBasket(); 
+    return;//第一版先不做右边的处理
     //addPendingStarilizationGoodsFromRecord(clickNode);
     Ext.Ajax.request({
         url :  WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getTousseInsAmountByBarcode.do',
@@ -1437,7 +1490,7 @@
                 fixedBarcodeAmount = result.message;
                 if(delAmount==fixedBarcodeAmount){
                     //setAmountToFixedBarcodes(fixedBarcode,fixedBarcodeAmount)
-                    removeAndUpdateAmountToFixedBarcodes(fixedBarcode,delAmount)
+                    removeAndUpdateAmountToFixedBarcodes(fixedBarcode,delAmount)//右边数量，先屏蔽
                 }/*else{
                     removeAndUpdateAmountToFixedBarcodes(fixedBarcode,delAmount,false)
                 }*/
@@ -1476,9 +1529,12 @@
             var result = Ext.decode(response.responseText);
             if(result.success){
                 if(typeof(result.message)=="undefined" || result.message==""){ 
-                    myBarcodes=[]; 
+                    myBarcodes=[];
+                    myFixedBarcodes=[];
                 }else{
                     myBarcodes = result.message.split(",")
+                    //removeByValue()
+                    myFixedBarcodes.removeByValue(fixedBarcode);//从全局固定条码集合中移除
                 }
             }else{
                 showResult("减少数量失败，请勿提交数据");
@@ -1494,6 +1550,32 @@
 
 
 /**
+ * 删除数组的定义元素
+ */
+/*function removeByValue(arr, val) {
+    for(var i=0; i<arr.length; i++) {
+      if(arr[i] == val) {
+        arr.splice(i, 1);
+        break;
+      }
+    }
+  }*/
+
+
+Array.prototype.removeByValue = function(val) {
+    for(var i=0; i<this.length; i++) {
+      if(this[i] == val) {
+        this.splice(i, 1);
+        break;
+      }
+    }
+  }
+
+
+
+
+
+/**
  * 新增或者修改
  * @param id                灭菌记录的id
  * @param currentStatus     灭菌记录的状态
@@ -1599,7 +1681,7 @@
         var updateFail=function roleBack(){
             //克隆修改前的数据
             var isParentNode = editNode.attributes.isParentNode;
-            var typeForSterilizationStatistics ;
+            var typeForSterilizationStatistics = editNode.attributes.typeForSterilizationStatistics;
             var department = editNode.attributes.depart;
             var position = editNode.attributes.position ;
             var amount = editNode.attributes.amount ;
@@ -3121,7 +3203,7 @@
         top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo);
         Ext.getCmp("formSubmitResult").setValue(0);
         alert(result)
-        return
+        return;
         formObj.form
         .submit( {
             url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!savesterilizationRecord.do',