aps-优化换线的抛出和锁操作

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

@@ -305,6 +305,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             }
             changeWiresLock.put(equId, nowWorkUser.getId());
         }
+        List<String> aboutIds = new LinkedList<>();
         try {
             // 需要返回的相关ID
             List<String> returnAboutIds = changingWiresVos.stream().map(ChangingWiresVo::getReturnAboutIds).flatMap(Collection::stream).collect(Collectors.toList());
@@ -614,19 +615,18 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                             affectedIdList);
                 });
             }
-            List<String> aboutIds = affectedIdList.stream().distinct().collect(Collectors.toList());
-            blankIds.forEach(data -> {
+            aboutIds = affectedIdList.stream().distinct().collect(Collectors.toList());
+            for (String data : blankIds) {
                 // 更新坯料交货期
                 aboutIds.addAll(apsBlankOrderService.updateBlankDeliveryDate(null, data));
-            });
-
-            // 重新获取甘特图数据并返回前段
-            return R.ok(ganttService.getListById(aboutIds));
+            }
         } finally {
             for (String equId : detailIds) {
                 changeWiresLock.remove(equId);
             }
         }
+        // 重新获取甘特图数据并返回前段
+        return R.ok(ganttService.getListById(aboutIds));
     }
 
     private void checkSomeNewInspection(ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo, List<String> affectedIdList) {

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

@@ -1103,9 +1103,6 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
              */
             Integer newLeaveWaitJobRoll = unfinishroll - apsProcessOperationProcessEquDo.getCancelroll();
             processEquWrapper.set(ApsProcessOperationProcessEquDo::getLeavewaitjobroll, newLeaveWaitJobRoll);
-            //开始时间
-            processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualstartdate, apsReportRecordsDo.getStartworktime());
-            processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanstartdate, apsReportRecordsDo.getStartworktime());
             if (newLeaveWaitJobRoll > 0) {
                 processEquWrapper.set(ApsProcessOperationProcessEquDo::getClosestatus, "未完工");
             } else {