futian.liu
2023-12-22 170c89b9b8e6d5c3117d53e7b38f782651ebfcde
物品统计表中总数量改为在库数量+报废数量
1个文件已添加
2个文件已修改
63 ■■■■■ 已修改文件
consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java
New file
@@ -0,0 +1,39 @@
package com.consum.base.pojo.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
 * @author asus
 * @version 1.0
 * @description: 物品统计表
 * @date 2023/12/22 13:52
 */
@NoArgsConstructor
@Data
@ApiModel
public class GoodsStatisticsInfoVO {
    @ApiModelProperty(value = "机构")
    private String orgName;
    @ApiModelProperty(value = "调拨数量")
    private Integer diaoBoNum;
    @ApiModelProperty(value = "总数量")
    private Integer totalNum;
    @ApiModelProperty(value = "在库数量")
    private Integer zaiKuNum;
    @ApiModelProperty(value = "物品型号类别(A类,B类..)")
    private String costType;
    @ApiModelProperty(value = "报废数量")
    private Integer baoFeiNum;
    @ApiModelProperty(value = "物品型号名称")
    private String baseGoodsModelsName;
    @ApiModelProperty(value = "物品编码")
    private String goodsCode;
    @ApiModelProperty(value = "仓库/部门名称")
    private String warehouseName;
    @ApiModelProperty(value = "物品模板名称")
    private String goodsTemplateName;
}
consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
@@ -483,7 +483,6 @@
                allChangModelList, null, dealTime);
        }
        log.info("调拨单:{} 入库完成", whFormTransferId);
        return;
    }
    private static String GET_GOODSID_BY_FLOWID =
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
@@ -1,13 +1,17 @@
package com.consum.base.service.impl;
import com.consum.base.service.LWhGoodsStatisticsService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.LWhGoodsStatisQry;
import com.consum.base.pojo.response.GoodsStatisticsInfoVO;
import com.consum.base.service.LWhGoodsStatisticsService;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -35,6 +39,9 @@
    @Override
    public List getWhGoodsStatisList(LWhGoodsStatisQry param) {
        List<GoodsStatisticsInfoVO> result = Lists.newArrayList();
        StringBuilder sqlColumn = new StringBuilder(GET_WHGOODS_STATIS_LIST_COLUMN);
        StringBuilder sqlCangKu = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU);
        StringBuilder sqlCangKuWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE);
@@ -98,10 +105,16 @@
        StringBuilder sql = new StringBuilder();
        sql.append(sqlColumn).append(sqlCangKu).append(sqlCangKuWhere).append(sqlCangKuEnd).append(sqlKuCun)
            .append(sqlKuCunWhere).append(sqlKuCunGoupBy)
            .append(sqlKuCunWhere).append(sqlKuCunGoupBy).append(sqlEndWhere);
            .append(sqlEndWhere);
        return select(sql.toString(), paramts, new MapperUtil());
        List<Map<String, Object>> select = select(sql.toString(), paramts, new MapperUtil());
        select.forEach(item -> {
            GoodsStatisticsInfoVO goodsStatisticsInfoVO = MapUtils.convertMapToObj(item, GoodsStatisticsInfoVO.class);
            // 统计总数改为:在库数量+报废数量
            goodsStatisticsInfoVO
                .setTotalNum(goodsStatisticsInfoVO.getZaiKuNum() + goodsStatisticsInfoVO.getBaoFeiNum());
            result.add(goodsStatisticsInfoVO);
        });
        return result;
    }
}