|
@@ -875,6 +875,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
|
|
|
//本道工序的可选设备
|
|
|
List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(crse -> apsProcessOperationDo1.getId().equals(crse.getMainid())).collect(Collectors.toList());
|
|
|
+ if (apsProcessOperationEquDos1.size() == 0) {
|
|
|
+ return R.error("工艺步骤" + apsProcessOperationDo1.getProcessname() + "没可选设备");
|
|
|
+ }
|
|
|
for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
|
|
|
ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
|
|
|
processOperationEquDo.setId(SecurityUtil.getUUID());
|
|
@@ -1058,6 +1061,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
if (hasFirst) {
|
|
|
//本道工序的可选设备
|
|
|
List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(omd -> apsProcessOperationDo.getId().equals(omd.getMainid())).collect(Collectors.toList());
|
|
|
+ if (apsProcessOperationEquDos1.size() == 0) {
|
|
|
+ return R.error("工艺步骤" + apsProcessOperationDo.getProcessname() + "没可选设备");
|
|
|
+ }
|
|
|
for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
|
|
|
ApsProcessOperationEquDo processOperationEquDo = BeanUtil.toBean(apsProcessOperationEquDo, ApsProcessOperationEquDo.class);
|
|
|
processOperationEquDo.setId(SecurityUtil.getUUID());
|