Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js =================================================================== diff -u -r30818 -r31148 --- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js (.../config.js) (revision 30818) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js (.../config.js) (revision 31148) @@ -193,5 +193,7 @@ //桌面快捷图标配置 desktopShortcutIconsConfig:["外部代理灭菌","外来器械申请"], //是否允许部分回收 - enablePartRecycle : true + enablePartRecycle : true, + //创建自定义器械包时产生带后缀的普通器械包 + createNormalTousseDefinitionWithSuffixNameWhenCreateCustomTousseDefinition:true } \ No newline at end of file Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r31145 -r31148 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 31145) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 31148) @@ -4847,17 +4847,20 @@ public void saveCustomTousseDefinition(TousseDefinition td, String materialInstanceStr) { //1.保存自定义器械包定义 saveTousseDefinition(td, materialInstanceStr, null,TousseDefinition.UPDATE_MATERIAL_DISPOSABLE_MODE_BOTH); - //2.保存同名器械包定义 - //判断是否有同名的器械包,没有就新建一个类型为器械包的包定义供器械包申请单,通用申请单,回收模块检索,添加器械包使用 - boolean existflag = isExistDuplicateTousseDefinition(null, td.getName()+"(自定义)",TousseDefinition.PACKAGE_TYPE_INSIDE); - if(!existflag){ - TousseDefinition insideTD = new TousseDefinition(); - BeanUtils.copyProperties(td, insideTD, new String[]{"id","name","tousseType","materialInstances","ancestorID","invoicePlanID","storageLocationList"}); - insideTD.setName(td.getName()+"(自定义)"); - insideTD.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); - saveTousseDefinition(insideTD, materialInstanceStr, null,TousseDefinition.UPDATE_MATERIAL_DISPOSABLE_MODE_BOTH); - //3.添加对应供应室处理器械包配置 - addCssdHandleToussesConfig(insideTD); + boolean createNormalTousseDefinitionWithSuffixNameWhenCreateCustomTousseDefinition = CssdUtils.getSystemSetConfigByNameBool("createNormalTousseDefinitionWithSuffixNameWhenCreateCustomTousseDefinition", false); + if(createNormalTousseDefinitionWithSuffixNameWhenCreateCustomTousseDefinition){ + //2.保存同名器械包定义 + //判断是否有同名的器械包,没有就新建一个类型为器械包的包定义供器械包申请单,通用申请单,回收模块检索,添加器械包使用 + boolean existflag = isExistDuplicateTousseDefinition(null, td.getName()+"(自定义)",TousseDefinition.PACKAGE_TYPE_INSIDE); + if(!existflag){ + TousseDefinition insideTD = new TousseDefinition(); + BeanUtils.copyProperties(td, insideTD, new String[]{"id","name","tousseType","materialInstances","ancestorID","invoicePlanID","storageLocationList"}); + insideTD.setName(td.getName()+"(自定义)"); + insideTD.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE); + saveTousseDefinition(insideTD, materialInstanceStr, null,TousseDefinition.UPDATE_MATERIAL_DISPOSABLE_MODE_BOTH); + //3.添加对应供应室处理器械包配置 + addCssdHandleToussesConfig(insideTD); + } } } @Override