Index: ssts-selenium-test/src/test/java/test_4_1/Delivery.java =================================================================== diff -u -r17962 -r17970 --- ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 17962) +++ ssts-selenium-test/src/test/java/test_4_1/Delivery.java (.../Delivery.java) (revision 17970) @@ -93,7 +93,8 @@ Utils.retryingFind(By.id("scanText")).clear(); // 条码 - Utils.retryingFindAndSendKeys(By.id("scanText"),"010016000" + "\n"); + String barcode = Utils.getSeleniumRuntimeData().getDisinfectionTousseBarcode(); + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); // 点击保存按钮 Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]")); @@ -114,8 +115,8 @@ + "\n"); Utils.retryingFind(By.id("scanText")).clear(); - // 条码 - Utils.retryingFindAndSendKeys(By.id("scanText"),"010016006" + "\n"); + String barcode = Utils.getSeleniumRuntimeData().getForeignTousseBarcode(); + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); // 点击保存按钮 Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]")); @@ -125,6 +126,28 @@ } } /** + * 外部代理灭菌发货,TODO 需要申请回收清洗装配审核灭菌模块也初始化数据。 + * */ + @Test + public void Delivery_Foreignproxy() { + try { + + Utils.retryingFindAndSendKeys(By.id("senderBarcode"), + Utils.settings.getJSONObject("一级供应室用户").getString("条码") + + "\n"); + + Utils.retryingFind(By.id("scanText")).clear(); + String barcode = Utils.getSeleniumRuntimeData().getForeignproxyTousseBarcode(); + Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n"); + // 点击保存按钮 + Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]")); + + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + /** * 一级供应室发货 * */ @Test Index: ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java =================================================================== diff -u -r17962 -r17970 --- ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 17962) +++ ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java (.../SeleniumRuntimeData.java) (revision 17970) @@ -72,8 +72,71 @@ public Set getDressingTousseBarcodes() { return getTousseBarcodesByTousseType(TousseDefinition.PACKAGE_TYPE_DRESSING); } + + /** + * 获取消毒物品条码 + * + */ + public String getDisinfectionTousseBarcode() { + Set barcodeSet = getDisinfectionTousseBarcodes(); + if (barcodeSet.isEmpty()) { + return null; + } + return barcodeSet.iterator().next(); + } /** + * 获取消毒物品条码 + * + */ + public Set getDisinfectionTousseBarcodes() { + return getTousseBarcodesByTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); + } + + /** + * 获取外来器械条码 + * + */ + public String getForeignTousseBarcode() { + Set barcodeSet = getForeignTousseBarcodes(); + if (barcodeSet.isEmpty()) { + return null; + } + return barcodeSet.iterator().next(); + } + + /** + * 获取外来器械条码 + * + */ + public Set getForeignTousseBarcodes() { + Set pTousseTypes = new HashSet(); + pTousseTypes.add(TousseDefinition.PACKAGE_TYPE_FOREIGN); + pTousseTypes.add(TousseDefinition.PACKAGE_TYPE_SPLIT); + return getTousseBarcodesByTousseType(pTousseTypes); + } + + /** + * 获取外部代理灭菌条码 + * + */ + public String getForeignproxyTousseBarcode() { + Set barcodeSet = getForeignproxyTousseBarcodes(); + if (barcodeSet.isEmpty()) { + return null; + } + return barcodeSet.iterator().next(); + } + + /** + * 获取外部代理灭菌条码 + * + */ + public Set getForeignproxyTousseBarcodes() { + return getTousseBarcodesByTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); + } + + /** * 获取器械包条码 * */ @@ -90,4 +153,21 @@ } return barcodeSet; } + /** + * 获取器械包条码 + * + */ + public Set getTousseBarcodesByTousseType(Set pTousseTypes) { + Set barcodeSet = new HashSet(); + for (JSONObject jsonObject : tousseInfo) { + String tousseType = jsonObject.optString("tousseType"); + if (pTousseTypes.contains(tousseType)) { + String barcode = jsonObject.optString("barcode"); + if (StringUtils.isNotBlank(barcode)) { + barcodeSet.add(barcode); + } + } + } + return barcodeSet; + } }