Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r29941 -r29946
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29941)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29946)
@@ -830,9 +830,6 @@
                         finalAmount -= (leftFixedLenght+finalAmount)-2000;
                     }
                 }
-                console.log(leftFixedLenght)
-                console.log(rightFixedLenght)
-                console.log(finalAmount)
                 if(rightFixedLenght == 0){
                     showResult('已超过'+pNode.attributes.name+'的最大待灭菌物品总数'+leftFixedLenght+'！');
                 }
@@ -2491,6 +2488,19 @@
                     if(result && result.length > 0){
                         for(var i=0;i<result.length;i++){
                             if(result[i].unTraceable == '是'){
+                                if(!tousseInstanMap.has(result[i].barcode)){
+                                    var tousseInstan = {
+                                        objBarcode:result[i].barcode,
+                                        objName:result[i].name,
+                                        isTraceable:(result[i].unTraceable=='是')?'否':'是',
+                                        objAmount:result[i].amount,
+                                        reviewTime:'',
+                                        scanAmount:result[i].scanAmount,
+                                        typeForSterilizationStatistics:result[i].typeForSterilizationStatistics,
+                                        sterilingMode:result[i].sterilingMode
+                                    }
+                                    tousseInstanMap.set(result[i].barcode,tousseInstan);
+                                }
                                leftFixedBarcodeMap.set(result[i].barcode,result[i].amount);
                                leftFixedBarcodeMapBySterilization.set(result[i].barcode,result[i].amount);
                             }
@@ -2551,7 +2561,7 @@
             sterilizationRecordWin.getEl().unmask();
             return false;
         }
-        var rigthAmount = getRigthFixedBarcodeAmount(barcode);
+        var rigthAmount = getRigthFixedBarcodeAmount(barcode)>0?getRigthFixedBarcodeAmount(barcode):0;
         var fixedBarcode = attr.barcode;
         if (newAmount > oldAmount) {//如果是增加数量
             if(!rightFixedBarcodeMap.get(fixedBarcode) || rightFixedBarcodeMap.get(fixedBarcode) == 0){
@@ -2562,7 +2572,7 @@
             }
             var amount = parseInt(newAmount) - parseInt(oldAmount);
             var leftAmount = parseInt(getLeftFixedBarcodeAmount(barcode));
-            if (amount > rigthAmount) {
+            if (amount > rigthAmount || (amount + leftAmount > 2000)) {
                 var sumAmount = (leftAmount+rigthAmount)>2000?2000:(leftAmount+rigthAmount);
                 sterilizationRecordWin.getEl().unmask();
                 showResult('已超过'+attr.name+'的最大待灭菌物品总数'+sumAmount+'！');