Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r29628 -r29711
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 29628)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 29711)
@@ -41,6 +41,7 @@
 		var statusInterrupt = "<%=SterilizationRecord.STERILIZATION_STATUS_INTERRUPT%>";//灭菌中断
 		var statusDraft = "<%=SterilizationRecord.STERILIZATION_STATUS_DRAFT%>";//暂存
 		var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';	//判断登录用户是否为供应室（包括一级供应室和二级供应室）
+		var maxScanAmount = "<%=SterilizationRecord.MAXSCANAMOUNT%>";//最大库存
 		var sterilizerStatus;
 		var SSTS_Sterilization_Create = true;
 		<operation:authorize ifAnyGranted="SSTS_Sterilization_Create">
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r29703 -r29711
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29703)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29711)
@@ -764,12 +764,34 @@
             var result = Ext.decode(response.responseText);
             if(result.success){
                 var newBarcode = result.message.split(",")
-                myBarcodes=myBarcodes.concat(newBarcode);//将返回的条码添加到全局中
                 var finalAmount = parseInt(newBarcode.length)//返回的条码数量
-                updateRigthFixedBarcodeAmount(fixedBarcode,finalAmount)//修改右边的数量
-                updateLeftFixedBarcodeAmount(fixedBarcode,finalAmount)//修改左边的数量
-                statisticsTousseAndBasket();//统计总数量
-
+                var rootNode = sterilizationColumnTree.getRootNode();
+                var isAll = false;
+                //循环左边的节点
+                rootNode.eachChild(function(pNode){
+                    if (pNode != null && pNode.attributes && pNode.attributes.barcode){
+                        if(pNode.attributes.barcode == fixedBarcode) { 
+                            var name = pNode.attributes.name ;
+                            var amount = parseInt(pNode.attributes.amount)+parseInt(finalAmount);//当前数量加上 扫描加载的数量
+                            if(parseInt(pNode.attributes.amount) == maxScanAmount){
+                                showResult(name+'已全部加载完毕');
+                                isAll = true;
+                                return
+                            }
+                            if(amount > maxScanAmount){
+                                var newAmount = finalAmount - (amount - maxScanAmount);
+                                newBarcode = newBarcode.splice(0,newAmount);
+                            }
+                        }  
+                    }
+                });
+                finalAmount = parseInt(newBarcode.length)//返回的条码数量
+                if(!isAll){
+                    myBarcodes=myBarcodes.concat(newBarcode);//将返回的条码添加到全局中
+                    updateRigthFixedBarcodeAmount(fixedBarcode,finalAmount)//修改右边的数量
+                    updateLeftFixedBarcodeAmount(fixedBarcode,finalAmount)//修改左边的数量
+                    statisticsTousseAndBasket();//统计总数量
+                }
             }else{
                 showResult(result.message, null , sstsConfig.messagePauseTimeOnSterilizationRecordPage);
             }
@@ -2006,6 +2028,15 @@
         rootNode.appendChild(parentNode);//追加修改前的数据
         sterilizationRecordWin.getEl().unmask();//关闭进度条
     }
+    if(newAmount > 2000){
+        showResult('器械包的数量不能超过2000');
+        sterilizationRecordWin.getEl().unmask();
+        updateFail();
+        top.Ext.getCmp('saveBtn').enable();
+        formObj.getEl().unmask();
+        statisticsTousseAndBasket();
+        return
+    }
     Ext.Ajax.request({
         url :  WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!fixedBarcodeBarcodeAdd.do',
         params : {