From 3d7669a1144fc4398569555601503fbbc43aad78 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Wed, 3 Jul 2024 15:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E6=96=99=E5=85=A5=E5=BA=93=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/plate/vo/OptimizationSavePlateReqVO.java        | 3 +++
 .../module/executor/service/plate/PlateServiceImpl.java   | 2 +-
 .../controller/admin/plate/RemainPlateController.java     | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

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<Boolean> createRemainPlateMultiple(@Valid @RequestBody Set<RemainPlateSaveReqVO> 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<Boolean> 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<RemainPlateRespVO> 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 {