工序设备表数据处理

src/main/java/com/aps/controller/ScheduleController.java

@@ -82,7 +82,7 @@ public class ScheduleController {
             }
             
             // 提取工序ID用于后续查询
-            Set<Integer> operationIds = operations.stream()
+            Set<Long> operationIds = operations.stream()
                     .map(RoutingDetail::getId)
                     .collect(Collectors.toSet());
             
@@ -96,7 +96,7 @@ public class ScheduleController {
             }
             
             // 提取设备ID用于后续查询
-            Set<Integer> equipmentIds = operationEquipments.stream()
+            Set<Long> equipmentIds = operationEquipments.stream()
                     .map(RoutingDetailEquip::getEquipId)
                     .collect(Collectors.toSet());
             

src/main/java/com/aps/controller/ScheduleResultController.java

@@ -90,7 +90,7 @@ public class ScheduleResultController {
             }
 
             // 提取工序ID用于后续查询
-            Set<Integer> operationIds = operations.stream()
+            Set<Long> operationIds = operations.stream()
                     .map(RoutingDetail::getId)
                     .collect(Collectors.toSet());
 
@@ -104,7 +104,7 @@ public class ScheduleResultController {
             }
 
             // 提取设备ID用于后续查询
-            Set<Integer> equipmentIds = operationEquipments.stream()
+            Set<Long> equipmentIds = operationEquipments.stream()
                     .map(RoutingDetailEquip::getEquipId)
                     .collect(Collectors.toSet());
 

src/main/java/com/aps/controller/ScheduleResultController1.java

@@ -105,7 +105,7 @@ public class ScheduleResultController1 {
             }
 
             // 提取工序ID用于后续查询
-            Set<Integer> operationIds = operations.stream()
+            Set<Long> operationIds = operations.stream()
                     .map(RoutingDetail::getId)
                     .collect(Collectors.toSet());
 
@@ -119,7 +119,7 @@ public class ScheduleResultController1 {
             }
 
             // 提取设备ID用于后续查询
-            Set<Integer> equipmentIds = operationEquipments.stream()
+            Set<Long> equipmentIds = operationEquipments.stream()
                     .map(RoutingDetailEquip::getEquipId)
                     .collect(Collectors.toSet());
 

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

@@ -30,10 +30,10 @@ private String mmid;
 private String mmcode;
 private String mmname;
 private String unit;
-private BigDecimal quantity;
-private BigDecimal meetquantity;
-private BigDecimal meetrate;
-private BigDecimal price;
+private double quantity;
+private double meetquantity;
+private double meetrate;
+private double price;
 private LocalDateTime deliverytime;
 private Long stockid;
 private String stock;

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

+package com.aps.entity;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("prod_equipment")
+public class ProdEquipment implements Serializable {
+
+    private String sceneId;
+    private Long equipId;
+    private String equipCode;
+    private String equipName;
+    private Long resourceId;
+    private String execId;
+    private Double speed;
+}
\ No newline at end of file

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

@@ -26,7 +26,7 @@ public class ProdLaunchOrder {
     private Integer orderPriority;
     private String groupCode;
     private String colorCode;
-    private BigDecimal quantity;
+    private double quantity;
     private String orderStatus;//S未启动E执行中C已完成
     private String materialId;
     private String routingCode;

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

@@ -9,4 +9,6 @@ private String orderId;
 private String taskSeq;
 private String targetOrderId;
 private String targetTaskSeq;
+private String execId;
+private String targetExecId;
 }
\ No newline at end of file

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

 package com.aps.entity;
 
 import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
+@TableName("prod_process_exec")
 public class ProdProcessExec {
-private String execId;
-private String sceneId;
-private String orderId;
-private String routingDetailId;
-private String taskSeq;
-private String routingDetailName;
-private Long machineId;
-private String resourceGroup;
-private BigDecimal planQty;
-private BigDecimal actualQty;
-private Long planDuration;
-private Long usedDuration;
-private Long remainDuration;
-private String processStatus;
-private Long standardCapacity;
-private Long minCapacity;
-private Long maxCapacity;
-private Long prepDuration;
-private Long changeDuration;
-private Short logicalOrder;
-private LocalDateTime targetStartDate;
-private LocalDateTime targetEndDate;
+
+    private String execId;
+    private String sceneId;
+    private String orderId;
+    private Long routingDetailId;
+    private Long taskSeq;
+    private String routingDetailName;
+    private Long machineId;
+    private String resourceGroup;
+    private Double planQty;
+    private Double actualQty;
+    private Long planDuration;
+    private Long usedDuration;
+    private Long remainDuration;
+    private String processStatus;
+    private Long standardCapacity;
+    private Long minCapacity;
+    private Long maxCapacity;
+    private Long prepDuration;
+    private Long changeDuration;
+    private Long logicalOrder;
+    private LocalDateTime targetStartDate;
+    private LocalDateTime targetEndDate;
 
     /**
      * 工序准备工时（小时）
@@ -66,5 +70,5 @@ private LocalDateTime targetEndDate;
     private Long postprocessingTime;
 
     //速度
-    private BigDecimal speed;
+    private Double speed;
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import lombok.Data;
 
 @Data
 public class RoutingDetail {
-private Integer id;
+private Long id;
 private LocalDateTime creationTime;
 private BigDecimal creatorUserId;
 private LocalDateTime lastModificationTime;
@@ -19,7 +19,7 @@ private LocalDateTime deletionTime;
 private Long classId;
 private Long routingHeaderId;
 private String name;
-private Short taskSeq;
+private Long taskSeq;
 private String description;
 private String taskContent;
 private Long resourceId;

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

@@ -10,8 +10,8 @@ private Long id;
 private LocalDateTime creationtime;
 private Long  creatoruserid;
 private LocalDateTime lastmodificationtime;
-private Long lastmodifieruserid;
-private Long isdeleted;
+private Integer lastmodifieruserid;
+private Integer isdeleted;
 private LocalDateTime deletiontime;
 private Long  deleteruserid;
 private Long  destoperationid;

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

@@ -45,7 +45,7 @@ public class RoutingDetailEquip implements Serializable {
     /**
      * 更新人
      */
-    private Integer lastmodifieruserid;
+    private Long lastmodifieruserid;
 
     /**
      * 删除人
@@ -65,7 +65,7 @@ public class RoutingDetailEquip implements Serializable {
     /**
      * 设备类型
      */
-    private Integer type1;
+    private Long type1;
 
     /**
      * 设备类型名
@@ -111,17 +111,17 @@ public class RoutingDetailEquip implements Serializable {
     /**
      * 工序id
      */
-    private Integer routingDetailId;
+    private Long routingDetailId;
 
     /**
      * 设备id
      */
-    private Integer equipId;
+    private Long equipId;
 
     /**
      * 工艺id
      */
-    private Integer routingHeaderId;
+    private Long routingHeaderId;
 
     /**
      * 单次批量产出

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

@@ -9,8 +9,8 @@ import java.time.LocalDateTime;
 @Data
 public class ScheduledTask {
     private String orderId;       // 工单ID
-    private Integer operationId;  // 工序ID
-    private Integer equipId;      // 设备ID
+    private Long operationId;  // 工序ID
+    private Long equipId;      // 设备ID
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime; // 实际开始时间
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/aps/mapper/ProdEquipmentMapper.java

+package com.aps.mapper;
+
+import com.aps.entity.ProdEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author MyBatis-Plus
+ * @since 2025-11-27
+ */
+public interface ProdEquipmentMapper extends BaseMapper<ProdEquipment> {
+
+}

src/main/java/com/aps/service/ProdEquipmentService.java

+package com.aps.service;
+
+import com.aps.entity.ProdEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author MyBatis-Plus
+ * @since 2025-11-27
+ */
+public interface ProdEquipmentService extends IService<ProdEquipment> {
+
+}

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

+package com.aps.service.impl;
+
+import com.aps.entity.ProdEquipment;
+import com.aps.mapper.ProdEquipmentMapper;
+import com.aps.service.ProdEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author MyBatis-Plus
+ * @since 2025-11-27
+ */
+@Service
+public class ProdEquipmentServiceImpl extends ServiceImpl<ProdEquipmentMapper, ProdEquipment> implements ProdEquipmentService {
+
+}

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

@@ -41,7 +41,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                 ));
 
         // 2. 构建工序-设备关系映射
-        Map<Integer, List<RoutingDetailEquip>> operationToEquipments = operationEquipments.stream()
+        Map<Long, List<RoutingDetailEquip>> operationToEquipments = operationEquipments.stream()
                 .collect(Collectors.groupingBy(RoutingDetailEquip::getRoutingDetailId));
 
         // 3. 按优先级和截止时间排序工单
@@ -69,7 +69,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     private void processOrder(Mpsplannedorder order,
                               List<RoutingHeader> processes,
                               List<RoutingDetail> operations,
-                              Map<Integer, List<RoutingDetailEquip>> operationToEquipments,
+                              Map<Long, List<RoutingDetailEquip>> operationToEquipments,
                               Map<Integer, EquipmentScheduleState> equipmentStates,
                               List<ScheduledTask> scheduledTasks) {
 
@@ -103,7 +103,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     private ScheduledTask scheduleOperation(Mpsplannedorder order,
                                             RoutingDetail operation,
-                                            Map<Integer, List<RoutingDetailEquip>> operationToEquipments,
+                                            Map<Long, List<RoutingDetailEquip>> operationToEquipments,
                                             Map<Integer, EquipmentScheduleState> equipmentStates,
                                             LocalDateTime lastOperationEndTime) {
 

src/main/resources/mapper/ProdEquipmentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aps.mapper.ProdEquipmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aps.entity.ProdEquipment">
+        <id column="SCENE_ID" property="sceneId" />
+        <id column="EQUIP_ID" property="equipId" />
+        <id column="RESOURCE_ID" property="resourceId" />
+        <result column="EQUIP_CODE" property="equipCode" />
+        <result column="EQUIP_NAME" property="equipName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        SCENE_ID, EQUIP_ID, EQUIP_CODE, EQUIP_NAME, RESOURCE_ID
+    </sql>
+
+</mapper>