冲突描述重复处理

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -656,13 +656,17 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 if(StrUtil.isBlank(productionProcesses.getConflictDes())){
                     productionProcesses.setConflictDes(desc);
                 }else{
-                    productionProcesses.setConflictDes(productionProcesses.getConflictDes()+";"+desc);
+                    if(!productionProcesses.getConflictDes().contains(desc)){
+                        productionProcesses.setConflictDes(productionProcesses.getConflictDes()+";"+desc);
+                    }
                 }
             }else{
                 if(StrUtil.isBlank(productionProcesses.getSoftconflictdes())){
                     productionProcesses.setSoftconflictdes(desc);
                 }else{
-                    productionProcesses.setSoftconflictdes(productionProcesses.getSoftconflictdes()+";"+desc);
+                    if(!productionProcesses.getSoftconflictdes().contains(desc)){
+                        productionProcesses.setSoftconflictdes(productionProcesses.getSoftconflictdes()+";"+desc);
+                    }
                 }
             }
         }else{