daili 3 ani în urmă
părinte
comite
e0b54086ab

+ 0 - 3
application-facade/src/main/java/com/factory/controller/web/InitialPlanWebController.java

@@ -48,7 +48,6 @@ public class InitialPlanWebController {
     @ApiOperationSupport(order = 2)
     @PostMapping("/planlist")
     public ResponseBean<PageBean<PagePlanRes>> planlist(@RequestBody PlanListReq req) {
-
         return bentelerIniVersionService.pagePlan_web(req);
     }
     @ApiOperation(value = "禁用计划")
@@ -81,7 +80,6 @@ public class InitialPlanWebController {
     @ApiOperationSupport(order = 7)
     public ResponseBean<Boolean> getIsUnAuditVersionId(@RequestBody BaseIdReq req) {
         return bentelerIniVersionService.getIsUnAuditVersionId(req);
-
     }
 
     @ApiOperation(value = "查看版本 - 待审核标准详情 计划id")
@@ -109,7 +107,6 @@ public class InitialPlanWebController {
     @ApiOperation(value = "首件计划导出excel")
     @PostMapping("/exportInitialPlan")
     public ResponseBean<FileRes> exportInitialPlan(@RequestBody exportInitialPlanReq req) {
-
         return bentelerIniVersionService.exportInitialPlan(req);
     }
 }

+ 3 - 0
application-facade/src/main/java/com/factory/web/entity/vo/req/web/AddIniPlanWorkReq.java

@@ -25,6 +25,9 @@ import java.util.List;
 public class AddIniPlanWorkReq {
 
 
+    @ApiModelProperty(value = "版本id",example = "1")
+    private Long versionId;
+
     @ApiModelProperty(value = "生产线",example = "生产线")
     private String productionLine;
 

+ 3 - 3
application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -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();