bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
jjLv 2024-12-09 18:21:16 +08:00
parent b829f91fc4 b8cbacf303
commit ccfae1def3
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ProjUsingRecord.java
View File

@ -54,17 +54,6 @@ public class ProjUsingRecord {
@ApiModelProperty(value = "工程Id") @ApiModelProperty(value = "工程Id")
private Integer proId; private Integer proId;
/**
* 库管员id
*/
@ApiModelProperty(value = "库管员id")
private Integer userId;
/**
* 库管员名字
*/
@ApiModelProperty(value = "库管员名字")
private String typeKeepName;
/** /**
* 工程名称 * 工程名称
*/ */
@ -105,6 +94,32 @@ public class ProjUsingRecord {
@ApiModelProperty(value = "设备编码") @ApiModelProperty(value = "设备编码")
private String maCode; private String maCode;
/**
* 装备管理方式(0编号 1计数)
*/
@ApiModelProperty(value = "装备管理方式名称")
private String manageTypeName;
/**
* 装备管理方式(0编号 1计数)
*/
@Excel(name = "管理模式",readConverterExp = "0=编码,1=数量")
@ApiModelProperty(value = "装备管理方式")
private int manageType;
/**
* 库管员id
*/
@ApiModelProperty(value = "库管员id")
private Integer userId;
/**
* 库管员名字
*/
@Excel(name = "库管员")
@ApiModelProperty(value = "库管员名字")
private String typeKeepName;
/** /**
* 计量单位 * 计量单位
*/ */
@ -207,18 +222,6 @@ public class ProjUsingRecord {
@ApiModelProperty(value = "数据所属组织") @ApiModelProperty(value = "数据所属组织")
private Integer companyId; private Integer companyId;
/**
* 装备管理方式(0编号 1计数)
*/
@ApiModelProperty(value = "装备管理方式")
private int manageType;
/**
* 装备管理方式(0编号 1计数)
*/
@ApiModelProperty(value = "装备管理方式名称")
private String manageTypeName;
/** /**
* 实时库存 * 实时库存
*/ */