Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js
===================================================================
diff -u -r24954 -r24961
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24954)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24961)
@@ -183,6 +183,7 @@
     }
     $(function () {
         $.support.cors = true;
+
         dataView = new Slick.Data.DataView({ inlineFilters: true });
         grid = new Slick.Grid("#HomeMyGrid", dataView, columns, options);
         attachAutoResizeDataGrid(grid, "HomeMyGrid", "gridContainer");
@@ -505,63 +506,83 @@
 
 };
 //扫描条码
+var AllsterzationGood=[];
 $("#barCode").keydown(function(e){
     if(e.keyCode == 13){
-        if($('.repetitionBarCod').val()==$(this).val()){
-            alert('不能重复输入条码');
+        if($(this).val()==''){
+            alert('请输入条码');
             return false;
-        }else{
-            var addItem;
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-                type:"get",
-                dataType:'json',
-                data:{barcode:$(this).val()},
-                success:function(data){
-                    if(data.success==true){
-                        addItem = data.rows[0];
-                        console.log(addItem)
-                        if(data.barcodeType==='用户'){
-                            $('#sterilization').val(addItem.name);
-                            $('#barCode').val("");
-                            $('.repetitionBarCod').val($('#barCode').val())
-                            return false
-                        }
-                        if(data.barcodeType==='灭菌架'){
-                            $('#sterilization').val(addItem.name);
-                            $('#barCode').val("")
-                            $('.repetitionBarCod').val($('#barCode').val())
-                            return false
-                        }
-                        if(data.barcodeType==='器械包'){
-                            BasketData.push(addItem);
-                            addCleanBaskets(BasketData);
-                            $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
-                            $('.repetitionBarCod').val($('#barCode').val())
-                            $('#barCode').val("")
-                            addallTableDatas();
-                            return false
-                        }
-                        if(data.barcodeType==='灭菌篮筐'){
-                            BasketData.push(addItem);
-                            addCleanBaskets(BasketData);
-                            $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
-                            $('.repetitionBarCod').val($('#barCode').val())
-                            $('#barCode').val("")
-                            addallTableDatas();
+        } else{
+            if($('.repetitionBarCod').val()==$(this).val()){
+                alert('不能重复输入条码');
+                return false;
+            }else{
+                var addItem;
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                    type:"get",
+                    dataType:'json',
+                    data:{barcode:$(this).val()},
+                    success:function(data){
+                        if(data.success===true){
+                            addItem = data.rows[0];
+                            var AllBarcode =[];
+                            console.log(AllsterzationGood)
+                            for(var  i=0;i<AllsterzationGood.length;i++){
+                                AllBarcode.push(AllsterzationGood[i].barcode)
+                            }
+                            for(var j=0;j<AllBarcode.length;j++){
+                                if(AllBarcode[j]==$('#barCode').val()){
+                                    $('#barCode').val('')
+                                    alert('这条'+$('#barCode').val()+'已经存在表格中');
+                                    addCleanBaskets(AllsterzationGood);
+                                    return;
+                                }
+                            }
 
-                            return false
+                            if(data.barcodeType==='用户'){
+                                $('#sterilization').val(addItem.name);
+                                $('#barCode').val("");
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌架'){
+                                $('#sterilization').val(addItem.name);
+                                $('#barCode').val("")
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                return false
+                            }
+                            if(data.barcodeType==='器械包'){
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                                AllsterzationGood.push(addItem)
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                $('#barCode').val("")
+                                addallTableDatas();
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌篮筐'){
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                                AllsterzationGood.push(addItem)
+                                $('.repetitionBarCod').val($('#barCode').val())
+                                $('#barCode').val("")
+                                addallTableDatas();
+                                return false
+                            }
+
+                        } else{
+                            alert(data.message);
+                            return false;
                         }
 
-                    } else{
-                        alert(data.message);
-                        return false;
                     }
+                });
+                addCleanAfterAjax();
+            }
 
-                }
-            });
-            addCleanAfterAjax();
-            // $("#addCleanGetCode").val("");
         }
 
     }
@@ -572,7 +593,6 @@
     $('#sterilization').val(currentUserCode)//科室
     addCleanBasket();
     addallTableDatas()
-    // $("#addCleanGetCode").focus();
 })
 function addCleanBasket(){
     var mrdata = [];
@@ -1110,6 +1130,7 @@
         dataView2.setFilter(myFilter);
         sterilizationGird.render()
     }
+    var AllsterzationGood=[];
     var addItem;
     $.ajax({
         url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationGoods.mhtml',
@@ -1127,10 +1148,11 @@
                         additemGood.push(data.rows[i])
                         $('.AllData').val(JSON.stringify(additemGood))
                         BasketData.push(data.rows[i])
+                        AllsterzationGood.push(data.rows[i])
                     }
-                    console.log(BasketData)
                     addCleanBaskets(BasketData);
                     allTableDatas();
+
                 }
 
             } else{
@@ -1142,64 +1164,80 @@
     });
     $("#udbarCode").keydown(function(e){
         if(e.keyCode == 13){
-            if($('.repetitionBarCod').val()==$(this).val()){
-                alert('不能输入重复条码');
+            if($(this).val()==''){
+                alert('请输入条码');
                 return false;
             }else{
-                var addItem;
-                $.ajax({
-                    url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-                    type:"get",
-                    dataType:'json',
-                    data:{barcode:$(this).val()},
-                    success:function(data){
-                        if(data.success===true){
-                            addItem = data.rows[0];
-                            // additemGood.push(addItem)
-                            if(data.barcodeType==='用户'){
-                                $('#udsterilization').val(addItem.name);
-                                $('.repetitionBarCod').val($('#udbarCode').val())
-                                $('#udbarCode').val("");
-                                return false
-                            }
-                            if(data.barcodeType==='灭菌架'){
-                                $('#udsterilizationName').val(addItem.name);
-                                $('.repetitionBarCod').val($('#udbarCode').val())
-                                $('#udbarCode').val("")
-                                return false
-                            }
-                            if(data.barcodeType==='器械包'){
-                                additemGood.push(addItem)
-                                BasketData.push(addItem);
-                                addCleanBaskets(BasketData);
-                                $('.repetitionBarCod').val($('#udbarCode').val())
-                                $('#udbarCode').val("")
-                                $('.AllData').val(JSON.stringify(additemGood))
-                                allTableDatas();
-                                return false
-                            }
-                            if(data.barcodeType==='灭菌篮筐'){
-                                additemGood.push(addItem)
-                                BasketData.push(addItem);
-                                addCleanBaskets(BasketData);
-                                $('.repetitionBarCod').val($('#udbarCode').val())
-                                $('#udbarCode').val("")
-                                $('.AllData').val(JSON.stringify(additemGood))
-                                allTableDatas();
-                                return false
-                            }
+                if($('.repetitionBarCod').val()==$(this).val()){
+                    alert('不能输入重复条码');
+                    return false;
+                }else{
+                    var addItem;
+                    $.ajax({
+                        url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                        type:"get",
+                        dataType:'json',
+                        data:{barcode:$(this).val()},
+                        success:function(data){
+                            if(data.success===true){
+                                addItem = data.rows[0];
+                                var AllBarcode =[];
+                                for(var  i=0;i<AllsterzationGood.length;i++){
+                                    AllBarcode.push(AllsterzationGood[i].barcode)
+                                }
+                                for(var j=0;j<AllBarcode.length;j++){
+                                    if(AllBarcode[j]==$('#udbarCode').val()){
+                                        $('#barCode').val('')
+                                        alert('这条'+$('#barCode').val()+'已经存在表格中');
+                                        addCleanBaskets(AllsterzationGood);
+                                        return;
+                                    }
+                                }
 
-                        } else{
-                            alert(data.message);
-                            return false;
+                                if(data.barcodeType==='用户'){
+                                    $('#udsterilization').val(addItem.name);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    $('#udbarCode').val("");
+                                    return false;
+                                }
+                                if(data.barcodeType==='灭菌架'){
+                                    $('#udsterilizationName').val(addItem.name);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    $('#udbarCode').val("");
+                                    return false;
+                                }
+                                if(data.barcodeType==='器械包'){
+                                    additemGood.push(addItem);
+                                    BasketData.push(addItem);
+                                    addCleanBaskets(BasketData);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    AllsterzationGood.push(addItem);
+                                    $('#udbarCode').val("");
+                                    $('.AllData').val(JSON.stringify(additemGood));
+                                    allTableDatas();
+                                    return false;
+                                }
+                                if(data.barcodeType==='灭菌篮筐'){
+                                    additemGood.push(addItem);
+                                    BasketData.push(addItem);
+                                    addCleanBaskets(BasketData);
+                                    $('.repetitionBarCod').val($('#udbarCode').val());
+                                    AllsterzationGood.push(addItem);
+                                    $('#udbarCode').val("");
+                                    $('.AllData').val(JSON.stringify(additemGood));
+                                    allTableDatas();
+                                    return false;
+                                }
+                            } else{
+                                alert(data.message);
+                                return false;
+                            }
                         }
+                    });
+                    addCleanAfterAjax();
+                }
 
-                    }
-                });
-                addCleanAfterAjax();
-                // $("#addCleanGetCode").val("");
             }
-
         }
     });