|
@@ -402,6 +402,15 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
newProcessEqu.getPlanstartdate(), newProcessEqu.getPlanenddate()));
|
|
|
saveList.add(newProcessEqu);
|
|
|
updateConflictVoList.add(updateConflictVo);
|
|
|
+ // 获取上一个工序作业明细ID
|
|
|
+ String previousprocessesids = newProcessEqu.getPreviousprocessesids();
|
|
|
+ if(StringUtils.isNotBlank(previousprocessesids)){
|
|
|
+ ApsProcessOperationProcessEquDo previousProcessEqu = this.getById(previousprocessesids);
|
|
|
+ this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
+ .eq(ApsProcessOperationProcessEquDo::getId,previousprocessesids)
|
|
|
+ .set(ApsProcessOperationProcessEquDo::getNextprocessesids,
|
|
|
+ strAppendListConvertStr(previousProcessEqu.getNextprocessesids(), Arrays.asList(previousprocessesids))));
|
|
|
+ }
|
|
|
}
|
|
|
/************更新换线后工序作业的信息********************/
|
|
|
|
|
@@ -987,7 +996,17 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
}
|
|
|
return affectedIdList;
|
|
|
}
|
|
|
-
|
|
|
+ public String strAppendListConvertStr(String oldValue, List<String> newValues) {
|
|
|
+ if (org.apache.commons.lang.StringUtils.isBlank(oldValue) && (newValues == null || newValues.isEmpty())) {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ if (oldValue == null) {
|
|
|
+ oldValue = "";
|
|
|
+ }
|
|
|
+ List<String> oldValues = new ArrayList<>(Arrays.asList(oldValue.split(",")));
|
|
|
+ oldValues.addAll(newValues);
|
|
|
+ return oldValues.stream().distinct().filter(org.apache.commons.lang.StringUtils::isNotBlank).collect(Collectors.joining(","));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|