|
@@ -223,7 +223,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
|
|
|
}
|
|
|
List<Map<String,Object>> procedureList = bean.getProcedureList();
|
|
|
|
|
|
- isFalse(checkSameName(procedureList), "工序重复!!");
|
|
|
+ isFalse(checkSameName(procedureList), "工序编号或工序名称重复!!");
|
|
|
|
|
|
//删除不存在的
|
|
|
for(String oldId:oriIdList){
|
|
@@ -315,10 +315,12 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
|
|
|
|
|
|
private boolean checkSameName(List<Map<String,Object>> procedureList){
|
|
|
if(CollectionUtil.isNotEmpty(procedureList)){
|
|
|
- Map<String,String> map = procedureList.stream().collect(Collectors.toMap(t->t.get("name").toString(), t->t.get("name").toString()));
|
|
|
+ Map<String,String> map = procedureList.stream().collect(Collectors.toMap(t->t.get("no").toString(), t->t.get("no").toString()));
|
|
|
if(map.size()<procedureList.size()){
|
|
|
return true;
|
|
|
}
|
|
|
+
|
|
|
+ Map<String,String> map1 = procedureList.stream().collect(Collectors.toMap(t->t.get("name").toString(), t->t.get("name").toString()));
|
|
|
}
|
|
|
return false;
|
|
|
}
|