Skip to content

H
HYH.APSJ
Commit 0b047fab authored by DESKTOP-VKRD9QF\Administration's avatar DESKTOP-VKRD9QF\Administration
Browse files
Options

Merge remote-tracking branch 'origin/jdt'

parents c44201cc 480f12c6
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 0 deletions
schedule_log.txt
View file @ 0b047fab
......@@ -66456,3 +66456,136 @@
[149400-185400]:[11-02 17:30-11-03 03:30] 36000
[199800-223800]:[11-03 07:30-11-03 14:10] 24000
[2025-12-18 17:40:09]
[2025-12-19 09:05:21]
=== Schedule Summary === 0.484233
[2025-12-19 09:05:21] Operation: 1|1
[2025-12-19 09:05:21] Makespan: 87000.000000 minutes
[2025-12-19 09:05:21] Total Tardiness: 0.000000 hours
[2025-12-19 09:05:21] Setup Time: 0.000000 minutes
[2025-12-19 09:05:21] Flow Time: 96000.000000 minutes
[2025-12-19 09:05:21] Machine Load Balance: 92.11%
[2025-12-19 09:05:21] -------------------------
[2025-12-19 09:05:21] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3403, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-19 09:05:21] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3243, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 09:05:21]
[2025-12-19 09:05:21]
=== Schedule Summary === 0.484233
[2025-12-19 09:05:21] Operation: 1|1
[2025-12-19 09:05:21] Makespan: 87000.000000 minutes
[2025-12-19 09:05:21] Total Tardiness: 0.000000 hours
[2025-12-19 09:05:21] Setup Time: 0.000000 minutes
[2025-12-19 09:05:21] Flow Time: 96000.000000 minutes
[2025-12-19 09:05:21] Machine Load Balance: 92.11%
[2025-12-19 09:05:21] -------------------------
[2025-12-19 09:05:21] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-19 09:05:21] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3243, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 09:05:21]
[2025-12-19 09:09:20]
=== Schedule Summary === 0.484233
[2025-12-19 09:09:20] Operation: 1|1
[2025-12-19 09:09:20] Makespan: 87000.000000 minutes
[2025-12-19 09:09:20] Total Tardiness: 0.000000 hours
[2025-12-19 09:09:20] Setup Time: 0.000000 minutes
[2025-12-19 09:09:20] Flow Time: 96000.000000 minutes
[2025-12-19 09:09:20] Machine Load Balance: 92.11%
[2025-12-19 09:09:20] -------------------------
[2025-12-19 09:09:20] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-19 09:09:20] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 09:09:20]
[2025-12-19 09:09:20]
=== Schedule Summary === 0.484233
[2025-12-19 09:09:20] Operation: 1|1
[2025-12-19 09:09:20] Makespan: 381600.000000 minutes
[2025-12-19 09:09:20] Total Tardiness: 0.000000 hours
[2025-12-19 09:09:20] Setup Time: 0.000000 minutes
[2025-12-19 09:09:20] Flow Time: 150000.000000 minutes
[2025-12-19 09:09:20] Machine Load Balance: 98.97%
[2025-12-19 09:09:20] -------------------------
[2025-12-19 09:09:20] [291600-381600]:[11-04 09:00-11-05 10:00] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[291600-324000]:[11-04 09:00-11-04 18:00] 32400
[378000-381600]:[11-05 09:00-11-05 10:00] 3600
[2025-12-19 09:09:20] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 09:09:20]
[2025-12-19 09:57:23]
=== Schedule Summary === 0.484233
[2025-12-19 09:57:23] Operation: 1|1
[2025-12-19 09:57:23] Makespan: 381600.000000 minutes
[2025-12-19 09:57:23] Total Tardiness: 0.000000 hours
[2025-12-19 09:57:23] Setup Time: 0.000000 minutes
[2025-12-19 09:57:23] Flow Time: 150000.000000 minutes
[2025-12-19 09:57:23] Machine Load Balance: 98.97%
[2025-12-19 09:57:23] -------------------------
[2025-12-19 09:57:23] [291600-381600]:[11-04 09:00-11-05 10:00] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[291600-324000]:[11-04 09:00-11-04 18:00] 32400
[378000-381600]:[11-05 09:00-11-05 10:00] 3600
[2025-12-19 09:57:23] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 09:57:23]
[2025-12-19 09:57:23]
=== Schedule Summary === 0.484233
[2025-12-19 09:57:23] Operation: 1|1
[2025-12-19 09:57:23] Makespan: 471600.000000 minutes
[2025-12-19 09:57:23] Total Tardiness: 0.000000 hours
[2025-12-19 09:57:23] Setup Time: 0.000000 minutes
[2025-12-19 09:57:23] Flow Time: 164400.000000 minutes
[2025-12-19 09:57:23] Machine Load Balance: 99.23%
[2025-12-19 09:57:23] -------------------------
[2025-12-19 09:57:23] [381600-471600]:[11-05 10:00-11-06 11:00] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[381600-410400]:[11-05 10:00-11-05 18:00] 28800
[464400-471600]:[11-06 09:00-11-06 11:00] 7200
[2025-12-19 09:57:23] [87000-161400]:[11-02 00:10-11-02 20:50] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[87000-99000]:[11-02 00:10-11-02 03:30] 12000
[113400-161400]:[11-02 07:30-11-02 20:50] 48000
[2025-12-19 09:57:23]
[2025-12-19 10:02:40]
=== Schedule Summary === 0.484233
[2025-12-19 10:02:40] Operation: 1|1
[2025-12-19 10:02:40] Makespan: 471600.000000 minutes
[2025-12-19 10:02:40] Total Tardiness: 0.000000 hours
[2025-12-19 10:02:40] Setup Time: 0.000000 minutes
[2025-12-19 10:02:40] Flow Time: 164400.000000 minutes
[2025-12-19 10:02:40] Machine Load Balance: 99.23%
[2025-12-19 10:02:40] -------------------------
[2025-12-19 10:02:40] [381600-471600]:[11-05 10:00-11-06 11:00] Order 1, Machine 3402, Operation 1, Batch 50000.0, processingTime %.1f
[381600-410400]:[11-05 10:00-11-05 18:00] 28800
[464400-471600]:[11-06 09:00-11-06 11:00] 7200
[2025-12-19 10:02:40] [87000-161400]:[11-02 00:10-11-02 20:50] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[87000-99000]:[11-02 00:10-11-02 03:30] 12000
[113400-161400]:[11-02 07:30-11-02 20:50] 48000
[2025-12-19 10:02:40]
[2025-12-19 11:12:03]
=== Schedule Summary === 0.484233
[2025-12-19 11:12:03] Operation: 1|1
[2025-12-19 11:12:03] Makespan: 87000.000000 minutes
[2025-12-19 11:12:03] Total Tardiness: 0.000000 hours
[2025-12-19 11:12:03] Setup Time: 0.000000 minutes
[2025-12-19 11:12:03] Flow Time: 96000.000000 minutes
[2025-12-19 11:12:03] Machine Load Balance: 92.11%
[2025-12-19 11:12:03] -------------------------
[2025-12-19 11:12:03] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3403, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-19 11:12:03] [27000-87000]:[11-01 07:30-11-02 00:10] Order 1, Machine 3243, Operation 2, Batch 50000.0, processingTime %.1f
[27000-87000]:[11-01 07:30-11-02 00:10] 60000
[2025-12-19 11:12:03]
[2025-12-19 11:12:03]
=== Schedule Summary === 0.484233
[2025-12-19 11:12:03] Operation: 1|1
[2025-12-19 11:12:03] Makespan: 382560.000000 minutes
[2025-12-19 11:12:03] Total Tardiness: 0.000000 hours
[2025-12-19 11:12:03] Setup Time: 0.000000 minutes
[2025-12-19 11:12:03] Flow Time: 110400.000000 minutes
[2025-12-19 11:12:03] Machine Load Balance: 99.36%
[2025-12-19 11:12:03] -------------------------
[2025-12-19 11:12:03] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3403, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-19 11:12:03] [308160-382560]:[11-04 13:36-11-05 10:16] Order 1, Machine 3401, Operation 2, Batch 50000.0, processingTime %.1f
[308160-358200]:[11-04 13:36-11-05 03:30] 50040
[372600-382560]:[11-05 07:30-11-05 10:16] 9960
[2025-12-19 11:12:03]
src/main/java/com/aps/service/plan/PlanResultService.java
View file @ 0b047fab
......@@ -1082,6 +1082,27 @@ private GlobalParam InitGlobalParam()
}
List<PlanResource> PlanResources1 = PlanResources.stream()
.filter(t -> t.getReferenceId() == machine.getId())
.collect(Collectors.toList());
if(PlanResources1!=null&&PlanResources1.size()>0&&shifts1==null)
{
for (PlanResource PlanResource : PlanResources1) {
List<MesShiftWorkSched> ShiftWorkScheds = MesShiftWorkScheds.stream()
.filter(t -> (long) t.getWeekWorkSchedId() == PlanResource.getWorkSchedId())
.collect(Collectors.toList());
List<Shift> Shifts = mergeShiftData(ShiftWorkScheds);
for (Shift shift : Shifts) {
shift.setMachineId(machine.getId());
shift.setStartDate(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
shift.setEndDate(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
shifts1.add(shift);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment