DeXun/fad_oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导入模板下载+导入功能完成

Browse Source
This commit is contained in:
86156
2024-11-03 13:40:44 +08:00
parent bbd40afd52
commit 8f95164c28
10 changed files with 617 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java
View File

@@ -25,7 +25,7 @@ public class SysOaOutWarehouse extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 出库后对应的项目id

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java
View File

@@ -25,7 +25,7 @@ public class SysOaWarehouse extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id")
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
* 库存数量

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.oa.domain.bo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -24,6 +26,7 @@ public class SysOaOutWarehouseBo extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.oa.domain.bo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -24,6 +26,7 @@ public class SysOaWarehouseBo extends BaseEntity {
/**
* 主键id
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**

35
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java
View File

@@ -24,32 +24,41 @@ public class SysOaWarehouseVo {
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 序号
*/
@ExcelProperty(value = "序号")
private Long temp;
/**
* 物料名称
*/
@ExcelProperty(value = "物料名称")
private String name;
/**
* 型号
*/
@ExcelProperty(value = "型号")
private String model;
/**
* 库存数量
*/
@ExcelProperty(value = "库存数量")
private Long inventory;
/**
* 型号
*/
@ExcelProperty(value = "型号")
private String model;
/**
* 单位
*/
@ExcelProperty(value = "单位")
private String unit;
/**
* 物料名称
*/
@ExcelProperty(value = "物料名称")
private String name;
/**
* 品牌
@@ -70,4 +79,6 @@ public class SysOaWarehouseVo {
private String remark;
}