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
6b4db4d5
Commit
6b4db4d5
authored
Dec 09, 2025
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
场景创建修改bug
parent
baeaecee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
OperationDependency.java
...in/java/com/aps/entity/Algorithm/OperationDependency.java
+12
-0
ProdEquipSpecialCalServiceImpl.java
.../com/aps/service/impl/ProdEquipSpecialCalServiceImpl.java
+1
-0
No files found.
src/main/java/com/aps/entity/Algorithm/OperationDependency.java
View file @
6b4db4d5
package
com
.
aps
.
entity
.
Algorithm
;
import
com.fasterxml.jackson.annotation.JsonCreator
;
import
lombok.Data
;
/**
...
...
@@ -12,4 +13,15 @@ public class OperationDependency {
private
int
prevOperationId
;
// 前置工序ID
private
int
nextOperationId
;
// 后继工序ID
private
DependencyType
dependencyType
=
DependencyType
.
FinishToStart
;
// 依赖类型
/**
* 添加构造函数以便Jackson能正确反序列化
* 当JSON中只有单一数值时,将其作为Id字段的值
*/
@JsonCreator
public
static
OperationDependency
fromInt
(
int
id
)
{
OperationDependency
od
=
new
OperationDependency
();
od
.
Id
=
id
;
return
od
;
}
}
src/main/java/com/aps/service/impl/ProdEquipSpecialCalServiceImpl.java
View file @
6b4db4d5
...
...
@@ -37,6 +37,7 @@ public class ProdEquipSpecialCalServiceImpl extends ServiceImpl<ProdEquipSpecial
List
<
EquipCapacityDef
>
activeCapacityDefs
=
equipCapacityDefService
.
lambdaQuery
()
.
eq
(
EquipCapacityDef:
:
getIsDeleted
,
0
)
.
isNotNull
(
EquipCapacityDef:
:
getReferenceId
)
.
isNotNull
(
EquipCapacityDef:
:
getEquipId
)
// 过滤掉 equipId 为 null 的记录
.
list
();
// 转换对象并设置必要字段
...
...
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