diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java index 1f68885f..a6eaf172 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java @@ -37,8 +37,8 @@ public class TmTask extends BaseEntity { private Integer taskStatus; /** 编号 */ - @Excel(name = "编号") - @ApiModelProperty(value = "编号") + @Excel(name = "任务编号") + @ApiModelProperty(value = "任务编号,如新购单号,领料单号,退料单号等") private String code; /** 数据所属组织 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java index 9c394f56..5c1796a0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java @@ -24,8 +24,8 @@ public class TmTaskRequestVo extends BaseEntity { @ApiModelProperty(value = "任务状态(定义数据字典)") private Integer taskStatus; - /** 编号 */ - @Excel(name = "编号") + /** 任务编号,如新购单号,领料单号,退料单号等 */ + @Excel(name = "任务编号") @ApiModelProperty(value = "编号") private String code; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml index e033aec8..159b18cb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml @@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN 0 THEN IFNULL(subquery0.num, 0) ELSE - IFNULL(mt.num, 0) + IFNULL(mt.storage_num, 0) END as num FROM ma_type mt left join (SELECT mt.type_id, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 2401e197..90dbacd8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -131,20 +131,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"