From 2440fb03a69e1f274b646a52fbee006a580c0824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 13 May 2024 14:14:16 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/controller/location/vo/LocationImportExcelVo.java | 1 + .../module/eam/controller/location/vo/LocationImportVO.java | 2 ++ .../eam/controller/transaction/vo/TransactionExcelVO.java | 3 --- .../eam/controller/transaction/vo/TransactionExportReqVO.java | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportExcelVo.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportExcelVo.java index 56bdf13..e531c59 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportExcelVo.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportExcelVo.java @@ -18,6 +18,7 @@ public class LocationImportExcelVo { @ExcelProperty("库位编码") @ExcelValid(message = "必填") + @ColumnWidth(value = 20) private String number; @ExcelProperty("库位名称") diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportVO.java index 6de72ce..fd1c474 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportVO.java @@ -2,6 +2,7 @@ package com.win.module.eam.controller.location.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.win.framework.excel.core.annotations.ExcelValid; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,6 +24,7 @@ public class LocationImportVO { @ExcelProperty("库位编号") @ColumnWidth(value = 20) + @ExcelValid(message = "必填") private String number; @ExcelProperty("库位名称") diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExcelVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExcelVO.java index c9b244b..095ff76 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExcelVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExcelVO.java @@ -25,9 +25,6 @@ public class TransactionExcelVO { @ExcelProperty("库存动作枚举采购入库、领用出库、归还入库、维修入库") private String inventoryAction; - @ExcelProperty("业务类型") - private String businessType; - @ExcelProperty("库存状态") private String inventoryStatus; diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExportReqVO.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExportReqVO.java index bf66a66..c9a72f0 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExportReqVO.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExportReqVO.java @@ -24,9 +24,6 @@ public class TransactionExportReqVO { @Schema(description = "库存动作枚举采购入库、领用出库、归还入库、维修入库") private String inventoryAction; - @Schema(description = "业务类型", example = "1") - private String businessType; - @Schema(description = "库存状态", example = "1") private String inventoryStatus;