diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/GroupPlateController.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/GroupPlateController.java index b784b931..be7beaf2 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/GroupPlateController.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/GroupPlateController.java @@ -29,6 +29,8 @@ import cn.code.nl.module.wms.controller.admin.groupplate.vo.*; import cn.code.nl.module.wms.dal.dataobject.groupplate.GroupPlateDO; import cn.code.nl.module.wms.service.groupplate.GroupPlateService; +import org.dromara.core.trans.anno.TransMethodResult; + @Tag(name = "管理后台 - 组盘记录") @RestController @RequestMapping("/wms/group-plate") @@ -82,6 +84,7 @@ public class GroupPlateController { @GetMapping("/page") @Operation(summary = "获得组盘记录分页") + @TransMethodResult @PreAuthorize("@ss.hasPermission('wms:group-plate:query')") public CommonResult> getGroupPlatePage(@Valid GroupPlatePageReqVO pageReqVO) { PageResult pageResult = groupPlateService.getGroupPlatePage(pageReqVO); diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/vo/GroupPlateRespVO.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/vo/GroupPlateRespVO.java index 48096916..84fc10fe 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/vo/GroupPlateRespVO.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/groupplate/vo/GroupPlateRespVO.java @@ -1,5 +1,7 @@ package cn.code.nl.module.wms.controller.admin.groupplate.vo; +import cn.code.nl.module.system.api.user.AdminUserApi; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -8,10 +10,17 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.vo.VO; + @Schema(description = "管理后台 - 组盘记录 Response VO") @Data @ExcelIgnoreUnannotated -public class GroupPlateRespVO { +public class GroupPlateRespVO implements VO { + + @TableId + private Long groupId; @Schema(description = "载具编码") @ExcelProperty("载具编码") @@ -71,18 +80,26 @@ public class GroupPlateRespVO { @Schema(description = "创建者") @ExcelProperty("创建者") + @Trans(type = TransType.AUTO_TRANS, key = AdminUserApi.PREFIX, fields = "nickname", ref = "creatorName") private String creator; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "创建者名称") + private String creatorName; + @Schema(description = "更新者") @ExcelProperty("更新者") + @Trans(type = TransType.AUTO_TRANS, key = AdminUserApi.PREFIX, fields = "nickname", ref = "updaterName") private String updater; @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("更新时间") private LocalDateTime updateTime; + @Schema(description = "更新者名称") + private String updaterName; + } \ No newline at end of file diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/groupplate/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/groupplate/index.ts index a9b90241..9efd9a02 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/groupplate/index.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/groupplate/index.ts @@ -20,6 +20,8 @@ export namespace WmsGroupPlateApi { extDtlCode: string; // 来源单据明细号 md5: string; // md5 materialCode?: string; // 物料编码 + creatorName?: string; // 创建者名称 + updaterName?: string; // 更新者名称 } } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/groupplate/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/groupplate/data.ts index 0e2778b4..71df5c9a 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/groupplate/data.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/groupplate/data.ts @@ -272,6 +272,10 @@ export function useGridColumns(): VxeTableGridOptions