Merge remote-tracking branch 'origin/master'

src/main/java/com/aps/entity/Algorithm/OperationDependency.java

 package com.aps.entity.Algorithm;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.Data;
 
 /**
@@ -12,4 +13,15 @@ public class OperationDependency {
     private int prevOperationId ; // 前置工序ID
     private int nextOperationId ; // 后继工序ID
     private DependencyType dependencyType=DependencyType.FinishToStart ; // 依赖类型
+
+    /**
+     * 添加构造函数以便Jackson能正确反序列化
+     * 当JSON中只有单一数值时，将其作为Id字段的值
+     */
+    @JsonCreator
+    public static OperationDependency fromInt(int id) {
+        OperationDependency od = new OperationDependency();
+        od.Id = id;
+        return od;
+    }
 }

src/main/java/com/aps/service/impl/ProdEquipSpecialCalServiceImpl.java

@@ -37,6 +37,7 @@ public class ProdEquipSpecialCalServiceImpl extends ServiceImpl<ProdEquipSpecial
         List<EquipCapacityDef> activeCapacityDefs = equipCapacityDefService.lambdaQuery()
                 .eq(EquipCapacityDef::getIsDeleted, 0)
                 .isNotNull(EquipCapacityDef::getReferenceId)
+                .isNotNull(EquipCapacityDef::getEquipId) // 过滤掉 equipId 为 null 的记录
                 .list();
 
         // 转换对象并设置必要字段