Kaynağa Gözat

APS平台生产排程规划算法

fangpy 1 yıl önce
ebeveyn
işleme
d768a518cf

+ 2 - 2
rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -76,8 +76,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
         // 工步初始化
         List<ProductionProcesses> processes = new ArrayList<>();
         // 订单初始化
-        ProduceOrder produceOrder1 = new ProduceOrder("order1","订单1", DateUtil.parseDateTime("2024-02-29 21:52:12"));
-        ProduceOrder produceOrder2 = new ProduceOrder("order2","订单2", DateUtil.parseDateTime("2024-02-29 23:20:12"));
+        ProduceOrder produceOrder1 = new ProduceOrder("order1","订单1", DateUtil.parseDateTime("2024-03-01 21:52:12"));
+        ProduceOrder produceOrder2 = new ProduceOrder("order2","订单2", DateUtil.parseDateTime("2024-03-01 23:20:12"));
         ProductionProcesses p1 = new ProductionProcesses(1,"均热炉", Arrays.asList(new ProduceOrder[]{produceOrder1}),10);
         ProductionProcesses p2 = new ProductionProcesses(2,"卧式分切机",Arrays.asList(new ProduceOrder[]{produceOrder1}),12);
         ProductionProcesses p6 = new ProductionProcesses(6,"氮气保护退火炉",Arrays.asList(new ProduceOrder[]{produceOrder1,produceOrder2}),72);

+ 28 - 1
rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/vo/ProductionScheduleVo.java

@@ -6,9 +6,11 @@ import lombok.Data;
 
 import java.util.List;
 
-@Data
+//@Data
 public class ProductionScheduleVo {
 
+    private String productionScheduleId;
+
     /**
      * 生产工序集合
      */
@@ -18,4 +20,29 @@ public class ProductionScheduleVo {
      * 生产设备集合
      */
     private List<Equipment> equipmentList;
+
+    public String getProductionScheduleId() {
+        return productionScheduleId;
+    }
+
+    public void setProductionScheduleId(String productionScheduleId) {
+        System.out.println("productionScheduleId:"+productionScheduleId);
+        this.productionScheduleId = productionScheduleId;
+    }
+
+    public List<ProductionProcesses> getProcesses() {
+        return processes;
+    }
+
+    public void setProcesses(List<ProductionProcesses> processes) {
+        this.processes = processes;
+    }
+
+    public List<Equipment> getEquipmentList() {
+        return equipmentList;
+    }
+
+    public void setEquipmentList(List<Equipment> equipmentList) {
+        this.equipmentList = equipmentList;
+    }
 }