Index: ssts-web/src/main/resources/spring/test/applicationContext-test.xml =================================================================== diff -u -r17877 -r17881 --- ssts-web/src/main/resources/spring/test/applicationContext-test.xml (.../applicationContext-test.xml) (revision 17877) +++ ssts-web/src/main/resources/spring/test/applicationContext-test.xml (.../applicationContext-test.xml) (revision 17881) @@ -18,9 +18,9 @@ - + + - Index: ssts-web/src/main/java/test/forgon/disinfectsystem/sterilization/helper/SterilizationBusinessHelper.java =================================================================== diff -u --- ssts-web/src/main/java/test/forgon/disinfectsystem/sterilization/helper/SterilizationBusinessHelper.java (revision 0) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/sterilization/helper/SterilizationBusinessHelper.java (revision 17881) @@ -0,0 +1,58 @@ +package test.forgon.disinfectsystem.sterilization.helper; + + +import java.util.Date; + +import org.springframework.beans.factory.annotation.Autowired; + +import com.forgon.directory.model.BarcodeDevice; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.disinfectsystem.packing.service.PackingManager; +import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; +import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; +import com.forgon.runwithtrans.model.RunWithTransNewTask; +import com.forgon.runwithtrans.service.RunWithTransNewManager; +import com.forgon.serialnumber.model.SerialNum; +import com.forgon.serialnumber.service.SerialNumManager; + +/** + * 自动化测试-灭菌模块,需要的业务数据的辅助类,此辅助类需要Spring的容器环境 + * @author Chenjiaru + * + */ +public class SterilizationBusinessHelper { + @Autowired + protected RunWithTransNewManager runWithTransNewManager; + @Autowired + private PackingManager packingManager; + @Autowired + private TousseDefinitionManager tousseDefinitionManager; + @Autowired + private SerialNumManager serialNumManager; + @Autowired + private TousseInstanceManager tousseInstanceManager; + + /** + * 准备一个待灭菌的“审核篮筐” + */ + public void prepareWaitSterilizationOfReviewBasket() { + runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() { + @Override + public void runTask() { + //装配管理 + TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + TousseInstance ti_开胸包 = new TousseInstance(); + ti_开胸包.setTousseDefinition(td_开胸包); + ti_开胸包.setTousseName(td_开胸包.getName()); + ti_开胸包.setOperationTime(new Date()); + ti_开胸包.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE)); + ti_开胸包.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); + ti_开胸包.setStatus(TousseInstance.STATUS_PACKED); + tousseInstanceManager.saveOrUpdate(ti_开胸包); + //审核管理 + packingManager.reviewTousseInstance(ti_开胸包.getId().toString(), "018000001", "常规组", "cssduser1全名", "cssduser1", new Date()); + } + }); + } +} Fisheye: Tag 17881 refers to a dead (removed) revision in file `ssts-selenium-test/src/test/java/test_4_1/sterilization/helper/SterilizationBusinessHelper.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java =================================================================== diff -u -r17877 -r17881 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 17877) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 17881) @@ -6,8 +6,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import test.forgon.disinfectsystem.AbstractCSSDTest; +import test.forgon.disinfectsystem.sterilization.helper.SterilizationBusinessHelper; import test_4_1.Login; -import test_4_1.sterilization.helper.SterilizationBusinessHelper; import test_4_1.sterilization.service.Sterilization; import test_4_1.sterilization.service.impl.SterilizationImpl; import test_4_1.tools.Utils;