kpi计算

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

@@ -19,7 +19,10 @@ public class GAScheduleResult {
      */
     public String ExecId ;
     public String OrderId ;
+    public String OrderCode ;
     private String productId;
+    private String productName;
+    private String productCode;
     private long MachineId;
     private int StartTime; // 相对开始时间（秒）
     private int EndTime; // 相对结束时间（秒）

src/main/java/com/aps/entity/Gantt/TaskVO.java

@@ -23,6 +23,9 @@ public class TaskVO {
     @Schema(description = "计划ID")
     private String planId;
 
+    @Schema(description = "计划编号")
+    private String planCode;
+
     @Schema(description = "产品类型")
     private Integer productType;
 
@@ -32,6 +35,9 @@ public class TaskVO {
     @Schema(description = "产品ID")
     private String productId;
 
+    @Schema(description = "产品编码")
+    private String productCode;
+
     @Schema(description = "数量")
     private double quantity;
 

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

@@ -19,6 +19,7 @@ public class ProdLaunchOrder {
     private String createUser;
     private String productType;
     private String materialCode;
+    private String materialName;
     private String materialVer;
     private LocalDateTime startDate;
     private LocalDateTime endDate;

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

@@ -14,6 +14,7 @@ public class ProdProcessExec {
     private String execId;
     private String sceneId;
     private String orderId;
+    private String orderCode;
     private Long routingDetailId;
     private Long taskSeq;
     private String routingDetailName;

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

@@ -32,6 +32,8 @@ public class Entry {
 
     public String OrderId ;
 
+    public String OrderCode ;
+
     /**
      * 原订单ID
      */
@@ -45,6 +47,8 @@ public class Entry {
 
 
     private String productId;
+    private String productCode;
+    private String productName;
     /**
      * 工单ID
      */

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

@@ -17,6 +17,7 @@ public class Order {
     private int productId;
     private String materialId;
     private String materialCode;
+    private String materialName;
     private String serie;
     private Integer routingId;
     private String routingCode;

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

@@ -488,7 +488,10 @@ if(finishedOrder==null||finishedOrder.size()==0)
         result.setOperationId(operation.getId());
         result.setExecId(operation.getExecId());
         result.setOrderId(operation.getOrderId());
+        result.setOrderCode(operation.getOrderCode());
         result.setProductId(operation.getProductId());
+        result.setProductName(operation.getProductName());
+        result.setProductCode(operation.getProductCode());
         result.setMachineId(machine.getId());
 
 

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

@@ -41,7 +41,7 @@ public class KpiCalculator {
                 .mapToDouble(Machine::getRate)
                 .min()
                 .orElse(0);
-        addKpi(kpiMetrics,"最小设备利用率", machineMinRate, "实际工作时间/计划工作时间 最小", 0, 1);
+        addKpi(kpiMetrics,"最小设备利用率", Math.round(machineMinRate * 100.0) / 100.0, "实际工作时间/计划工作时间 最小", 0, 1);
 
         double machineActualWorkTime = chromosome.getMachines().stream()
                 .mapToDouble(Machine::getActualWorkTime)
@@ -53,8 +53,8 @@ public class KpiCalculator {
         double orderNoDelayCount = chromosome.getOrders().stream()
                 .filter(t -> t.getDelayHours() <= 0)
                 .count();
-        //
-        double orderOnTime = Math.round(orderNoDelayCount / chromosome.getOrders().size() * 10000) / 10000 * 100;
+
+        double orderOnTime = Math.round(orderNoDelayCount * 10000.0 / chromosome.getOrders().size()) / 100.0;
         addKpi(kpiMetrics,"订单按时完成率", orderOnTime, "规定时间内交付的订单数量/所有订单数量", 0, 1);
         //最大延迟
         double OrderMaxDelay = chromosome.getOrders().stream()
@@ -73,7 +73,7 @@ public class KpiCalculator {
                 .mapToDouble(Order::getDelayHours)
                 .sum();
         //平均延迟
-        double OrderDelay = Math.round(OrderSumDelay / chromosome.getOrders().size() * 100) / 100;
+        double OrderDelay = Math.round(OrderSumDelay / chromosome.getOrders().size() * 100.0) / 100.0;
         addKpi(kpiMetrics,"平均延迟", OrderDelay, "所有订单的延迟时间平均值", 2, 1);
         //最长生产周期
         double OrderMaxProductTime = chromosome.getOrders().stream()
@@ -92,7 +92,7 @@ public class KpiCalculator {
                 .mapToDouble(Order::getOrderProductTime)
                 .sum();
         //平均生产周期
-        double OrderProductTime= Math.round(OrderSumProductTime / chromosome.getOrders().size() * 100) / 100;
+        double OrderProductTime= Math.round(OrderSumProductTime / chromosome.getOrders().size() * 100.0) / 100.0;
         addKpi(kpiMetrics,"平均生产周期", OrderProductTime, "订单在计划中的实际存续时长", 2, 1);
 
         //最大流量
@@ -114,7 +114,7 @@ public class KpiCalculator {
                 .mapToDouble(Order::getOrderFlow)
                 .sum();
         //平均流量
-        double OrderFlow= Math.round(OrderSumFlow / chromosome.getOrders().size() * 100) / 100;
+        double OrderFlow= Math.round(OrderSumFlow / chromosome.getOrders().size() * 100.0) / 100.0;
         addKpi(kpiMetrics,"平均流量", OrderFlow, "订单的最短理论耗时与其在计划中的实际耗时的比值", 0, 1);
         chromosome.setKpiMetrics(kpiMetrics);
 
@@ -234,7 +234,7 @@ public class KpiCalculator {
             Duration Orderduration = Duration.between(actualStartTime,actualCompletionTime);
             double orderProductTime  =Orderduration.getSeconds();
             order.setOrderProductTime(orderProductTime);
-            double flow=Math.round(orderProcessingTime/orderProductTime *10000)/10000*100;
+            double flow=Math.round(orderProcessingTime/orderProductTime *10000.0)/10000.0*100.0;
 
             order.setOrderFlow(flow);
             // 计算延迟时间（若提前完成则延迟为0）

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

@@ -411,6 +411,7 @@ if(routingIds.size()==0)
             launchOrder.setSerie(order.getSerie());
             launchOrder.setCreateUser("GA");
             launchOrder.setMaterialCode(order.getMaterialCode());
+            launchOrder.setMaterialName(order.getMaterialName());
 //            launchOrder.setStartDate(order.get);
             launchOrder.setEndDate(order.getDueDate());
 //            launchOrder.setOrderPriority(order.getPrioritry());
@@ -603,6 +604,7 @@ if(routingIds.size()==0)
                             childorder.setOrderId(OrderId);
                             childorder.setMaterialId(material.getId());
                             childorder.setMaterialCode(material.getCode());
+                            childorder.setMaterialName(material.getName());
                             childorder.setOrderCode(material.getCode());
                             childorder.setQuantity((int) orderMaterial.getQjQty());
                             childorder.setFinishOrderId(new ArrayList<>());

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

@@ -214,6 +214,7 @@ public class RoutingDataService {
                     entry.setRuntime(op.getRuntime());
                     entry.setSingleOut(op.getSingleOut());
                     entry.setOrderId(op.getOrderId());
+                    entry.setOrderCode(op.getOrderCode());
                     entry.setQuantity(op.getPlanQty());
                     entry.setRoutingId(op.getRoutingId());
                     entry.setRoutingDetailId(op.getRoutingDetailId());
@@ -225,6 +226,8 @@ public class RoutingDataService {
                             .findFirst().orElse(null);
                     if (order != null) {
                         entry.setProductId(order.getMaterialId());
+                        entry.setProductCode(order.getMaterialCode());
+                        entry.setProductName(order.getMaterialName());
                         entry.setPriority(order.getActualPriority());
                         order.setId(entry.getGroupId());
                     }

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

@@ -515,6 +515,7 @@ Integer newMachineId1=newMachineId.intValue();
                 Entry newOp = ProductionDeepCopyUtil.deepCopy(entry,Entry.class);
                 newOp.setExecId(newId);
                 newOp.setOrderId(neworder.getOrderId());
+                newOp.setOrderCode(neworder.getOrderCode());
                 newOp.setGroupId(maxorderId);
                 newOp.setQuantity(splitCounts[i]);
                 newOp.setNewCreate(true);

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

@@ -1104,6 +1104,7 @@ public class ChromosomeDataService {
         prodProcessExec.setExecId(entry.ExecId);
         prodProcessExec.setSceneId(entry.SceneId);
         prodProcessExec.setOrderId(entry.OrderId);
+
         prodProcessExec.setRoutingDetailId(entry.getRoutingDetailId());
         prodProcessExec.setTaskSeq(entry.getTaskSeq());
         prodProcessExec.setRoutingDetailName(entry.getRoutingDetailName());

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

@@ -360,9 +360,10 @@ public class LanuchServiceImpl implements LanuchService {
         launchOrder.setSerie(order.getSeries());
         launchOrder.setCreateUser(String.valueOf(order.getCreatoruserid()));
         launchOrder.setMaterialCode(order.getMmcode());
+        launchOrder.setMaterialName(order.getMmname());
         launchOrder.setEndDate(order.getDeliverytime());
         launchOrder.setStartDate(order.getBegintime());
-
+        launchOrder.setOrderCode(order.getCode());
         try {
             launchOrder.setOrderPriority(Integer.valueOf(order.getPrioritry()));
         } catch (NumberFormatException e) {
@@ -687,6 +688,7 @@ public class LanuchServiceImpl implements LanuchService {
         ProdProcessExec prodProcessExec = new ProdProcessExec();
         prodProcessExec.setExecId(UUID.randomUUID().toString().replace("-", ""));
         prodProcessExec.setOrderId(prodOrderMain.getOrderId());
+        prodProcessExec.setOrderCode(prodOrderMain.getOrderCode());
         prodProcessExec.setRoutingDetailId(detail.getId());
         prodProcessExec.setTaskSeq(detail.getTaskSeq());
         prodProcessExec.setRoutingDetailName(detail.getName());

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

@@ -7,6 +7,7 @@ import com.aps.entity.*;
 import com.aps.entity.Algorithm.*;
 import com.aps.entity.Algorithm.IDAndChildID.GroupResult;
 import com.aps.entity.Algorithm.IDAndChildID.NodeInfo;
+import com.aps.entity.Gantt.TaskVO;
 import com.aps.entity.Schedule.SceneChromsome;
 import com.aps.entity.basic.ScheduleChromosome;
 import com.aps.entity.Schedule.GenVO;
@@ -936,6 +937,7 @@ private  GlobalParam InitGlobalParam()
         for (ProdLaunchOrder lo : ProdLaunchOrders) {
             Order order=new Order();
             order.setMaterialCode(lo.getMaterialCode());
+            order.setMaterialName(lo.getMaterialName());
             order.setSerie(lo.getSerie()==null?"":lo.getSerie());
             order.setOrderCode(lo.getOrderCode());
             order.setOrderId(lo.getOrderId());
@@ -1539,12 +1541,14 @@ private  GlobalParam InitGlobalParam()
                                 .filter(t -> t.getId() == gene.getOperationId()).findFirst().orElse(null);
 
 
-                        com.aps.entity.Gantt.TaskVO taskVO = new com.aps.entity.Gantt.TaskVO();
+                        TaskVO taskVO = new TaskVO();
                         taskVO.setId(String.valueOf(gene.getOperationId()));
                         taskVO.setPlanId(gene.getOrderId()); // 默认值
+                        taskVO.setPlanCode(gene.getOrderCode()); // 默认值
 //                        taskVO.setProductType(0); // 默认值
-//                        taskVO.setProductName("产品"+gene.getProductId());
+                        taskVO.setProductName(gene.getProductName());
                         taskVO.setProductId(gene.getProductId()); // 默认值
+                        taskVO.setProductCode(gene.getProductCode()); // 默认值
                         taskVO.setQuantity(gene.getQuantity());
                         taskVO.setStart(scheduleChromosome.getBaseTime().plusSeconds(gene.getStartTime()));
                         taskVO.setEnd(scheduleChromosome.getBaseTime().plusSeconds(gene.getEndTime()));
@@ -1569,22 +1573,14 @@ private  GlobalParam InitGlobalParam()
                         taskVO.setShopId(machine.getId());
                         taskVO.setShopName(resourceGanttVO.getShopName());
                         taskVO.setStatus(0); // 默认值
-                        taskVO.setDetailId((long) gene.getStartTime()); // 将productId和operationID组合为detailId
-                        taskVO.setHeaderId(gene.getEndTime()); // 默认值
-//                        taskVO.setHeaderName("工艺"+gene.getProductId()); // 默认值
-//                        taskVO.setSeq(gene.getSequenceId()); // 使用工序ID
-//                        taskVO.setSeqName( "工序名称"+gene.getSequenceId());
+                        taskVO.setDetailId(entry.getRoutingDetailId()); // 将productId和operationID组合为detailId
+                        taskVO.setHeaderId(entry.getRoutingId()); // 默认值
+                        taskVO.setHeaderName(entry.getRoutingName()); // 默认值
+                        taskVO.setSeq(Math.toIntExact(entry.getTaskSeq())); // 使用工序ID
+                        taskVO.setSeqName(entry.getRoutingDetailName());
                         taskVO.setProcessingTime(gene.getProcessingTime());
-//                        taskVO.setAbsoluteStart(scheduleChromosome.getBaseTime().plusMinutes(gene.getStartTime()));
-//                        taskVO.setAbsoluteEnd(scheduleChromosome.getBaseTime().plusMinutes(gene.getEndTime()));
-                        taskVOList.add(taskVO);
 
-                        // 调试：检查machine中的shifts状态
-//                        if (machine.getShifts() != null) {
-//                            for (Shift shift : machine.getShifts()) {
-//                                System.out.println("Before setting shifts - Shift status: " + shift.getStatus());
-//                            }
-//                        }
+                        taskVOList.add(taskVO);
 
                         taskVO.setAbsolutePreparationTime(gene.getTeardownTime());