diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java index 99c78f8f4..0b498dd37 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OptimizationSavePlateReqVO.java @@ -56,6 +56,9 @@ public class OptimizationSavePlateReqVO { private Integer texture; + @Schema(description = "排孔类型,0 正纹 1 反面 2 随意面") + private Integer placeHole; + @Schema(description = "宽度") private BigDecimal width; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 48b76a547..2b132409c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -265,7 +265,7 @@ public class PlateServiceImpl implements PlateService { PlateDO plateDO = BeanUtils.toBean(reqVO, PlateDO.class); plateDO.setRemark(reqVO.getRemake1() +","+ reqVO.getRemake2()); - + plateDO.setHoleArrange(reqVO.getPlaceHole()); plateDO.setGoodsId(reqVO.getGoodsId()); plateDO.setPlateNo((obtainingTime) + Long.toString(plateNo).substring(2)); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java index 85e9ebdc8..0fe4aa328 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/RemainPlateController.java @@ -49,7 +49,7 @@ public class RemainPlateController { @PostMapping("/createMultiple") @Operation(summary = "创建生产单余料板表(多个)") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:create')") + @PreAuthorize("@ss.hasPermission('placeorder:remain')") public CommonResult createRemainPlateMultiple(@Valid @RequestBody Set createReqVOS) { return success(remainPlateService.createRemainPlateMultiple(createReqVOS)); } @@ -75,7 +75,7 @@ public class RemainPlateController { @PutMapping("/revertUpdate") @Operation(summary = "余料板批量释放") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:update')") + @PreAuthorize("@ss.hasPermission('placeorder:remain')") public CommonResult revertRemainPlate(@RequestBody RemainPlateUptReqVO updateReqVO) { remainPlateService.revertRemainPlateStatus(updateReqVO.getId(),updateReqVO.getStatus()); return success(true); @@ -93,7 +93,7 @@ public class RemainPlateController { @GetMapping("/get") @Operation(summary = "获得生产单余料板表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:query')") + @PreAuthorize("@ss.hasPermission('placeorder:remain')") public CommonResult getRemainPlate(@RequestParam("id") Long id) { RemainPlateDO remainPlate = remainPlateService.getRemainPlate(id); return success(BeanUtils.toBean(remainPlate, RemainPlateRespVO.class)); @@ -109,7 +109,7 @@ public class RemainPlateController { @GetMapping("/export-excel") @Operation(summary = "导出生产单余料板表Excel") - @PreAuthorize("@ss.hasPermission('manage:remain-plate:export')") + @PreAuthorize("@ss.hasPermission('placeorder:remain')") @OperateLog(type = EXPORT) public void exportRemainPlateExcel(@Valid RemainPlatePageReqVO pageReqVO, HttpServletResponse response) throws IOException {