feature 解决流转不正确的问题

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -594,25 +594,26 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo;
         // 批次号流转
         for (Map.Entry<String, List<String>> entryentry : toBeProcessedDataMap.entrySet()) {
-            ApsProcessOperationDo apsProcessOperationDo = nextProcessList.stream()
+            List<ApsProcessOperationDo> apsProcessOperationDos = nextProcessList.stream()
                     .filter(info -> entryentry.getKey().equals(info.getPlaninputid()))
-                    .findFirst()
-                    .orElse(null);
-            updateOperationDo = new ApsProcessOperationDo();
-            // 更新ID
-            updateOperationDo.setId(apsProcessOperationDo.getId());
-            updateOperationDo.setBachmaterialprocess(strAppendListConvertStr(apsProcessOperationDo.getBachmaterialprocess(), entryentry.getValue()));
-            updateOperationDo.setModifydate(new Date());
-            updateProcessData.add(updateOperationDo);
-            log.debug("将批次号：{}流转给工序作业:{}", entryentry.getValue(), updateOperationDo.getId());
-            for (ApsProcessOperationProcessEquDo equ : nextProcessOperationProcessEquDos) {
-                if (updateOperationDo.getId().equals(equ.getProcessid())) {
-                    apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
-                    apsProcessOperationProcessEquDo.setId(equ.getId());
-                    apsProcessOperationProcessEquDo.setBachmaterialprocess(strAppendListConvertStr(equ.getBachmaterialprocess(), entryentry.getValue()));
-                    apsProcessOperationProcessEquDo.setModifydate(new Date());
-                    log.debug("将批次号：{}流转给工序作业明细:{}", entryentry.getValue(), equ.getId());
-                    updateProcessEquData.add(apsProcessOperationProcessEquDo);
+                    .collect(Collectors.toList());
+            for (ApsProcessOperationDo apsProcessOperationDo : apsProcessOperationDos) {
+                updateOperationDo = new ApsProcessOperationDo();
+                // 更新ID
+                updateOperationDo.setId(apsProcessOperationDo.getId());
+                updateOperationDo.setBachmaterialprocess(strAppendListConvertStr(apsProcessOperationDo.getBachmaterialprocess(), entryentry.getValue()));
+                updateOperationDo.setModifydate(new Date());
+                updateProcessData.add(updateOperationDo);
+                log.debug("将批次号：{}流转给工序作业:{}", entryentry.getValue(), updateOperationDo.getId());
+                for (ApsProcessOperationProcessEquDo equ : nextProcessOperationProcessEquDos) {
+                    if (updateOperationDo.getId().equals(equ.getProcessid())) {
+                        apsProcessOperationProcessEquDo = new ApsProcessOperationProcessEquDo();
+                        apsProcessOperationProcessEquDo.setId(equ.getId());
+                        apsProcessOperationProcessEquDo.setBachmaterialprocess(strAppendListConvertStr(equ.getBachmaterialprocess(), entryentry.getValue()));
+                        apsProcessOperationProcessEquDo.setModifydate(new Date());
+                        log.debug("将批次号：{}流转给工序作业明细:{}", entryentry.getValue(), equ.getId());
+                        updateProcessEquData.add(apsProcessOperationProcessEquDo);
+                    }
                 }
             }
         }