Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java =================================================================== diff -u -r26269 -r26293 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 26269) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java (.../SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java) (revision 26293) @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -58,18 +59,18 @@ int basketTousseCount = 50; //每个灭菌筐里的包实例的数量 int tousseCount = 1; //每种包定义的包实例的数量 int tousseDefCount = 1000; //包定义的数量 - doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount); + doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount,"24004"); } /** * 每种包定义一个包实例,包定义共1000个。共1000个篮筐，每篮筐装1个 */ @Test public void testWithDifferentOnceToussePerBasket(){ - int basketCount = 100; //灭菌筐的数量 + int basketCount = 25; //灭菌筐的数量 int basketTousseCount = 10; //每个灭菌筐里的包实例的数量 int tousseCount = 1; //每种包定义的包实例的数量 int tousseDefCount = 1000; //包定义的数量 - doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount); + doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount,"24005"); } /** * 多线程处理,共5个线程,每个线程创建1种包定义200个包实例,放入5个篮筐,每个篮筐20个包实例。另外100个包实例在篮筐外 @@ -90,7 +91,7 @@ runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() { @Override public void runTask() { - initMyData(basketCount); + initMyData(basketCount,null); initSterilizer(5); String orgUnitCode = AcegiHelper.getLoginUser() @@ -188,12 +189,12 @@ } } private void doMyTest(int basketCount, int basketTousseCount, - int tousseCount, int tousseDefCount) { + int tousseCount, int tousseDefCount, String barcodeStartStr) { //1.初始化基础数据 initCSSDData(); basketIndex = 0; - initMyData(basketCount); + initMyData(basketCount,barcodeStartStr); int barcodeStart = barcodeIndex; List tousseInstanceBarcodes = new ArrayList<>(); List containerBarcodes = new ArrayList<>(); @@ -222,10 +223,10 @@ } } } - private void initMyData(int basketCount) { + private void initMyData(int basketCount, String barcodeStartStr) { for(int i = 0;i < basketCount;++i){ Container container6 = new Container(); - container6.setBarcode(getBaseketBarcode(i)); + container6.setBarcode(getBaseketBarcode(i,barcodeStartStr)); container6.setContainerName("灭菌筐03"); container6.setPurpose(Container.CONTAINER_PURPOSE_DISINFECTION); container6.setContainerType(Container.CONTAINERTYPE_BASKET); @@ -234,8 +235,12 @@ containerManager.saveOrUpdate(container6); } } - private String getBaseketBarcode(int index){ - return "24003" + String.format("%04d", index); + private String getBaseketBarcode(int index, String barcodeStartStr){ + String startStr = "24003"; + if(StringUtils.isNotBlank(barcodeStartStr)){ + startStr = barcodeStartStr; + } + return startStr + String.format("%04d", index); } private String getTousseInstanceBarcode(int index){ return "11002" + String.format("%04d", index); @@ -250,7 +255,7 @@ private List getAllBaseketBarcodes(){ List barcodes = new ArrayList<>(); for(int i = 0;i < basketIndex;++i){ - barcodes.add(getBaseketBarcode(i)); + barcodes.add(getBaseketBarcode(i,null)); } return barcodes; } @@ -269,7 +274,7 @@ for(int j = 0;j < basketTousseCount;++j){ tousseBarcodes.add(getTousseInstanceBarcode(barcodeStart++)); } - String basketBarcode = getBaseketBarcode(getBasketIndex()); + String basketBarcode = getBaseketBarcode(getBasketIndex(),null); tousseInstanceManager.addTousseInstanceToBasket(basketBarcode, tousseBarcodes, null); containerBarcodes.add(basketBarcode); } @@ -385,7 +390,7 @@ int basketTousseCount = 0; //入灭菌筐里的包实例的数量 int tousseCount = 1000; //每种包定义的包实例的数量 int tousseDefCount = 1; //包定义的数量 - doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount); + doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount,null); } /** * 每种包定义一个包实例,包定义共1000个,都是篮筐外灭菌 @@ -396,7 +401,7 @@ int basketTousseCount = 0; //入灭菌筐里的包实例的数量 int tousseCount = 1; //每种包定义的包实例的数量 int tousseDefCount = 1000; //包定义的数量 - doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount); + doMyTest(basketCount, basketTousseCount, tousseCount, tousseDefCount,null); } /** @@ -413,7 +418,7 @@ initCSSDData(); basketIndex = 0; - initMyData(basketCount); + initMyData(basketCount,"24004"); int barcodeStart = barcodeIndex; List tousseInstanceBarcodes = new ArrayList<>(); List containerBarcodes = new ArrayList<>(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java =================================================================== diff -u -r26085 -r26293 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 26085) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java (.../PackingManagerTests.java) (revision 26293) @@ -161,7 +161,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord = new WashAndDisinfectRecord(); - washAndDisinfectRecord.setDisinfectIdentification(""); + washAndDisinfectRecord.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord.setDisinfectProgram(""); washAndDisinfectRecord.setOperator(""); washAndDisinfectRecord.setOrgUnitCoding(""); @@ -191,8 +191,8 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - jsonArray2.add(addRecyclingItem("019000001", "0", "呼吸机",td_呼吸机.getId(), 3, "消毒物品", "呼吸机", - 5, "019000001")); + jsonArray2.add(addRecyclingItem("019000002", "0", "呼吸机",td_呼吸机.getId(), 3, "消毒物品", "呼吸机", + 5, "019000002")); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -227,7 +227,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord2 = new WashAndDisinfectRecord(); - washAndDisinfectRecord2.setDisinfectIdentification(""); + washAndDisinfectRecord2.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord2.setDisinfectProgram(""); washAndDisinfectRecord2.setOperator(""); washAndDisinfectRecord2.setOrgUnitCoding(""); @@ -237,7 +237,7 @@ Map classifyBasketInfoMap2 = new HashMap(); //put对应回收单及其清洗篮筐 ClassifyBasket classifyBasket2 = classifyBasketList.get(0); - assertEquals(classifyBasket2.getContainerBarcode(), "019000001"); + assertEquals(classifyBasket2.getContainerBarcode(), "019000002"); classifyBasketInfoMap2.put(classifyBasket2.getId(), classifyBasket2); washAndDisinfectRecordManager .saveOrUpdateWashAndDisinfectRecordAndMaterials( @@ -390,7 +390,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord = new WashAndDisinfectRecord(); - washAndDisinfectRecord.setDisinfectIdentification(""); + washAndDisinfectRecord.setDisinfectIdentification("清洗机2"); washAndDisinfectRecord.setDisinfectProgram(""); washAndDisinfectRecord.setOperator(""); washAndDisinfectRecord.setOrgUnitCoding(""); @@ -420,8 +420,8 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - jsonArray2.add(addRecyclingItem("019000001", "0", "呼吸机",td_呼吸机.getId(), 3, "消毒物品", "呼吸机", - 5, "019000001")); + jsonArray2.add(addRecyclingItem("019000002", "0", "呼吸机",td_呼吸机.getId(), 3, "消毒物品", "呼吸机", + 5, "019000002")); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -456,7 +456,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord2 = new WashAndDisinfectRecord(); - washAndDisinfectRecord2.setDisinfectIdentification(""); + washAndDisinfectRecord2.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord2.setDisinfectProgram(""); washAndDisinfectRecord2.setOperator(""); washAndDisinfectRecord2.setOrgUnitCoding(""); @@ -466,7 +466,7 @@ Map classifyBasketInfoMap2 = new HashMap(); //put对应回收单及其清洗篮筐 ClassifyBasket classifyBasket2 = classifyBasketList.get(0); - assertEquals(classifyBasket2.getContainerBarcode(), "019000001"); + assertEquals(classifyBasket2.getContainerBarcode(), "019000002"); classifyBasketInfoMap2.put(classifyBasket2.getId(), classifyBasket2); washAndDisinfectRecordManager .saveOrUpdateWashAndDisinfectRecordAndMaterials( @@ -619,7 +619,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord = new WashAndDisinfectRecord(); - washAndDisinfectRecord.setDisinfectIdentification(""); + washAndDisinfectRecord.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord.setDisinfectProgram(""); washAndDisinfectRecord.setOperator(""); washAndDisinfectRecord.setOrgUnitCoding(""); @@ -649,8 +649,8 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - jsonArray2.add(addRecyclingItem("019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "Test开胸包", - 5, "019000001")); + jsonArray2.add(addRecyclingItem("019000002", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "Test开胸包", + 5, "019000002")); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -684,7 +684,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord2 = new WashAndDisinfectRecord(); - washAndDisinfectRecord2.setDisinfectIdentification(""); + washAndDisinfectRecord2.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord2.setDisinfectProgram(""); washAndDisinfectRecord2.setOperator(""); washAndDisinfectRecord2.setOrgUnitCoding(""); @@ -694,7 +694,7 @@ Map classifyBasketInfoMap2 = new HashMap(); //put对应回收单及其清洗篮筐 ClassifyBasket classifyBasket2 = classifyBasketList.get(0); - assertEquals(classifyBasket2.getContainerBarcode(), "019000001"); + assertEquals(classifyBasket2.getContainerBarcode(), "019000002"); classifyBasketInfoMap2.put(classifyBasket2.getId(), classifyBasket2); washAndDisinfectRecordManager .saveOrUpdateWashAndDisinfectRecordAndMaterials( @@ -837,7 +837,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord = new WashAndDisinfectRecord(); - washAndDisinfectRecord.setDisinfectIdentification(""); + washAndDisinfectRecord.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord.setDisinfectProgram(""); washAndDisinfectRecord.setOperator(""); washAndDisinfectRecord.setOrgUnitCoding(""); @@ -867,8 +867,8 @@ record2.setRecyclingUser("张雄"); JSONArray jsonArray2 = new JSONArray(); - jsonArray2.add(addRecyclingItem("019000001", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "Test开胸包", - 5, "019000001")); + jsonArray2.add(addRecyclingItem("019000002", "0", "Test开胸包",td_Test开胸包.getId(), 3, "器械包", "Test开胸包", + 5, "019000002")); JSONObject params2 = new JSONObject(); params2.put("tousseJson", jsonArray2); params2.put("errors",""); @@ -902,7 +902,7 @@ assertEquals(classifyBasketList.size(), 1); //调用清洗代码 WashAndDisinfectRecord washAndDisinfectRecord2 = new WashAndDisinfectRecord(); - washAndDisinfectRecord2.setDisinfectIdentification(""); + washAndDisinfectRecord2.setDisinfectIdentification("清洗机1"); washAndDisinfectRecord2.setDisinfectProgram(""); washAndDisinfectRecord2.setOperator(""); washAndDisinfectRecord2.setOrgUnitCoding(""); @@ -912,7 +912,7 @@ Map classifyBasketInfoMap2 = new HashMap(); //put对应回收单及其清洗篮筐 ClassifyBasket classifyBasket2 = classifyBasketList.get(0); - assertEquals(classifyBasket2.getContainerBarcode(), "019000001"); + assertEquals(classifyBasket2.getContainerBarcode(), "019000002"); classifyBasketInfoMap2.put(classifyBasket2.getId(), classifyBasket2); washAndDisinfectRecordManager .saveOrUpdateWashAndDisinfectRecordAndMaterials(