设备类型

.gitignore

@@ -32,3 +32,14 @@ build/
 ### VS Code ###
 .vscode/
 /src/main/resources/application.yml
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+!/logs/
+!/log/
+!/result/

src/main/java/com/aps/entity/ProdEquipment.java

@@ -14,6 +14,7 @@ public class ProdEquipment implements Serializable {
     private Long equipId;
     private String equipCode;
     private String equipName;
+    private String capacityTypeName;
     private Long resourceId;
     private String resourceCode;
     private String execId;
@@ -30,4 +31,4 @@ public class ProdEquipment implements Serializable {
      * 准备时间
      */
     private int setupTime;
-}
+}
\ No newline at end of file

src/main/java/com/aps/entity/Schedule/MachineVO.java

@@ -16,7 +16,9 @@ public class MachineVO {
     @Schema(description = "设备名称")
     private String equipName;
 
+    private String capacityTypeName;
+
     @Schema(description = "任务集合")
     private List<GenVO> tasks;
 
-}
+}
\ No newline at end of file

src/main/java/com/aps/entity/basic/Machine.java

@@ -58,6 +58,8 @@ public class Machine {
      */
     private String code;
 
+    private String capacityTypeName;
+
     /**
      * 节假日列表
      */
@@ -131,4 +133,4 @@ public class Machine {
     public int hashCode() {
         return Objects.hash(id);
     }
-}
+}
\ No newline at end of file

src/main/java/com/aps/service/Algorithm/GeneticOperations.java

@@ -645,7 +645,7 @@ public class GeneticOperations {
         }
     }
     private void log(String message,  boolean enableLogging) {
-        if (enableLogging ) {
+        if (false ) {
             FileHelper.writeLogFile(message);
         }
     }

src/main/java/com/aps/service/Algorithm/RoutingDataService.java

@@ -324,6 +324,12 @@ if(entry.getMachineOptions()!=null)
                 .distinct()
                 .sorted()
                 .collect(Collectors.toList());
+        Map<Long, String> capacityTypeNameByEquipId = ProdEquipments.stream()
+                .filter(t -> t.getEquipId() != null && t.getCapacityTypeName() != null)
+                .collect(Collectors.toMap(
+                        ProdEquipment::getEquipId,
+                        ProdEquipment::getCapacityTypeName,
+                        (existing, replacement) -> existing));
 
         List<Machine> machines = new ArrayList<>();
         List<PlanResource> PlanResources = _PlanResourceService.lambdaQuery()
@@ -336,6 +342,7 @@ if(entry.getMachineOptions()!=null)
 
             Machine machine = new Machine();
             machine.setId(id);
+            machine.setCapacityTypeName(capacityTypeNameByEquipId.get(id));
 
             machine.setCode("");
             machine.setName("");
@@ -399,6 +406,9 @@ if(entry.getMachineOptions()!=null)
                     {
                         machine.setCode(equipinfo.getEquipId());
                         machine.setName(equipinfo.getEquipName());
+                        if (machine.getCapacityTypeName() == null) {
+                            machine.setCapacityTypeName(equipinfo.getCapacityTypeName());
+                        }
                     }else {
                         machine.setCode(PlanResource.getReferenceCode());
                         machine.setName(PlanResource.getTitle());
@@ -457,6 +467,9 @@ if(entry.getMachineOptions()!=null)
                     {
                         machine.setCode(equipinfo.getEquipId());
                         machine.setName(equipinfo.getEquipName());
+                        if (machine.getCapacityTypeName() == null) {
+                            machine.setCapacityTypeName(equipinfo.getCapacityTypeName());
+                        }
                     }else {
                         machine.setCode(PlanResource.getReferenceCode());
                         machine.setName(PlanResource.getTitle());
@@ -551,6 +564,7 @@ if(entry.getMachineOptions()!=null)
             {
                 machine.setCode(equipinfo.getEquipId());
                 machine.setName(equipinfo.getEquipName());
+                machine.setCapacityTypeName(equipinfo.getCapacityTypeName());
             }else {
             machine.setCode(resource.getReferenceCode());
             machine.setName(resource.getTitle());
@@ -715,6 +729,13 @@ if(entry.getMachineOptions()!=null)
             machine.setId(resource.getId());
             machine.setCode(resource.getReferenceCode());
             machine.setName(resource.getTitle());
+            Equipinfo equipinfo = _equipinfoService.lambdaQuery()
+                    .eq(Equipinfo::getId, resource.getReferenceId())
+                    .eq(Equipinfo::getIsdeleted, 0)
+                    .one();
+            if (equipinfo != null) {
+                machine.setCapacityTypeName(equipinfo.getCapacityTypeName());
+            }
 
 
                 List<Shift> shifts1 = new ArrayList<>();

src/main/java/com/aps/service/common/ChromosomeDataService.java

@@ -438,6 +438,7 @@ public class ChromosomeDataService {
                 filteredMachine.setEarliestTime(originalMachine.getEarliestTime());
                 filteredMachine.setTotalTaskTime(originalMachine.getTotalTaskTime());
                 filteredMachine.setCode(originalMachine.getCode());
+                filteredMachine.setCapacityTypeName(originalMachine.getCapacityTypeName());
                 filteredMachine.setActualWorkTime(originalMachine.getActualWorkTime());
                 filteredMachine.setRate(originalMachine.getRate());
                 filteredMachine.setDepartment(originalMachine.getDepartment());
@@ -1639,6 +1640,7 @@ public class ChromosomeDataService {
             filteredMachine.setEarliestTime(originalMachine.getEarliestTime());
             filteredMachine.setTotalTaskTime(originalMachine.getTotalTaskTime());
             filteredMachine.setCode(originalMachine.getCode());
+            filteredMachine.setCapacityTypeName(originalMachine.getCapacityTypeName());
             filteredMachine.setActualWorkTime(originalMachine.getActualWorkTime());
             filteredMachine.setRate(originalMachine.getRate());
             filteredMachine.setDepartment(originalMachine.getDepartment());

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

@@ -1521,6 +1521,7 @@ public class LanuchServiceImpl implements LanuchService {
                         if (equipinfo1 != null) {
                             prodEquipment.setEquipCode(equipinfo1.getEquipId());
                             prodEquipment.setEquipName(equipinfo1.getEquipName());
+                            prodEquipment.setCapacityTypeName(equipinfo1.getCapacityTypeName());
                         } else {
                             log.warn("未找到referenceId={}对应的设备信息", planResource.getReferenceId());
                             continue;
@@ -1609,6 +1610,7 @@ public class LanuchServiceImpl implements LanuchService {
 
                             prodEquipment.setEquipCode(equipinfo1.getEquipId());
                             prodEquipment.setEquipName(equipinfo1.getEquipName());
+                            prodEquipment.setCapacityTypeName(equipinfo1.getCapacityTypeName());
 
                             // 使用Map快速查询
                             prodEquipment.setResourceId(machineId);

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -2004,12 +2004,32 @@ public class PlanResultService {
 //
 
         }
+        applySceneCapacityTypeName(machines, ProdEquipments);
         FileHelper.writeLogFile("初始化设备日历-----------结束-------");
+
         redisUtils.set("machines",machines);
         GlobalCacheUtil.put("machines", machines, 10, TimeUnit.MINUTES);
         return machines;
     }
 
+    private void applySceneCapacityTypeName(List<Machine> machines, List<ProdEquipment> prodEquipments) {
+        if (machines == null || prodEquipments == null || prodEquipments.isEmpty()) {
+            return;
+        }
+        Map<Long, String> capacityTypeNameByEquipId = prodEquipments.stream()
+                .filter(t -> t.getEquipId() != null && t.getCapacityTypeName() != null)
+                .collect(Collectors.toMap(
+                        ProdEquipment::getEquipId,
+                        ProdEquipment::getCapacityTypeName,
+                        (existing, replacement) -> existing));
+        for (Machine machine : machines) {
+            String capacityTypeName = capacityTypeNameByEquipId.get(machine.getId());
+            if (capacityTypeName != null) {
+                machine.setCapacityTypeName(capacityTypeName);
+            }
+        }
+    }
+
     public  List<Machine> InitCalendarToAllMachines ()
     {
         FileHelper.writeLogFile("初始化Redis设备日历-----------开始-------");
@@ -2751,6 +2771,7 @@ public class PlanResultService {
         machineVO.setId(machine.getId());
         machineVO.setEquipId(String.valueOf(machine.getId()));
         machineVO.setEquipName(machine.getName());
+        machineVO.setCapacityTypeName(machine.getCapacityTypeName());
         // 注意：tasks 字段需要在其他地方设置，因为 Machine 类中没有任务信息
         return machineVO;
     }
@@ -2898,8 +2919,7 @@ public class PlanResultService {
 
 
         }
-
-
+        applySceneCapacityTypeName(machines, ProdEquipments);
         return  machines;
 
 
@@ -3477,8 +3497,7 @@ public class PlanResultService {
                 machine.setShifts(shifts1);
             }
         }
-
-
+        applySceneCapacityTypeName(machines, ProdEquipments);
         return machines;
 
 

src/main/java/com/aps/service/plan/PlanSchedulerService.java

@@ -121,6 +121,7 @@ public class PlanSchedulerService {
         machineVO.setId(machine.getId());
         machineVO.setEquipId(String.valueOf(machine.getId()));
         machineVO.setEquipName(machine.getName());
+        machineVO.setCapacityTypeName(machine.getCapacityTypeName());
         return machineVO;
     }
-}
+}
\ No newline at end of file

src/main/resources/mapper/ProdEquipmentMapper.xml

@@ -9,6 +9,7 @@
         <id column="RESOURCE_ID" property="resourceId" />
         <result column="EQUIP_CODE" property="equipCode" />
         <result column="EQUIP_NAME" property="equipName" />
+        <result column="CAPACITY_TYPE_NAME" property="capacityTypeName" />
         <result column="EXEC_ID" property="execId" />
         <result column="SPEED" property="speed" />
         <result column="ID" property="id" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        SCENE_ID, EQUIP_ID, EQUIP_CODE, EQUIP_NAME, RESOURCE_ID, EXEC_ID, SPEED, ID, EFFICIENCY_VALUE, SETUP_TIME
+        SCENE_ID, EQUIP_ID, EQUIP_CODE, EQUIP_NAME, CAPACITY_TYPE_NAME, RESOURCE_ID, EXEC_ID, SPEED, ID, EFFICIENCY_VALUE, SETUP_TIME
     </sql>
 
-</mapper>
+</mapper>
\ No newline at end of file