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
d080df16
Commit
d080df16
authored
Feb 03, 2026
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单供给关系
parent
35468cd2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
ResourceGanttController.java
...ava/com/aps/controller/gantt/ResourceGanttController.java
+1
-1
PlanResultService.java
src/main/java/com/aps/service/plan/PlanResultService.java
+17
-5
No files found.
src/main/java/com/aps/controller/gantt/ResourceGanttController.java
View file @
d080df16
...
@@ -878,7 +878,7 @@ public class ResourceGanttController {
...
@@ -878,7 +878,7 @@ public class ResourceGanttController {
// 提取参数
// 提取参数
String
sceneId
=
ParamValidator
.
getString
(
params
,
"sceneId"
,
"场景ID"
);
String
sceneId
=
ParamValidator
.
getString
(
params
,
"sceneId"
,
"场景ID"
);
Integer
entryId
=
ParamValidator
.
getInteger
(
params
,
"entryId"
,
"工序ID"
);
Integer
entryId
=
ParamValidator
.
getInteger
(
params
,
"entryId"
,
"工序ID"
);
ParamValidator
.
validateSceneExists
(
sceneService
,
sceneId
);
//
ParamValidator.validateSceneExists(sceneService, sceneId);
// 调用服务获取供给关系
// 调用服务获取供给关系
List
<
Object
>
data
=
planResultService
.
getSupplyRelation
(
sceneId
,
entryId
,
sceneService
);
List
<
Object
>
data
=
planResultService
.
getSupplyRelation
(
sceneId
,
entryId
,
sceneService
);
...
...
src/main/java/com/aps/service/plan/PlanResultService.java
View file @
d080df16
...
@@ -1356,7 +1356,23 @@ private GlobalParam InitGlobalParam()
...
@@ -1356,7 +1356,23 @@ private GlobalParam InitGlobalParam()
public
List
<
Object
>
getSupplyRelation
(
String
sceneId
,
Integer
entryId
,
SceneService
sceneService
)
{
public
List
<
Object
>
getSupplyRelation
(
String
sceneId
,
Integer
entryId
,
SceneService
sceneService
)
{
List
<
Object
>
supplyRelations
=
new
ArrayList
<>();
List
<
Object
>
supplyRelations
=
new
ArrayList
<>();
try
{
try
{
SceneChromsome
sceneChromsome
=
new
SceneChromsome
();
sceneChromsome
.
setSceneID
(
sceneId
);
sceneChromsome
.
setVersion
(
15
);
redisUtils
.
set
(
"SceneId."
+
sceneId
,
sceneChromsome
);
SceneChromsome
sceneChromsome1
=(
SceneChromsome
)
redisUtils
.
get
(
"SceneId."
+
sceneId
);
Chromosome
chromosome
=
sceneService
.
loadChromosomeFromFile
(
sceneId
);
Chromosome
chromosome
=
sceneService
.
loadChromosomeFromFile
(
sceneId
);
if
(
chromosome
==
null
||
chromosome
.
getAllOperations
()
==
null
)
return
supplyRelations
;
if
(
chromosome
==
null
||
chromosome
.
getAllOperations
()
==
null
)
return
supplyRelations
;
List
<
Entry
>
entries
=
chromosome
.
getAllOperations
();
List
<
Entry
>
entries
=
chromosome
.
getAllOperations
();
List
<
Order
>
orders
=
chromosome
.
getOrders
();
List
<
Order
>
orders
=
chromosome
.
getOrders
();
...
@@ -1432,11 +1448,7 @@ private GlobalParam InitGlobalParam()
...
@@ -1432,11 +1448,7 @@ private GlobalParam InitGlobalParam()
}
}
}
}
}
}
// 添加from和to对象结构
Map
<
String
,
Object
>
item2
=
new
HashMap
<>();
item2
.
put
(
"from"
,
new
HashMap
<>());
item2
.
put
(
"to"
,
new
HashMap
<>());
supplyRelations
.
add
(
item2
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"获取供给关系失败: {}"
,
e
.
getMessage
(),
e
);
log
.
error
(
"获取供给关系失败: {}"
,
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