From c87ba884b1b121c4382110fbd82c5fb9f589a992 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 8 Jul 2024 16:29:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B7=A5=E5=BA=8F=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90'product:process:query'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/process/ProcessController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java index ca68d0afa..6b167bf2e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java @@ -119,7 +119,7 @@ public class ProcessController { @GetMapping("/select") @Operation(summary = "查看当前登录用户的组织的工序信息") @Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('system:process:query')") + @PreAuthorize("@ss.hasAnyPermissions('system:process:query','product:process:query')") public CommonResult> getUserPage(@Valid @RequestParam("userId") Long userId) { return success(processService.getUserProcess(userId)); From 0e9108d061c17780aecf9ba6ae7d739b3df61c91 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Mon, 8 Jul 2024 18:10:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9-=E4=BD=99=E6=96=99?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/api/webcad/ApiTypeRealize.java | 9 ++-- .../plate/vo/remain/RemainPlatePageReqVO.java | 5 +++ .../mysql/remainplaten/RemainPlateMapper.java | 45 +++++++++++++++++-- .../remainplaten/RemainPlateServiceImpl.java | 10 ++--- 4 files changed, 57 insertions(+), 12 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index 284272e73..d3daf2825 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -610,13 +610,16 @@ public class ApiTypeRealize { .setDrillsRemark(plate.getString("DrillsRemark")) .setInfoRemark(plate.getString("InfoRemark")) .setRemarkJsonDei(plate.getString("RemarkJson")); - if (plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() > 0){ + if (plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() != null + && plateDetail.get(plate.getLong("BlockNo")).getThroughModelCount() > 0){ plateInfo.setFilterType(plateInfo.getFilterType() + ",1"); } - if (plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() > 0){ + if (plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() != null + && plateDetail.get(plate.getLong("BlockNo")).getThroughHoleCount() > 0){ plateInfo.setFilterType(plateInfo.getFilterType() + ",2"); } - if (plateDetail.get(plate.getLong("BlockNo")).getHas2DModel()){ + if (plateDetail.get(plate.getLong("BlockNo")).getHas2DModel() != null + && plateDetail.get(plate.getLong("BlockNo")).getHas2DModel()){ plateInfo.setFilterType(plateInfo.getFilterType() + ",4"); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java index f106d3456..f7a3b3cc6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java @@ -83,4 +83,9 @@ public class RemainPlatePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "排序", example = "ascend") + private String order; + + @Schema(description = "排序字段", example = "id") + private String field; } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java index 3b2dcc61b..2ad070a71 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java @@ -22,10 +22,10 @@ import java.util.Set; public interface RemainPlateMapper extends BaseMapperX { default PageResult selectPage(RemainPlatePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX() .likeIfPresent(RemainPlateDO::getId,reqVO.getId() != null ? reqVO.getId().toString() : null) .eqIfPresent(RemainPlateDO::getPlanId, reqVO.getPlanId() != null ? reqVO.getPlanId().toString() : null) - .eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId()) + .eqIfPresent(RemainPlateDO::getInitPlanId, reqVO.getInitPlanId() != null ? reqVO.getInitPlanId().toString() : null) .eqIfPresent(RemainPlateDO::getStatus, reqVO.getStatus()) .eqIfPresent(RemainPlateDO::getGoodsId, reqVO.getGoodsId()) .eqIfPresent(RemainPlateDO::getIsCutting, reqVO.getIsCutting()) @@ -44,8 +44,45 @@ public interface RemainPlateMapper extends BaseMapperX { .eqIfPresent(RemainPlateDO::getOutLineJson, reqVO.getOutLineJson()) .betweenIfPresent(RemainPlateDO::getWidth, reqVO.getWidth()) .betweenIfPresent(RemainPlateDO::getLength, reqVO.getLength()) - .betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(RemainPlateDO::getId)); + .betweenIfPresent(RemainPlateDO::getCreateTime, reqVO.getCreateTime()); + + if (reqVO.getOrder() == null) { + wrapper.orderByDesc(RemainPlateDO::getId); + }else { + if (reqVO.getOrder().equals("ascend")) { + switch (reqVO.getField()) { + case "id" -> wrapper.orderByAsc(RemainPlateDO::getId); + case "length" -> wrapper.orderByAsc(RemainPlateDO::getLength); + case "width" -> wrapper.orderByAsc(RemainPlateDO::getWidth); + case "thickness" -> wrapper.orderByAsc(RemainPlateDO::getThickness); + case "material" -> wrapper.orderByAsc(RemainPlateDO::getMaterial); + case "color" -> wrapper.orderByAsc(RemainPlateDO::getColor); + case "texture" -> wrapper.orderByAsc(RemainPlateDO::getTexture); + case "brand" -> wrapper.orderByAsc(RemainPlateDO::getBrand); + case "store" -> wrapper.orderByAsc(RemainPlateDO::getStore); + case "initPlanId" -> wrapper.orderByAsc(RemainPlateDO::getInitPlanId); + case "planId" -> wrapper.orderByAsc(RemainPlateDO::getPlanId); + case "status" -> wrapper.orderByAsc(RemainPlateDO::getStatus); + } + }else if (reqVO.getOrder().equals("descend")) { + switch (reqVO.getField()) { + case "id" -> wrapper.orderByDesc(RemainPlateDO::getId); + case "length" -> wrapper.orderByDesc(RemainPlateDO::getLength); + case "width" -> wrapper.orderByDesc(RemainPlateDO::getWidth); + case "thickness" -> wrapper.orderByDesc(RemainPlateDO::getThickness); + case "material" -> wrapper.orderByDesc(RemainPlateDO::getMaterial); + case "color" -> wrapper.orderByDesc(RemainPlateDO::getColor); + case "texture" -> wrapper.orderByDesc(RemainPlateDO::getTexture); + case "brand" -> wrapper.orderByDesc(RemainPlateDO::getBrand); + case "store" -> wrapper.orderByDesc(RemainPlateDO::getStore); + case "initPlanId" -> wrapper.orderByDesc(RemainPlateDO::getInitPlanId); + case "planId" -> wrapper.orderByDesc(RemainPlateDO::getPlanId); + case "status" -> wrapper.orderByDesc(RemainPlateDO::getStatus); + } + } + } + + return selectPage(reqVO, wrapper); } default PageResult selectPageToAdd(RemainPlatePageReqVO reqVO) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java index bfd7c1fd3..5459c6b3c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java @@ -111,11 +111,11 @@ public class RemainPlateServiceImpl implements RemainPlateService { throw exception(REMAIN_PLATE_STATUS_USED); } // 判断是否为开料添加 - RemainPlateDO updateObj = new RemainPlateDO(); - if (validateRemainPlateIsCutting(updateReqVO.getId())) { + RemainPlateDO updateObj = validateRemainPlateIsCutting(updateReqVO.getId()); + if (updateObj.getIsCutting()) { updateObj.setRemark(updateReqVO.getRemark()); + updateObj.setStore(updateReqVO.getStore()); } else { - // 更新 updateObj = BeanUtils.toBean(updateReqVO, RemainPlateDO.class); } remainPlateMapper.updateById(updateObj); @@ -151,8 +151,8 @@ public class RemainPlateServiceImpl implements RemainPlateService { } } - private boolean validateRemainPlateIsCutting(Long id) { - return remainPlateMapper.selectById(id).getIsCutting(); + private RemainPlateDO validateRemainPlateIsCutting(Long id) { + return remainPlateMapper.selectById(id); } private Integer validateRemainPlateStatus(Long id) {