diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java index ab1d4661..0709b401 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java @@ -76,6 +76,26 @@ public class BackRecord { @Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC) private Double backNum; + @ApiModelProperty(value = "未接收数量") + @Excel(name = "未接收数量",cellType = Excel.ColumnType.NUMERIC) + private Double unAcceptedNum; + + @ApiModelProperty(value = "接收数量") + @Excel(name = "接收数量",cellType = Excel.ColumnType.NUMERIC) + private Double acceptedNum; + + @ApiModelProperty(value = "合格数量") + @Excel(name = "合格数量",cellType = Excel.ColumnType.NUMERIC) + private Double hgNum; + + @ApiModelProperty(value = "维修数量") + @Excel(name = "维修数量",cellType = Excel.ColumnType.NUMERIC) + private Double wxNum; + + @ApiModelProperty(value = "报废数量") + @Excel(name = "报废数量",cellType = Excel.ColumnType.NUMERIC) + private Double bfNum; + /** * 退料人 */ diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml index 254aa23a..d9fbf911 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" baif.`code`, mm.ma_code AS maCode, bcd.back_num AS backNum, + CASE WHEN bcd.back_status = 1 THEN bcd.back_num ELSE 0 END AS hgNum, + CASE WHEN bcd.back_status = 2 THEN bcd.back_num ELSE 0 END AS wxNum, + CASE WHEN bcd.back_status = 3 THEN bcd.back_num ELSE 0 END AS bfNum, baif.back_person AS backPerson, bcd.create_time AS createTime, bpl.lot_name AS proName,