Jelajahi Sumber

bugFix 解决拆分后返回的数据缺失的问题

xiahan 10 bulan lalu
induk
melakukan
0e7138fdd3

+ 4 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -791,6 +791,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 newDo.setModifydate(new Date());
                 newDataList.add(newDo);
                 this.updateById(newDo);
+                affectedIdList.add(newDo.getId());
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(newDo, currentProcessEquDo.getPlanstartdate(),
                         currentProcessEquDo.getPlanenddate(), currentProcessEquDo.getProcessdeviceid(),
@@ -823,6 +824,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 newDo.setBachmaterialprocess(null);
                 newDo.setCreatedate(new Date());
                 newDo.setModifydate(new Date());
+                affectedIdList.add(newDo.getId());
                 // 增加受影响的工序作业信息
                 affectedIdList.addAll(checkProcessingTimeConflict(newDo, newDo.getPlanstartdate(),
                         newDo.getPlanenddate(), newDo.getProcessdeviceid(),
@@ -860,6 +862,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 } else {
                     oldDo.setWorkstatus(currentProcessEquDo.getReportroll() == 0 ? JOBSTATUS_TO_BE_START : JOBSTATUS_TO_BE_STARTING);
                 }
+                affectedIdList.add(oldDo.getId());
                 oldDo.setModifydate(new Date());
                 this.updateById(oldDo);
                 // 增加受影响的工序作业信息
@@ -890,7 +893,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     .eq(ApsProcessOperationProcessEquDo::getId, k)
                     .set(ApsProcessOperationProcessEquDo::getNextprocessesids, strAppendListConvertStr(apsProcessOperationProcessEquDo.getNextprocessesids(), collect1)));
         });
-        return R.ok(this.ganttService.getListById(affectedIdList));
+        return R.ok(this.ganttService.getListById(affectedIdList.stream().distinct().collect(Collectors.toList())));
     }
 
     public void updateBlank(String processOperationId) {