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
19a1519c
Commit
19a1519c
authored
Dec 18, 2025
by
Tong Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
遗传算法-
parent
28811d6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
RoutingDataService.java
...in/java/com/aps/service/Algorithm/RoutingDataService.java
+13
-1
PlanResultService.java
src/main/java/com/aps/service/plan/PlanResultService.java
+2
-1
No files found.
src/main/java/com/aps/service/Algorithm/RoutingDataService.java
View file @
19a1519c
...
...
@@ -300,7 +300,12 @@ public class RoutingDataService {
if
(
PlanResources1
!=
null
&&
PlanResources1
.
size
()>
0
)
{
for
(
PlanResource
PlanResource
:
PlanResources1
)
{
machine
.
setCode
(
PlanResource
.
getCode
());
machine
.
setName
(
PlanResource
.
getTitle
());
if
(
PlanResource
.
getWorkSchedId
()==
null
)
{
continue
;
}
List
<
MesShiftWorkSched
>
ShiftWorkScheds
=
MesShiftWorkScheds
.
stream
()
.
filter
(
t
->
(
long
)
t
.
getWeekWorkSchedId
()
==
PlanResource
.
getWorkSchedId
())
.
collect
(
Collectors
.
toList
());
...
...
@@ -315,7 +320,14 @@ public class RoutingDataService {
}
}
if
(
shifts1
.
size
()==
0
)
{
throw
new
RuntimeException
(
String
.
format
(
"设备%s没有设置日历"
,
machine
.
getCode
()+
":"
+
machine
.
getName
()));
}
machine
.
setShifts
(
shifts1
);
List
<
ProdEquipSpecialCal
>
Holidays
=
ProdEquipSpecialCals
.
stream
()
...
...
src/main/java/com/aps/service/plan/PlanResultService.java
View file @
19a1519c
...
...
@@ -300,6 +300,7 @@ order.setDueDate(LocalDateTime.of(2025, 12, 1,0,0,0));
public
Chromosome
execute2
(
String
SceneId
)
{
try
{
SceneId
=
"6AF8001449FC4D20A3C9992EC24CBF05"
;
ScheduleParams
param
=
new
ScheduleParams
();
param
.
setBaseTime
(
LocalDateTime
.
of
(
2025
,
11
,
1
,
0
,
0
,
0
));
...
...
@@ -356,7 +357,7 @@ order.setDueDate(LocalDateTime.of(2025, 12, 1,0,0,0));
return
chromosome
;
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
"调度执行失败
"
,
e
);
throw
new
RuntimeException
(
"调度执行失败
:"
+
e
.
getMessage
()
,
e
);
}
}
...
...
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