Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r17652 -r17654 --- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17652) +++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 17654) @@ -80,6 +80,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; +import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; @@ -374,6 +375,7 @@ tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition1.setForDisplay(true); + tousseDefinition1.setPackageType("纸塑"); objectDao.saveOrUpdate(materialInstance1); @@ -418,6 +420,7 @@ tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition2.setForDisplay(true); + tousseDefinition2.setPackageType("纸塑"); materialInstances = new ArrayList(); materialInstances.add(materialInstance2); @@ -457,6 +460,7 @@ tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition3.setForDisplay(true); + tousseDefinition3.setPackageType("纸塑"); materialInstances = new ArrayList(); materialInstances.add(materialInstance3); @@ -466,9 +470,6 @@ objectDao.saveOrUpdate(materialInstance3); tousseDefinitionManager.saveOrUpdate(tousseDefinition3); - - - } /** @@ -1906,12 +1907,12 @@ } }); } - + /** * 初始化器械材料及包定义(11个) * 器械材料： * 【Test镊子】、【Test钳子】、【Test棉球】、【Test胆道探条】 - * 【Test静脉拉钩】（1对）、【Test取石钳】（1对）、【Test拉钩】 + * 【Test静脉拉钩（1对）】、【Test取石钳（1对）】、【Test拉钩】、【棉布】 * 器械包： * Test开胸包（术科组） * 【Test镊子】 * 2 @@ -1944,7 +1945,6 @@ TousseGroup group2 = new TousseGroup(); group2.setTousseGroupName("普通批"); - objectDao.save(group2); MaterialDefinition materialDefinition1 = new MaterialDefinition(); @@ -2000,6 +2000,7 @@ materialDefinition8.setType("布类"); materialDefinition8.setSpelling("TEATNZ"); materialDefinitionManager.saveOrUpdate(materialDefinition8); + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~下面是器械包定义~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// TousseDefinition tousseDefinition1 = new TousseDefinition(); tousseDefinition1.setName("Test开胸包"); @@ -2018,8 +2019,11 @@ tousseDefinition1.setIsTraceable(TousseDefinition.STR_YES); tousseDefinition1.setIsCustomPacking(TousseDefinition.STR_YES); tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); // 自动入筐的数量 tousseDefinition1.setPackingAmountPerVirtualBasket(5); + //包装类型 + tousseDefinition1.setPackageType("纸塑"); MaterialInstance materialInstance1 = new MaterialInstance(); materialInstance1.setTousse(tousseDefinition1); @@ -2039,17 +2043,6 @@ tousseDefinition1.getMaterialInstances().add(materialInstance2); tousseDefinitionManager.saveOrUpdate(tousseDefinition1); - // 器械包实例？ -// TousseInstance tousseInstance = new TousseInstance(); -// tousseInstance.setUnTraceableTousse(true); -// tousseInstance.setTousseName(tousseDefinition1.getName()); -// tousseInstance.setBarcode("020020379"); -// tousseInstance.setTousseDefinition(tousseDefinition1); -// tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED); -// tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); -// tousseInstanceManager.saveOrUpdate(tousseInstance); - - TousseDefinition tousseDefinition2 = new TousseDefinition(); tousseDefinition2.setName("Test开颅包"); tousseDefinition2.setTaskGroup("术科组"); @@ -2060,13 +2053,15 @@ tousseDefinition2.setSpelling("testklb"); tousseDefinition2.setWbCode("testghq"); tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition2.setExternalCode("1002GYT2AA"); //是否整包清洗 tousseDefinition2.setIsCleanedEntirely(TousseDefinition.STR_NO); tousseDefinition2.setIsCustomPacking(TousseDefinition.STR_YES); - //是否追朔 tousseDefinition2.setIsTraceable(TousseDefinition.STR_YES); + //包装类型 + tousseDefinition2.setPackageType("纸塑"); MaterialInstance materialInstance3 = new MaterialInstance(); materialInstance3.setMaterialDefinition(materialDefinition2); @@ -2095,6 +2090,10 @@ tousseDefinition2.getMaterialInstances().add(materialInstance55); tousseDefinition2.getMaterialInstances().add(materialInstance66); tousseDefinitionManager.saveOrUpdate(tousseDefinition2); + //为“Test开颅包”绑定一个标识牌 + IDCardDefinition iDCardDefinition = new IDCardDefinition(); + iDCardDefinition.setTousseDefinitionID(tousseDefinition2.getId()); + objectDao.saveOrUpdate(iDCardDefinition); TousseDefinition tousseDefinition3 = new TousseDefinition(); @@ -2108,18 +2107,19 @@ tousseDefinition3.setWbCode("testgkq"); tousseDefinition3.setExternalCode("1003GYT3AA"); tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); // 自动入筐的数量 tousseDefinition3.setPackingAmountPerVirtualBasket(20); - //是否整包清洗 tousseDefinition3.setIsCleanedEntirely(TousseDefinition.STR_YES); tousseDefinition3.setIsCustomPacking(TousseDefinition.STR_YES); //是否追朔 tousseDefinition3.setIsTraceable(TousseDefinition.STR_YES); - //是否转换申请单设置为是(便于使用记录进行测试) tousseDefinition3.setIsConvertApplyGoods(TousseDefinition.STR_YES); - + //包装类型 + tousseDefinition3.setPackageType("纸塑"); + MaterialInstance materialInstance5 = new MaterialInstance(); materialInstance5.setMaterialDefinition(materialDefinition1); materialInstance5.setCount(1); @@ -2144,15 +2144,16 @@ tousseDefinition4.setWbCode("testpgq"); tousseDefinition4.setExternalCode("9001GYT4AA"); tousseDefinition4.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition4.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); // 自动入筐的数量 tousseDefinition4.setPackingAmountPerVirtualBasket(33); - //是否整包清洗 tousseDefinition4.setIsCleanedEntirely(TousseDefinition.STR_NO); tousseDefinition4.setIsCustomPacking(TousseDefinition.STR_NO); - //是否转换申请单设置为否(便于使用记录进行测试) tousseDefinition4.setIsConvertApplyGoods(TousseDefinition.STR_NO); + //包装类型 + tousseDefinition4.setPackageType("纸塑"); MaterialInstance materialInstance7 = new MaterialInstance(); materialInstance7.setMaterialDefinition(materialDefinition2); @@ -2162,8 +2163,7 @@ materialInstance8.setMaterialDefinition(materialDefinition3); materialInstance8.setCount(4); - tousseDefinition4 - .setMaterialInstances(new ArrayList()); + tousseDefinition4.setMaterialInstances(new ArrayList()); tousseDefinition4.getMaterialInstances().add(materialInstance7); tousseDefinition4.getMaterialInstances().add(materialInstance8); tousseDefinitionManager.saveOrUpdate(tousseDefinition4); @@ -2177,14 +2177,13 @@ tousseDefinition5.setSpelling("testordjy"); tousseDefinition5.setWbCode("testorelw"); tousseDefinition5.setExternalCode("9002GYT20AA"); - tousseDefinition5.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); - // 自动入筐的数量设置为0，表示不启用自动入筐功能 tousseDefinition4.setPackingAmountPerVirtualBasket(0); - //是否整包清洗 tousseDefinition5.setIsCleanedEntirely(TousseDefinition.STR_YES); tousseDefinition5.setIsCustomPacking(TousseDefinition.STR_NO); + //包装类型 + tousseDefinition5.setPackageType("纸塑"); MaterialInstance materialInstance9 = new MaterialInstance(); materialInstance9.setMaterialDefinition(materialDefinition4); @@ -2209,11 +2208,12 @@ tousseDefinition6.setTousseGroupName("普通批"); tousseDefinition6.setExternalCode("EX001"); tousseDefinition6.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - //是否整包清洗 tousseDefinition6.setIsCleanedEntirely(TousseDefinition.STR_YES); tousseDefinition6.setIsCustomPacking(TousseDefinition.STR_NO); - + //包装类型 + tousseDefinition6.setPackageType("纸塑"); + MaterialInstance materialInstance11 = new MaterialInstance(); materialInstance11.setMaterialDefinition(materialDefinition4); materialInstance11.setCount(7); @@ -2250,13 +2250,15 @@ tousseDefinition7.setSpelling("testzlj"); tousseDefinition7.setWbCode("testzlj"); tousseDefinition7.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition7.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition7.setExternalCode("1009"); //是否整包清洗 tousseDefinition7.setIsCleanedEntirely(TousseDefinition.STR_NO); tousseDefinition7.setIsCustomPacking(TousseDefinition.STR_YES); - //是否追朔 tousseDefinition7.setIsTraceable(TousseDefinition.STR_NO); + //包装类型 + tousseDefinition7.setPackageType("纸塑"); MaterialInstance materialInstance100 = new MaterialInstance(); materialInstance100.setMaterialDefinition(materialDefinition2); @@ -2277,8 +2279,8 @@ tousseDefinition8.setTousseGroupID(group2.getId()); tousseDefinition8.setTousseGroupName("普通批"); tousseDefinition8.setAssetsBelong(Constants.ORG_UNIT_NAME_DISINFECT); - tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_NAME_DISINFECT); - tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition8.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition8.setIncludeImplant(0); tousseDefinition8.setIsCleanedEntirely("是"); tousseDefinition8.setIsCustomPacking("否"); @@ -2289,6 +2291,8 @@ tousseDefinition8.setTaskGroup("灭菌组"); tousseDefinition8.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); materialInstance15.setTousse(tousseDefinition8); + //包装类型 + tousseDefinition8.setPackageType("纸塑"); tousseDefinitionManager.saveOrUpdate(tousseDefinition8); TousseDefinition tousseDefinition9 = new TousseDefinition(); @@ -2297,11 +2301,13 @@ tousseDefinition9.setIsCleanedEntirely("是"); tousseDefinition9.setTaskGroup("器械组"); tousseDefinition9.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseDefinition9.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); + tousseDefinition9.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); tousseDefinition9.getMaterialInstances().add(materialInstance1); tousseDefinition9.getMaterialInstances().add(materialInstance2); + //包装类型 + tousseDefinition9.setPackageType("纸塑"); tousseDefinitionManager.saveOrUpdate(tousseDefinition9); //新增加清创包与宫碘包的定义以支撑各个测试用的用例数据 @@ -2311,9 +2317,11 @@ tousseDefinition10.setIsCleanedEntirely("是"); tousseDefinition10.setTaskGroup("器械组"); tousseDefinition10.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition10.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseDefinition10.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); - + tousseDefinition10.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition10.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); + //包装类型 + tousseDefinition10.setPackageType("纸塑"); + tousseDefinition10.getMaterialInstances().add(materialInstance1); tousseDefinition10.getMaterialInstances().add(materialInstance2); tousseDefinitionManager.saveOrUpdate(tousseDefinition10); @@ -2324,19 +2332,20 @@ tousseDefinition11.setIsCleanedEntirely("是"); tousseDefinition11.setTaskGroup("器械组"); tousseDefinition11.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT); - + tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD); + tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD); + //包装类型 + tousseDefinition11.setPackageType("纸塑"); + tousseDefinition11.getMaterialInstances().add(materialInstance1); tousseDefinition11.getMaterialInstances().add(materialInstance2); tousseDefinitionManager.saveOrUpdate(tousseDefinition11); List tList = tousseDefinitionManager.findTousseDefinitionList(); assertNotNull(tList); assertEquals(tList.size(), 11); - - } + /* * 初始化所有器械包定义 */