diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/IostorInvController.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/IostorInvController.java index 635fdf5f..db3d3830 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/IostorInvController.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/IostorInvController.java @@ -28,6 +28,7 @@ import static cn.code.nl.framework.apilog.core.enums.OperateTypeEnum.*; import cn.code.nl.module.wms.controller.admin.iostorinv.vo.*; import cn.code.nl.module.wms.dal.dataobject.iostorinv.IostorInvDO; import cn.code.nl.module.wms.service.iostorinv.IostorInvService; +import org.dromara.core.trans.anno.TransMethodResult; @Tag(name = "管理后台 - 出入库单主表") @RestController @@ -105,6 +106,7 @@ public class IostorInvController { @GetMapping("/page") @Operation(summary = "获得出入库单主表分页") + @TransMethodResult @PreAuthorize("@ss.hasPermission('wms:iostor-inv:query')") public CommonResult> getIostorInvPage(@Valid IostorInvPageReqVO pageReqVO) { PageResult pageResult = iostorInvService.getIostorInvPage(pageReqVO); diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvRespVO.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvRespVO.java index 737c5d38..b1ba3283 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvRespVO.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvRespVO.java @@ -1,5 +1,7 @@ package cn.code.nl.module.wms.controller.admin.iostorinv.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,13 +10,20 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 出入库单主表 Response VO") @Data @ExcelIgnoreUnannotated -public class IostorInvRespVO { +public class IostorInvRespVO implements VO { + + @TableId + @Schema(description = "出入库单主表标识", requiredMode = Schema.RequiredMode.REQUIRED) + private Long iostorinvId; @Schema(description = "单据编号", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("单据编号") @@ -73,6 +82,14 @@ public class IostorInvRespVO { @ExcelProperty("生成方式") private String createMode; + @Schema(description = "创建者") + @ExcelProperty("创建者") + @Trans(type = TransType.AUTO_TRANS, key = AdminUserApi.PREFIX, fields = "nickname", ref = "creatorName") + private String creator; + + @Schema(description = "创建者名称") + private String creatorName; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/iostorinv/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/iostorinv/index.ts index d180c9b3..b460f57c 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/iostorinv/index.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/iostorinv/index.ts @@ -24,6 +24,9 @@ export namespace WmsIostorInvApi { billStatus?: string; // 单据状态 remark: string; // 备注 createMode?: string; // 生成方式 + creator?: string; // 创建者标识 + creatorName?: string; // 创建者名称 + createTime?: Dayjs | string; // 创建时间 disOptid: string; // 分配人 disTime?: Dayjs | string; // 分配时间 confirmOptid: string; // 确认人 diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts index 669c8f08..4f38a754 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts @@ -371,11 +371,6 @@ export function useGridColumns(): VxeTableGridOptions title: '来源方类型', minWidth: 120, }, - { - field: 'totalQty', - title: '总数量', - minWidth: 120, - }, { field: 'totalWeight', title: '总重量', @@ -409,6 +404,11 @@ export function useGridColumns(): VxeTableGridOptions props: { type: DICT_TYPE.WMS_CREATE_TYPE }, }, }, + { + field: 'creatorName', + title: '创建人', + minWidth: 120, + }, { field: 'createTime', title: '创建时间',