|
@@ -8,6 +8,7 @@ import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 工步,工艺路线里的工步
|
|
@@ -164,6 +165,21 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
*/
|
|
|
private Boolean ifLock;
|
|
|
|
|
|
+ /**
|
|
|
+ * 单卷宽度
|
|
|
+ */
|
|
|
+ private BigDecimal volumeWidth;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 合金
|
|
|
+ */
|
|
|
+ private String volumeMetal;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 输入物料
|
|
|
+ */
|
|
|
+ private String inputMaterials;
|
|
|
+
|
|
|
public String getEquipmentType() {
|
|
|
return equipmentType;
|
|
|
}
|
|
@@ -184,20 +200,35 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
this.equipmentId = equipment.getId();
|
|
|
}
|
|
|
}
|
|
|
- /*if(this.equipment != null){
|
|
|
+ if(this.equipment != null){
|
|
|
// 设置设备的工序占用
|
|
|
if(this.equipment.getProcessesList() == null){
|
|
|
this.equipment.setProcessesList(new ArrayList<>());
|
|
|
}
|
|
|
- ProductionProcesses pp = new ProductionProcesses();
|
|
|
- pp.setId(this.getId());
|
|
|
- pp.setEquipmentId(this.getEquipmentId());
|
|
|
-// pp.setEquipment(this.getEquipment());
|
|
|
- pp.setProduceTime(this.getProduceTime());
|
|
|
- pp.setStartTime(this.getStartTime());
|
|
|
- pp.setEndTime(this.getEndTime());
|
|
|
- this.equipment.getProcessesList().add(pp);
|
|
|
- }*/
|
|
|
+ boolean a = false;
|
|
|
+ for (ProductionProcesses productionProcesses : this.equipment.getProcessesList()) {
|
|
|
+ if(productionProcesses.getId().equals(this.getId())){
|
|
|
+ productionProcesses.setEquipmentId(this.getEquipmentId());
|
|
|
+ productionProcesses.setProduceTime(this.getProduceTime());
|
|
|
+ productionProcesses.setStartTime(this.getStartTime());
|
|
|
+ productionProcesses.setEndTime(this.getEndTime());
|
|
|
+ productionProcesses.setVolumeMetal(this.getVolumeMetal());
|
|
|
+ productionProcesses.setVolumeWidth(this.getVolumeWidth());
|
|
|
+ a = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!a){
|
|
|
+ ProductionProcesses pp = new ProductionProcesses();
|
|
|
+ pp.setId(this.getId());
|
|
|
+ pp.setEquipmentId(this.getEquipmentId());
|
|
|
+ pp.setProduceTime(this.getProduceTime());
|
|
|
+ pp.setStartTime(this.getStartTime());
|
|
|
+ pp.setEndTime(this.getEndTime());
|
|
|
+ pp.setVolumeMetal(this.getVolumeMetal());
|
|
|
+ pp.setVolumeWidth(this.getVolumeWidth());
|
|
|
+ this.equipment.getProcessesList().add(pp);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public String getEquipmentId() {
|
|
@@ -227,6 +258,17 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
if(startTime != null){
|
|
|
this.endTime = startTime.plusMinutes(produceTime);
|
|
|
}
|
|
|
+ // 零件更换时间,查询设备已运行时间,以及最后一道工序的参数
|
|
|
+ /*if(this.equipment != null && equipment.getProcessesList() != null && equipment.getProcessesList().size()>0){
|
|
|
+ // 最后一道工序
|
|
|
+ ProductionProcesses lastProcesses = equipment.getProcessesList().get(equipment.getProcessesList().size() - 1);
|
|
|
+ String volumeMetal1 = lastProcesses.getVolumeMetal();
|
|
|
+ BigDecimal volumeWidth1 = lastProcesses.getVolumeWidth();
|
|
|
+
|
|
|
+ if(this.volumeMetal != null && this.volumeMetal.equals(volumeMetal1) && this.volumeWidth.equals(volumeWidth1)){
|
|
|
+
|
|
|
+ }
|
|
|
+ }*/
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -259,13 +301,13 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
|
|
|
public void setNextProcesses(List<ProductionProcesses> nextProcesses) {
|
|
|
this.nextProcesses = nextProcesses;
|
|
|
- if(nextProcesses != null){
|
|
|
+ /*if(nextProcesses != null){
|
|
|
List<String> ids = new ArrayList<>();
|
|
|
for (ProductionProcesses nextProcesse : nextProcesses) {
|
|
|
ids.add(nextProcesse.getId());
|
|
|
}
|
|
|
this.nextProcessesIds = ids;
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
|
|
|
public List<ProduceOrder> getProduceOrder() {
|
|
@@ -411,4 +453,28 @@ public class ProductionProcesses extends ApsAbstractPersistable{
|
|
|
public void setProcessType(String processType) {
|
|
|
this.processType = processType;
|
|
|
}
|
|
|
+
|
|
|
+ public BigDecimal getVolumeWidth() {
|
|
|
+ return volumeWidth;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setVolumeWidth(BigDecimal volumeWidth) {
|
|
|
+ this.volumeWidth = volumeWidth;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getVolumeMetal() {
|
|
|
+ return volumeMetal;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setVolumeMetal(String volumeMetal) {
|
|
|
+ this.volumeMetal = volumeMetal;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getInputMaterials() {
|
|
|
+ return inputMaterials;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setInputMaterials(String inputMaterials) {
|
|
|
+ this.inputMaterials = inputMaterials;
|
|
|
+ }
|
|
|
}
|