Browse Source

BUG修改

master
parent
commit
2440fb03a6
  1. 1
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportExcelVo.java
  2. 2
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/location/vo/LocationImportVO.java
  3. 3
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExcelVO.java
  4. 3
      win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/controller/transaction/vo/TransactionExportReqVO.java

1
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("库位编码") @ExcelProperty("库位编码")
@ExcelValid(message = "必填") @ExcelValid(message = "必填")
@ColumnWidth(value = 20)
private String number; private String number;
@ExcelProperty("库位名称") @ExcelProperty("库位名称")

2
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.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.win.framework.excel.core.annotations.ExcelValid;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -23,6 +24,7 @@ public class LocationImportVO {
@ExcelProperty("库位编号") @ExcelProperty("库位编号")
@ColumnWidth(value = 20) @ColumnWidth(value = 20)
@ExcelValid(message = "必填")
private String number; private String number;
@ExcelProperty("库位名称") @ExcelProperty("库位名称")

3
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("库存动作枚举采购入库、领用出库、归还入库、维修入库") @ExcelProperty("库存动作枚举采购入库、领用出库、归还入库、维修入库")
private String inventoryAction; private String inventoryAction;
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("库存状态") @ExcelProperty("库存状态")
private String inventoryStatus; private String inventoryStatus;

3
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 = "库存动作枚举采购入库、领用出库、归还入库、维修入库") @Schema(description = "库存动作枚举采购入库、领用出库、归还入库、维修入库")
private String inventoryAction; private String inventoryAction;
@Schema(description = "业务类型", example = "1")
private String businessType;
@Schema(description = "库存状态", example = "1") @Schema(description = "库存状态", example = "1")
private String inventoryStatus; private String inventoryStatus;

Loading…
Cancel
Save