From ecfcc813ca7787eb7463c57fc70237a9760847aa Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 17 Mar 2025 16:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85-=E7=A9=BA?= =?UTF-8?q?=E5=8C=85=E8=A3=B9=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=B0=81?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=86=E9=85=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/pack/PackServiceImpl.java | 11 +++++++++- .../system/enums/ErrorCodeConstants.java | 1 + .../controller/admin/user/UserController.java | 22 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 1f3b9e080..87fbd25f5 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -309,12 +309,16 @@ public class PackServiceImpl implements PackService { } - return typeConversion(orderPackageDO); } + if(reqVO.getAddPartsIdList().isEmpty() && reqVO.getAddPlateIdList().isEmpty() && reqVO.getDeletePartsIdList().isEmpty()){ + throw exception(PART_PACK_DATA_ERROR); + } + + OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackId(reqVO.getPackId(),reqVO.getOrderId(), getUserOrganId()); AssertUtils.notEmpty(orderPackageDO,ORDER_PACK_DATA_ERROR); @@ -432,6 +436,11 @@ public class PackServiceImpl implements PackService { } + if(packageVO.getAddPlateIdList().isEmpty() && packageVO.getAddPartsIdList().isEmpty() && packageVO.getDeletePlateIdList().isEmpty()){ + throw exception(PART_PACK_DATA_ERROR); + } + + OrderPackageDO orderPackageDO = orderPackageMapper.selectByPackId(packageVO.getPackId(),packageVO.getOrderId(), getUserOrganId()); AssertUtils.notEmpty(orderPackageDO,ORDER_PACK_DATA_ERROR); diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index ec30a9025..eb007f833 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -340,6 +340,7 @@ public class ErrorCodeConstants { public static final ErrorCode PLAN_SORT_DATA_ERROR = new ErrorCode(1_002_041_048, "已无可进行排序的数据，无法进行排序"); public static final ErrorCode THIS_PLATE_IS_OPTIMIZE = new ErrorCode(1_002_041_049, "小板：{}，已开料，无法删除，请重新选择小板再删除"); public static final ErrorCode PLAN_INSERT_PLATE_ERROR = new ErrorCode(1_002_041_050, "当前排单无法新增自增小板，请删除排单重新创建"); + public static final ErrorCode PART_PACK_DATA_ERROR = new ErrorCode(1_002_041_051, "当前包裹数据为空，无法进行操作，请删除包裹"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java index 1285d9ef1..b3ede5b36 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/UserController.java @@ -42,6 +42,7 @@ import javax.annotation.Resource; import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -134,6 +135,27 @@ public class UserController { pageResult.getTotal())); } + + @GetMapping("/divide-user") + @Operation(summary = "角色管理-分配用户") + @Parameter(name = "organId", description = "组织ID", required = true) + public CommonResult> getDivideUser(@Valid @RequestParam("organId") @NotNull(message = "组织ID不能为空") Long organId) { + + UserPageReqVO pageReqVO = new UserPageReqVO(); + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + pageReqVO.setOrganId(organId); + PageResult pageResult = userService.getUserPage(pageReqVO); + List list = pageResult.getList(); + + if (CollUtil.isEmpty(list)) { + return success(new ArrayList<>()); + } + return success(BeanUtils.toBean(list, UserRespVO.class)); + } + + + + @GetMapping({"/list-all-simple", "/simple-list"}) @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项") public CommonResult> getSimpleUserList( @RequestParam(value = "organId", required = false) Long organId,