fix: 备货区域显示修改人名称
This commit is contained in:
@@ -43,6 +43,11 @@
|
|||||||
<artifactId>nl-module-task-api</artifactId>
|
<artifactId>nl-module-task-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.nl.cloud</groupId>
|
||||||
|
<artifactId>nl-module-system-api</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</dependency>
|
||||||
<!-- 业务组件 -->
|
<!-- 业务组件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.nl.cloud</groupId>
|
<groupId>cn.nl.cloud</groupId>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import jakarta.annotation.Resource;
|
|||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import org.dromara.core.trans.anno.TransMethodResult;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@@ -43,6 +44,7 @@ public class StockingIvtController {
|
|||||||
* 分页查询备货区域。
|
* 分页查询备货区域。
|
||||||
*/
|
*/
|
||||||
@GetMapping("/page")
|
@GetMapping("/page")
|
||||||
|
@TransMethodResult
|
||||||
@Operation(summary = "获得备货区域分页")
|
@Operation(summary = "获得备货区域分页")
|
||||||
@PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')")
|
@PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')")
|
||||||
public CommonResult<PageResult<StockingIvtRespVO>> getStockingIvtPage(
|
public CommonResult<PageResult<StockingIvtRespVO>> getStockingIvtPage(
|
||||||
@@ -54,6 +56,7 @@ public class StockingIvtController {
|
|||||||
* 查询备货区域详情。
|
* 查询备货区域详情。
|
||||||
*/
|
*/
|
||||||
@GetMapping("/get")
|
@GetMapping("/get")
|
||||||
|
@TransMethodResult
|
||||||
@Operation(summary = "获得备货区域详情")
|
@Operation(summary = "获得备货区域详情")
|
||||||
@Parameter(name = "ivtId", description = "库存记录标识", required = true)
|
@Parameter(name = "ivtId", description = "库存记录标识", required = true)
|
||||||
@PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')")
|
@PreAuthorize("@ss.hasPermission('lms:stocking-ivt:query')")
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
package cn.code.nl.module.lms.controller.admin.stockingivt.vo;
|
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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
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;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -10,9 +15,10 @@ import java.time.LocalDateTime;
|
|||||||
*/
|
*/
|
||||||
@Schema(description = "管理后台 - 备货区域 Response VO")
|
@Schema(description = "管理后台 - 备货区域 Response VO")
|
||||||
@Data
|
@Data
|
||||||
public class StockingIvtRespVO {
|
public class StockingIvtRespVO implements VO {
|
||||||
|
|
||||||
@Schema(description = "库存记录标识")
|
@Schema(description = "库存记录标识")
|
||||||
|
@TableId
|
||||||
private Long ivtId;
|
private Long ivtId;
|
||||||
@Schema(description = "点位编码")
|
@Schema(description = "点位编码")
|
||||||
private String pointCode;
|
private String pointCode;
|
||||||
@@ -33,7 +39,11 @@ public class StockingIvtRespVO {
|
|||||||
@Schema(description = "备注")
|
@Schema(description = "备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
@Schema(description = "修改人")
|
@Schema(description = "修改人")
|
||||||
|
@Trans(type = TransType.AUTO_TRANS, key = AdminUserApi.PREFIX,
|
||||||
|
fields = "nickname", ref = "updaterName")
|
||||||
private String updater;
|
private String updater;
|
||||||
|
@Schema(description = "修改人名称")
|
||||||
|
private String updaterName;
|
||||||
@Schema(description = "修改时间")
|
@Schema(description = "修改时间")
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ export namespace LmsStockingIvtApi {
|
|||||||
remark?: string;
|
remark?: string;
|
||||||
sortSeq: number;
|
sortSeq: number;
|
||||||
updater?: string;
|
updater?: string;
|
||||||
|
updaterName?: string;
|
||||||
updateTime?: string;
|
updateTime?: string;
|
||||||
vehicleCode?: string;
|
vehicleCode?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form';
|
|||||||
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||||
import type { LmsStockingIvtApi } from '#/api/lms/stockingivt';
|
import type { LmsStockingIvtApi } from '#/api/lms/stockingivt';
|
||||||
|
|
||||||
import { getDictOptions } from '@vben/hooks';
|
|
||||||
import { DICT_TYPE } from '@vben/constants';
|
import { DICT_TYPE } from '@vben/constants';
|
||||||
|
import { getDictOptions } from '@vben/hooks';
|
||||||
|
|
||||||
/** 修改表单。 */
|
/** 修改表单。 */
|
||||||
export function useFormSchema(): VbenFormSchema[] {
|
export function useFormSchema(): VbenFormSchema[] {
|
||||||
@@ -181,7 +181,7 @@ export function useGridColumns(): VxeTableGridOptions<LmsStockingIvtApi.Stocking
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ field: 'remark', title: '备注', minWidth: 160 },
|
{ field: 'remark', title: '备注', minWidth: 160 },
|
||||||
{ field: 'updater', title: '修改人', minWidth: 120 },
|
{ field: 'updaterName', title: '修改人', minWidth: 120 },
|
||||||
{
|
{
|
||||||
field: 'updateTime',
|
field: 'updateTime',
|
||||||
title: '修改时间',
|
title: '修改时间',
|
||||||
|
|||||||
Reference in New Issue
Block a user