Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.APSJ
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
佟礼
HYH.APSJ
Commits
0cfb29ea
Commit
0cfb29ea
authored
Nov 14, 2025
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释打印
parent
2d7e8ff6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
ResourceGanttController.java
...ava/com/aps/controller/gantt/ResourceGanttController.java
+5
-5
AlgorithmScheduler7.java
src/main/java/com/aps/service/plan/AlgorithmScheduler7.java
+3
-3
No files found.
src/main/java/com/aps/controller/gantt/ResourceGanttController.java
View file @
0cfb29ea
...
@@ -176,11 +176,11 @@ public class ResourceGanttController {
...
@@ -176,11 +176,11 @@ public class ResourceGanttController {
taskVOList
.
add
(
taskVO
);
taskVOList
.
add
(
taskVO
);
// 调试:检查machine中的shifts状态
// 调试:检查machine中的shifts状态
if
(
machine
.
getShifts
()
!=
null
)
{
//
if (machine.getShifts() != null) {
for
(
Shift
shift
:
machine
.
getShifts
())
{
//
for (Shift shift : machine.getShifts()) {
System
.
out
.
println
(
"Before setting shifts - Shift status: "
+
shift
.
getStatus
());
//
System.out.println("Before setting shifts - Shift status: " + shift.getStatus());
}
//
}
}
//
}
taskVO
.
setAbsolutePreparationTime
(
gene
.
getTeardownTime
());
taskVO
.
setAbsolutePreparationTime
(
gene
.
getTeardownTime
());
...
...
src/main/java/com/aps/service/plan/AlgorithmScheduler7.java
View file @
0cfb29ea
...
@@ -305,7 +305,7 @@ public class AlgorithmScheduler7 {
...
@@ -305,7 +305,7 @@ public class AlgorithmScheduler7 {
// 无历史任务 → 换型时间0
// 无历史任务 → 换型时间0
if
(
lastGeneOnMachine
==
null
)
{
if
(
lastGeneOnMachine
==
null
)
{
System
.
out
.
printf
(
"设备%d:无历史任务,换型时间=0%n"
,
machine
.
getId
());
//
System.out.printf("设备%d:无历史任务,换型时间=0%n", machine.getId());
return
0
;
return
0
;
}
}
...
@@ -314,8 +314,8 @@ public class AlgorithmScheduler7 {
...
@@ -314,8 +314,8 @@ public class AlgorithmScheduler7 {
?
machineOption
.
getSetupTime
()
?
machineOption
.
getSetupTime
()
:
0
;
:
0
;
System
.
out
.
printf
(
"设备%d:上一产品ID=%d,当前产品ID=%d,换型时间=%d分钟%n"
,
//
System.out.printf("设备%d:上一产品ID=%d,当前产品ID=%d,换型时间=%d分钟%n",
machine
.
getId
(),
lastGeneOnMachine
.
getProductId
(),
currentOrder
.
getProductId
(),
setupTime
);
//
machine.getId(), lastGeneOnMachine.getProductId(), currentOrder.getProductId(), setupTime);
return
setupTime
;
return
setupTime
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment