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
72cd676d
Commit
72cd676d
authored
Mar 16, 2026
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下发修改
parent
7666d8f3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
51 deletions
+75
-51
GeneticDecoder.java
src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
+1
-1
LanuchServiceImpl.java
src/main/java/com/aps/service/impl/LanuchServiceImpl.java
+74
-50
No files found.
src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
View file @
72cd676d
...
...
@@ -282,7 +282,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
public
void
decode
(
Chromosome
chromosome
)
{
List
<
OrderMaterialRequirement
>
orderMaterials
=
materialRequirementService
.
buildMultiLevelRequirementNetwork
(
chromosome
,
sceneId
,
baseTime
,
_globalParam
);
//
List<OrderMaterialRequirement> orderMaterials = materialRequirementService.buildMultiLevelRequirementNetwork(chromosome, sceneId, baseTime,_globalParam);
chromosome
.
setScenarioID
(
sceneId
);
if
(
_globalParam
.
isIsCheckSf
())
{
int
isnew
=
generateGlobalOpList
(
chromosome
);
...
...
src/main/java/com/aps/service/impl/LanuchServiceImpl.java
View file @
72cd676d
...
...
@@ -115,12 +115,22 @@ public class LanuchServiceImpl implements LanuchService {
if
(
apsOrderIds
.
isEmpty
())
{
apsOrders
=
new
ArrayList
<>();
}
else
{
apsOrders
=
apsOrderService
.
lambdaQuery
()
// Oracle IN子句限制最多1000个值,需要分批查询
apsOrders
=
new
ArrayList
<>();
int
batchSize
=
1000
;
for
(
int
i
=
0
;
i
<
apsOrderIds
.
size
();
i
+=
batchSize
)
{
int
endIndex
=
Math
.
min
(
i
+
batchSize
,
apsOrderIds
.
size
());
List
<
String
>
batchIds
=
apsOrderIds
.
subList
(
i
,
endIndex
);
List
<
ApsOrder
>
batchOrders
=
apsOrderService
.
lambdaQuery
()
.
eq
(
ApsOrder:
:
getIsdeleted
,
0
)
.
eq
(
ApsOrder:
:
getStatus
,
4
)
// .eq(ApsOrder::getCreatoruserid, username)
.
in
(
ApsOrder:
:
getId
,
apsOrder
Ids
)
.
in
(
ApsOrder:
:
getId
,
batch
Ids
)
.
list
();
apsOrders
.
addAll
(
batchOrders
);
}
}
if
(
CollectionUtils
.
isEmpty
(
apsOrders
))
{
throw
new
SceneGenerationException
(
"工单列表不能为空"
);
...
...
@@ -800,19 +810,33 @@ public class LanuchServiceImpl implements LanuchService {
}
public
List
<
RoutingDetail
>
getRoutingDetails
(
List
<
Long
>
routingHeaderIds
)
{
if
(
routingHeaderIds
.
isEmpty
())
{
return
new
ArrayList
<>();
}
// Oracle IN子句限制最多1000个值,需要分批查询
List
<
RoutingDetail
>
allRoutingDetails
=
new
ArrayList
<>();
int
batchSize
=
1000
;
for
(
int
i
=
0
;
i
<
routingHeaderIds
.
size
();
i
+=
batchSize
)
{
int
endIndex
=
Math
.
min
(
i
+
batchSize
,
routingHeaderIds
.
size
());
List
<
Long
>
batchIds
=
routingHeaderIds
.
subList
(
i
,
endIndex
);
LambdaQueryWrapper
<
RoutingDetail
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
in
(
RoutingDetail:
:
getRoutingHeaderId
,
routingHeader
Ids
)
wrapper
.
in
(
RoutingDetail:
:
getRoutingHeaderId
,
batch
Ids
)
.
eq
(
RoutingDetail:
:
getIsDeleted
,
0
)
// 添加 is_deleted=0 过滤条件
.
orderByAsc
(
RoutingDetail:
:
getTaskSeq
);
List
<
RoutingDetail
>
routingDetails
=
routingDetailMapper
.
selectList
(
wrapper
);
List
<
RoutingDetail
>
batchDetails
=
routingDetailMapper
.
selectList
(
wrapper
);
allRoutingDetails
.
addAll
(
batchDetails
);
}
if
(
CollectionUtils
.
isEmpty
(
r
outingDetails
))
{
if
(
CollectionUtils
.
isEmpty
(
allR
outingDetails
))
{
log
.
error
(
"工艺下无工序信息: {}"
,
routingHeaderIds
);
throw
new
RuntimeException
(
"工艺下无工序信息: "
+
routingHeaderIds
);
}
return
r
outingDetails
;
return
allR
outingDetails
;
}
/**
...
...
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