aps-优化

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

@@ -4311,6 +4311,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
                     .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
                     .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+            apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                    .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                    .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                    .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
             apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                     .set(ApsProcessOperationDo::getLockmark, "y")
                     .eq(ApsProcessOperationDo::getLockmark, "n")
@@ -4334,6 +4338,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
                         .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
                         .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                        .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                        .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
                 apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                         .set(ApsProcessOperationDo::getLockmark, "y")
                         .eq(ApsProcessOperationDo::getLockmark, "n")

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

@@ -890,7 +890,7 @@ public class ApsServiceImpl implements ApsService {
                                     apsProcessOperationProcessEquDo.getPlanenddate(),
                                     new LinkedList<>());
                         } catch (Exception e) {
-                            e.printStackTrace();
+                            logger.error("判断冲突失败：" + equDo.getId(), e);
                         }
                     }
                 }