Index: ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java =================================================================== diff -u -r17970 -r18006 --- ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 17970) +++ ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 18006) @@ -92,8 +92,23 @@ public Set getDisinfectionTousseBarcodes() { return getTousseBarcodesByTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); } - /** + * 获取消毒物品固定条码 + * + */ + public String getDisinfectionTousseFixedBarcode() { + for (JSONObject jsonObject : tousseInfo) { + String tousseType = jsonObject.optString("tousseType"); + String isTraceable = jsonObject.optString("isTraceable"); + if (StringUtils.equals(tousseType, TousseDefinition.PACKAGE_TYPE_DISINFECTION) && StringUtils.equals(isTraceable, TousseDefinition.STR_NO)) { + String barcode = jsonObject.optString("barcode"); + return barcode; + } + } + return null; + } + + /** * 获取外来器械条码 * */ Index: ssts-selenium-test/src/test/java/test_4_1/Delivery.java =================================================================== diff -u -r17970 -r18006 --- ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 17970) +++ ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 18006) @@ -70,8 +70,9 @@ + "\n"); Utils.retryingFind(By.id("scanText")).clear(); + String barcode = Utils.getSeleniumRuntimeData().getDisinfectionTousseFixedBarcode(); // 固定条码 - Utils.retryingFindAndSendKeys(By.id("scanText"),"010016005" + "\n"); + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); // 点击保存按钮 Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));