Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r19521 -r20018 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 19521) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 20018) @@ -2419,9 +2419,17 @@ var configStore = top.Ext.getCmp('configGrid').getStore(); // 设置序号 setMaterialSequence(); + var list = []; for(var i =0 ;i < rowIndex ; i++ ){ var record = configStore.getAt(i); + var id = configStore.getAt(i).data.id; var name = record.get('name'); + if (list.contains(name)) { + showResult('已包含材料:'+name+',不可重复添加!'); + top.Ext.getCmp('saveBtn').enable(); + return false; + } + list.push(name); var count = record.get('count'); var type = record.get('type'); var sequence = record.get('sequence'); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r20001 -r20018 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 20001) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 20018) @@ -403,10 +403,14 @@ List materialInstances = new ArrayList(); List diposableGoodsInstances = new ArrayList(); Integer includeImplantFlag = TousseDefinition.UNINCLUDE_IMPLANT; //判断是否包含植入物(cjr) + List list = new ArrayList(); for (int i = 0; i < jsonArray.size(); i++) { JSONObject obj = jsonArray.getJSONObject(i); - String name = obj.optString("name"); + if (list.contains(name)) { //判断器械包内材料不包含同名称同规格 + throw new RuntimeException("已存在'"+name+"'相同名称的材料!"); + } + list.add(name); JSONObject materialobj = CssdUtils.getGoodsNameAndSp(name); String goodsName = materialobj.optString("materialName"); String specification = materialobj.optString("specification");