|
@@ -164,6 +164,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
|
|
|
req.getVersionWorks().forEach(versionWork -> {
|
|
|
//新增工作站
|
|
|
BentelerIniWorkstation workstation = BentelerIniWorkstation.builder()
|
|
|
+ .versionId(version.getId())
|
|
|
.workstation(versionWork.getWorkstation())
|
|
|
.productionLine(versionWork.getProductionLine())
|
|
|
.versionId(version.getId())
|
|
@@ -305,7 +306,6 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
|
|
|
if (unAuditVersion != null) {
|
|
|
Long versionId_DB = unAuditVersion.getId();
|
|
|
versionService.removeById(versionId_DB);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
String name = planService.getById(planId).getName();
|
|
@@ -323,13 +323,11 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
|
|
|
workstationService.saveBatch(workstations);
|
|
|
workstations.forEach(item -> {
|
|
|
List<BentelerIniVersionItem> versionItems = item.getVersionItems();
|
|
|
-
|
|
|
versionItems.forEach(versionItem -> {
|
|
|
versionItem.setPlanId(planId);
|
|
|
versionItem.setVersionId(version_req.getId());
|
|
|
});
|
|
|
versionItemService.saveBatch(versionItems);
|
|
|
-
|
|
|
});
|
|
|
return ResponseBeanBuilder.ok();
|
|
|
}
|
|
@@ -596,6 +594,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
|
|
|
principleTwo = principalIds.get(1);
|
|
|
}
|
|
|
BentelerIniVersion version = BentelerIniVersion.builder()
|
|
|
+ .id(req.getVersionId())
|
|
|
.planId(plan.getId())
|
|
|
.checkStatus(CheckStatus.未完成.value)
|
|
|
.principleOne(principleOne)
|
|
@@ -617,6 +616,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
|
|
|
ArrayList<BentelerIniWorkstation> workstations = new ArrayList<>();
|
|
|
req.getVersionWorks().forEach(versionWork -> {
|
|
|
BentelerIniWorkstation workstation = BentelerIniWorkstation.builder()
|
|
|
+ .versionId(version.getId())
|
|
|
.workstation(versionWork.getWorkstation())
|
|
|
.productionLine(versionWork.getProductionLine())
|
|
|
.build();
|