diff --git a/nl-module-lms/nl-module-lms-server/pom.xml b/nl-module-lms/nl-module-lms-server/pom.xml index 4e8ad8e4..c954de97 100644 --- a/nl-module-lms/nl-module-lms-server/pom.xml +++ b/nl-module-lms/nl-module-lms-server/pom.xml @@ -43,6 +43,11 @@ nl-module-task-api ${revision} + + cn.nl.cloud + nl-module-system-api + ${revision} + cn.nl.cloud @@ -151,4 +156,4 @@ - \ No newline at end of file + diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/StockingIvtController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/StockingIvtController.java index 8f2b486c..2991c587 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/StockingIvtController.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/StockingIvtController.java @@ -14,6 +14,7 @@ import jakarta.annotation.Resource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import org.dromara.core.trans.anno.TransMethodResult; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -43,6 +44,7 @@ public class StockingIvtController { * 分页查询备货区域。 */ @GetMapping("/page") + @TransMethodResult @Operation(summary = "获得备货区域分页") @PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')") public CommonResult> getStockingIvtPage( @@ -54,6 +56,7 @@ public class StockingIvtController { * 查询备货区域详情。 */ @GetMapping("/get") + @TransMethodResult @Operation(summary = "获得备货区域详情") @Parameter(name = "ivtId", description = "库存记录标识", required = true) @PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')") diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java index 761c27f6..0c4c7958 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/stockingivt/vo/StockingIvtRespVO.java @@ -1,7 +1,12 @@ package cn.code.nl.module.lms.controller.admin.stockingivt.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.Data; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.vo.VO; import java.time.LocalDateTime; @@ -10,9 +15,10 @@ import java.time.LocalDateTime; */ @Schema(description = "管理后台 - 备货区域 Response VO") @Data -public class StockingIvtRespVO { +public class StockingIvtRespVO implements VO { @Schema(description = "库存记录标识") + @TableId private Long ivtId; @Schema(description = "点位编码") private String pointCode; @@ -33,7 +39,11 @@ public class StockingIvtRespVO { @Schema(description = "备注") private String remark; @Schema(description = "修改人") + @Trans(type = TransType.AUTO_TRANS, key = AdminUserApi.PREFIX, + fields = "nickname", ref = "updaterName") private String updater; + @Schema(description = "修改人名称") + private String updaterName; @Schema(description = "修改时间") private LocalDateTime updateTime; } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/stockingivt/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/stockingivt/index.ts index 7d96bcbe..e00da69e 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/stockingivt/index.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/stockingivt/index.ts @@ -15,6 +15,7 @@ export namespace LmsStockingIvtApi { remark?: string; sortSeq: number; updater?: string; + updaterName?: string; updateTime?: string; vehicleCode?: string; } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/stockingivt/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/stockingivt/data.ts index 17fa6689..11cc43e2 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/stockingivt/data.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/stockingivt/data.ts @@ -2,8 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { LmsStockingIvtApi } from '#/api/lms/stockingivt'; -import { getDictOptions } from '@vben/hooks'; import { DICT_TYPE } from '@vben/constants'; +import { getDictOptions } from '@vben/hooks'; /** 修改表单。 */ export function useFormSchema(): VbenFormSchema[] { @@ -181,7 +181,7 @@ export function useGridColumns(): VxeTableGridOptions