Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r18735 -r18744 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18735) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18744) @@ -85,14 +85,14 @@ String tempBarcode = notEntryBasketTousseBarcods.get(0); Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, basketBarcode + "\n"); - int length = notEntryBasketTousseBarcods.size(); - for (int i = 0; i < length; i++) { +// int length = notEntryBasketTousseBarcods.size(); + for (int i = 0; i < 1; i++) { Utils.retryingFindAndDoAction(By.id("inputBarcode"), Utils.ACTION_SENDKEYS, notEntryBasketTousseBarcods.get(i) + "\n"); } -// Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), -// Utils.ACTION_CLICK); // 一键入炉 + Utils.retryingFindAndDoAction(By.id("btnBatchAddTousse"), + Utils.ACTION_CLICK); // 一键入炉 // 保存灭菌记录 Utils.retryingFindAndDoAction(By.id("saveBtn"), Utils.ACTION_CLICK); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r18735 -r18744 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18735) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18744) @@ -509,6 +509,11 @@ return; } + if(checkRepeat(barcodeStr)){ + showResult("输入的条码已存在!"); + return; + } + //当前灭菌程序是否可以添加灭菌物品 var canAddTousse = sterilizationCanAddTousse(); if(!canAddTousse){ @@ -532,10 +537,6 @@ saveBarcode : saveBarcode //此次扫描之前已经扫描的条码集合 }, success : function(response, options) { - if(checkRepeat(barcodeStr)){ - showResult("输入的条码已存在!"); - return; - }; var result = response.responseText; var speakContent = null; var speakBasket = new SpeakBasket(); @@ -969,7 +970,7 @@ } /** - * 条码重复性判断,如果是单个条码,则按原有逻辑处理,否则为不重复,需要在结果中判断 + * 验证条码是否已经扫描过(只支持单个条码,其他的条码不处理) * @param barcodeStr 可以是单个器械包/篮筐条码,也可以是首尾器械包/篮筐条码,用分号分隔 * @returns {Boolean} */