|
@@ -4,6 +4,7 @@ import org.optaplanner.core.api.domain.entity.PlanningEntity;
|
|
|
import org.optaplanner.core.api.domain.variable.PlanningVariable;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -87,11 +88,19 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
* 上一个工步
|
|
|
*/
|
|
|
private List<ProductionProcesses> previousProcesses;
|
|
|
+ /**
|
|
|
+ * 上一个工步ID
|
|
|
+ */
|
|
|
+ private List<Long> previousProcessesIds;
|
|
|
|
|
|
/**
|
|
|
* 下一个工步
|
|
|
*/
|
|
|
private List<ProductionProcesses> nextProcesses;
|
|
|
+ /**
|
|
|
+ * 下一个工步ID
|
|
|
+ */
|
|
|
+ private List<Long> nextProcessesIds;
|
|
|
|
|
|
public String getEquipmentType() {
|
|
|
return equipmentType;
|
|
@@ -155,6 +164,13 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
|
|
|
public void setPreviousProcesses(List<ProductionProcesses> previousProcesses) {
|
|
|
this.previousProcesses = previousProcesses;
|
|
|
+ if(previousProcesses != null){
|
|
|
+ List<Long> ids = new ArrayList<>();
|
|
|
+ for (ProductionProcesses previousProcess : previousProcesses) {
|
|
|
+ ids.add(previousProcess.getId());
|
|
|
+ }
|
|
|
+ this.previousProcessesIds = ids;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public List<ProductionProcesses> getNextProcesses() {
|
|
@@ -163,6 +179,13 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
|
|
|
public void setNextProcesses(List<ProductionProcesses> nextProcesses) {
|
|
|
this.nextProcesses = nextProcesses;
|
|
|
+ if(nextProcesses != null){
|
|
|
+ List<Long> ids = new ArrayList<>();
|
|
|
+ for (ProductionProcesses nextProcesse : nextProcesses) {
|
|
|
+ ids.add(nextProcesse.getId());
|
|
|
+ }
|
|
|
+ this.nextProcessesIds = ids;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public List<ProduceOrder> getProduceOrder() {
|
|
@@ -212,4 +235,20 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
public void setMergeProcessMark(String mergeProcessMark) {
|
|
|
this.mergeProcessMark = mergeProcessMark;
|
|
|
}
|
|
|
+
|
|
|
+ public List<Long> getPreviousProcessesIds() {
|
|
|
+ return previousProcessesIds;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setPreviousProcessesIds(List<Long> previousProcessesIds) {
|
|
|
+ this.previousProcessesIds = previousProcessesIds;
|
|
|
+ }
|
|
|
+
|
|
|
+ public List<Long> getNextProcessesIds() {
|
|
|
+ return nextProcessesIds;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setNextProcessesIds(List<Long> nextProcessesIds) {
|
|
|
+ this.nextProcessesIds = nextProcessesIds;
|
|
|
+ }
|
|
|
}
|