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

优化

This commit is contained in:
mashuai 2026-01-20 16:57:27 +08:00
parent fd2a191a6b
commit 61c0dfab9d
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java
View File

@ -21,69 +21,69 @@ public class MaPartType extends BaseEntity {
private static final long serialVersionUID = 1L;
//类型ID
@Excel(name = "类型ID")
//@Excel(name = "类型ID")
private Long id;
@Excel(name = "配件类型")
private String partType;
@Excel(name = "配件名称")
private String partName;
//类型名称
@Excel(name = "类型名称")
@Excel(name = "规格型号")
@Size(max = 30, message = "类型名称长度不能超过30")
private String paName;
@ApiModelProperty("配件名称")
private String partName;
@ApiModelProperty("配件类型")
private String partType;
//上级ID
@Excel(name = "上级ID")
//@Excel(name = "上级ID")
private Long parentId;
//帐号状态（0正常 1停用）
@Excel(name = "帐号状态（0正常 1停用）")
//@Excel(name = "帐号状态（0正常 1停用）")
private String status;
//实时库存
@Excel(name = "实时库存")
//@Excel(name = "实时库存")
private String num;
//计量单位ID
@Excel(name = "计量单位ID")
//@Excel(name = "计量单位ID")
private String unitId;
@Excel(name = "计量单位")
private String unitName;
//原值
@Excel(name = "原值")
//@Excel(name = "原值")
private String buyPrice;
//层级
@Excel(name = "层级")
//@Excel(name = "层级")
private String level;
//库存预警数量
@Excel(name = "库存预警数量")
//@Excel(name = "库存预警数量")
private String warnNum;
//删除标志（0代表存在 2代表删除）
@Excel(name = "删除标志（0代表存在 2代表删除）")
//@Excel(name = "删除标志（0代表存在 2代表删除）")
private String delFlag;
//创建者
@Excel(name = "创建者")
//@Excel(name = "创建者")
private String createBy;
//创建时间
@Excel(name = "创建时间")
//@Excel(name = "创建时间")
private Date createTime;
//更新者
@Excel(name = "更新者")
//@Excel(name = "更新者")
private String updateBy;
//更新时间
@Excel(name = "更新时间")
//@Excel(name = "更新时间")
private Date updateTime;
//备注
@ -91,7 +91,7 @@ public class MaPartType extends BaseEntity {
private String remark;
//数据所属组织
@Excel(name = "数据所属组织")
//@Excel(name = "数据所属组织")
private String companyId;
@ApiModelProperty("关键字")

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/MaPartTypeVo.java
View File

@ -47,7 +47,7 @@ public class MaPartTypeVo {
@Excel(name = "计量单位")
private String unitName;
@Excel(name = "数量")
@Excel(name = "数量", cellType = Excel.ColumnType.NUMERIC)
private String num;
//@Excel(name = "购置价格")

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
View File

@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pcd.supplier_id, msi.supplier, pcd.create_by, pcd.production_time, pcd.create_time,
pcd.file_name, pcd.file_url,pcd.update_by, pcd.update_time, pcd.remark, pcd.company_id,
mt1.pa_name machineTypeName,mt.pa_name specificationType, tk.code ,mt.pa_name typeName,
mt.unit_id unitName
mt.unit_name unitName
from purchase_part_details pcd
left join ma_part_type mt on pcd.part_id = mt.pa_id
left join ma_part_type mt1 on mt.parent_id = mt1.pa_id
@ -456,7 +456,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pcd.supplier_id, msi.supplier, pcd.create_by, pcd.production_time, pcd.create_time,
pcd.file_name, pcd.file_url,pcd.update_by, pcd.update_time, pcd.remark, pcd.company_id,
mt1.pa_name machineTypeName,mt.pa_name specificationType, tk.code ,mt.pa_name typeName,
mt.unit_id unitName
mt.unit_name unitName
from purchase_part_details pcd
left join ma_part_type mt on pcd.part_id = mt.pa_id
left join ma_part_type mt1 on mt.parent_id = mt1.pa_id
@ -486,7 +486,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pcd.check_num as checkNum,
pcd.`status`,
ppi.remark,
mt.unit_id as unitName,
mt.unit_name as unitName,
CASE
WHEN pcd.`status` = 0 THEN '待验收'
WHEN pcd.`status` = 1 THEN '待入库'

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SelectMapper.xml
View File

@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT pa_id AS id,
pa_name AS label,
parent_id AS parentId,
unit_id as unitName,
unit_name as unitName,
level
FROM ma_part_type
WHERE del_flag = '0'

2
sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
View File

@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT pa_id AS id,
pa_name AS label,
parent_id AS parentId,
unit_id as unitName,
unit_name as unitName,
level
FROM ma_part_type
WHERE del_flag = '0'