|
|
@ -924,6 +924,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
|
|
|
|
assemblyList = assemblyList.stream().filter(o->MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue() == o.getAssemblyStatus()).collect(Collectors.toList());
|
|
|
|
assemblyList = assemblyList.stream().filter(o->MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue() == o.getAssemblyStatus()).collect(Collectors.toList());
|
|
|
|
if(!CollectionUtils.isEmpty(assemblyList)){
|
|
|
|
if(!CollectionUtils.isEmpty(assemblyList)){
|
|
|
|
assemblyList.forEach(t->{
|
|
|
|
assemblyList.forEach(t->{
|
|
|
|
|
|
|
|
t.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
|
|
|
|
|
|
|
|
t.setDescription(userName + "-" + TimeTool.getNowTime(true) + "-返工解绑软删除");
|
|
|
|
t.setSystemSyncStatus(CommonEnumUtil.FALSE);
|
|
|
|
t.setSystemSyncStatus(CommonEnumUtil.FALSE);
|
|
|
|
t.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue());
|
|
|
|
t.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue());
|
|
|
|
ConvertBean.serviceModelUpdate(t, userName);
|
|
|
|
ConvertBean.serviceModelUpdate(t, userName);
|
|
|
|