feat: 机构台账查询

cy

2023-11-21 b477ecb515017f4cda0c4b95b87ef92287f1e9ff

feat: 机构台账查询

 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java

@@ -1,21 +1,24 @@
package com.consum.base.controller;

import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.response.WarehouseFlowVO;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Map;
import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Map;

/**
 * @ClassName lWarehouseFlowController
@@ -64,4 +67,22 @@
        return ResponseValue.success(genericPager);
    }

    @GetMapping("/getTaiZhangList")
    public ResponseValue getTaiZhangList( ) {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
        /*当前登录人只能看到自己机构下的列表*/
        FinSysTenantUser sysInfo = this.getSysInfo();
        String tenantId = sysInfo.getTenantId();
        Long paramAgencyId = param.getAgencyId();
        if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
            param.setAgencyId(Long.valueOf(tenantId));
        }
        GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryTaiZhangList(param);
        return ResponseValue.success(genericPager);
    }

}

 consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java

@@ -1,5 +1,8 @@
package com.consum.base.core;

import java.util.HashMap;
import java.util.Map;

/**
 * @ClassName WhBusinessEnum
 * @Date 2023/10/24
@@ -46,4 +49,73 @@
    public short getValue() {
        return value;
    }

    /**
     * flowType转为 进出库流水总表[L_WAREHOUSE_FLOW] 的 THIS_TYPE：本次调整类型  和 BUSINESS_TYPE：单据类型
     *
     * @param flowType 同码表，1采购入库 2退还入库 3调拨入库 4盘盈入库 5申领出库 6调拨出库 7盘亏出库 8报废出库 9其他出库
     * @return flowThisType：本次调整类型（1=调增；2=调减）
     * flowBusinessType：单据类型 1 采购2 调拨 3出库4部门分发5报废6部门物品回退仓库7物品盘点
     */
    public static Map<String, Short> getTypeByFlowType(Short flowType) {
        //单据类型 1 采购2 调拨 3出库4部门分发5报废6部门物品回退仓库7物品盘点
        Short flowBusinessType = null;
        //1=调增；2=调减
        Short flowThisType = null;
        //单据类型。0仓库调拨；1部门分发；2部门物品回退
        Short transferBusinessType = null;
        switch (flowType) {
            //1采购入库
            case 1:
                flowThisType = 1;
                flowBusinessType = 1;
                break;
            //2退还入库
            case 2:
                flowThisType = 1;
                flowBusinessType = 2;
                break;
            //3调拨入库
            case 3:
                flowThisType = 1;
                flowBusinessType = 3;
                break;
            // 4盘盈入库
            case 4:
                flowThisType = 1;
                flowBusinessType = 7;
                break;
            //5申领出库
            case 5:
                flowThisType = 2;
                flowBusinessType = 4;
//                    transferBusinessType = 1;
                break;
            // 6调拨出库
            case 6:
                flowThisType = 2;
                flowBusinessType = 2;
//                    transferBusinessType = 1;
                break;
            //7盘亏出库
            case 7:
                flowThisType = 2;
                flowBusinessType = 7;
                break;
            // 8报废出库
            case 8:
                flowThisType = 2;
                flowBusinessType = 5;
                break;
            // 9其他出库
            case 9:
                flowThisType = 2;
                flowBusinessType = 3;
                break;
        }
        Map<String, Short> rtnMap = new HashMap<>();
        rtnMap.put("flowBusinessType", flowBusinessType);
        rtnMap.put("flowThisType", flowThisType);
        return rtnMap;
    }
}

 consum-base/src/main/java/com/consum/base/pojo/LWarehouseFlowParam.java

@@ -24,6 +24,7 @@
    //物品名称
    @ApiModelProperty(value = "物品名称")
    private String goodsTemplateName;
    private Long goodsTemplateId;
    //规格型号
    @ApiModelProperty(value = "规格型号")
    private String baseGoodsModelsName;
@@ -32,6 +33,21 @@
    @ApiModelProperty(value = "机构")
    private Long agencyId;

    @ApiModelProperty("仓库类型")
    private Long warehouseType;

    @ApiModelProperty("仓库id")
    private Long baseWarehouseId;

    @ApiModelProperty("规格型号")
    private Long baseGoodsModelsId;

    @ApiModelProperty("价值类型")
    private Short costType;

    @ApiModelProperty("同码表，1采购入库 2退还入库 3调拨入库 4盘盈入库 5申领出库 6调拨出库 7盘亏出库 8报废出库 9其他出库")
    private Short flowType;

    //创建人
    @ApiModelProperty(value = "创建人")
    private String createdName;

 consum-base/src/main/java/com/consum/base/pojo/query/WhWarningQry.java

@@ -17,6 +17,7 @@
public class WhWarningQry extends ParamRequest {
    @ApiModelProperty("物品名称")
    private String goodsTemplateName;
    private String goodsTemplateId;

    @ApiModelProperty("规格型号")
    private Long baseGoodsModelsId;

 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java

@@ -1,5 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWarehouseFlowParam;
@@ -7,9 +8,10 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Map;
import org.springframework.stereotype.Service;

/**
 * @ClassName LWarehouseFlowService
@@ -26,7 +28,7 @@
     * @param param
     * @return
     */
    private static String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE,flow.BUSINESS_FORM_ID,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_COUNT,record.THIS_TYPE,record.total_price,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END created_Name,flow.DEAL_TIME deal_Time FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID WHERE 1=1 ";
    private String QUERY_BUSINESS_FLOW = "SELECT flow.BUSINESS_TYPE,flow.BUSINESS_FORM_ID,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_COUNT,record.THIS_TYPE,record.total_price,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUYER_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.OPERATOR_NAME END created_Name,flow.DEAL_TIME deal_Time FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID WHERE 1=1 ";

    public GenericPager<Map<String, Object>> queryBusinessFlow(LWarehouseFlowParam param) {
        StringBuilder sql = new StringBuilder(QUERY_BUSINESS_FLOW);
@@ -40,7 +42,7 @@
        }
        if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
            sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
                + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
                    + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END");
            paramts.put("businessFormCode", param.getBusinessFormCode());
//            sql.append(" AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN flow.BUSINESS_FORM_CODE=?");
//            params.add(param.getBusinessFormCode());
@@ -61,7 +63,7 @@
        }
        if (param.getCreatedName() != null) {
            sql.append(" AND CASE" + " WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME LIKE :createdName"
                + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
                    + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME LIKE :createdName END");
            paramts.put("createdName", StringUtils.CHAR_PERCENT + param.getCreatedName() + StringUtils.CHAR_PERCENT);
        }
        if (param.getDealTimeStart() != null) {
@@ -80,7 +82,7 @@
        Map<String, Object> paramts = new HashMap<>();
        if (StringUtils.isNotEmpty(param.getBusinessFormCode())) {
            sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE=:businessFormCode"
                + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END ");
                    + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE=:businessFormCode END ");
            paramts.put("businessFormCode", param.getBusinessFormCode());
        }
        if (StringUtils.isNotEmpty(param.getGoodsName())) {
@@ -99,7 +101,7 @@

        if (StringUtils.isNotEmpty(param.getCreateName())) {
            sql.append("AND CASE WHEN flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUYER_NAME = :createdName"
                + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME = :createdName END ");
                    + " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.OPERATOR_NAME = :createdName END ");
            paramts.put("createdName", param.getCreateName());
        }
        if (param.getStartTime() != null) {
@@ -132,4 +134,115 @@

        return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
    }

    /**
     * 台账查询
     *
     * @param param
     * @return
     */
    private String QUERY_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME END AGENCY_NAME,ware.WAREHOUSE_NAME,record.GOODS_TEMPLATE_NAME,record.BASE_GOODS_MODELS_NAME,record.THIS_TYPE,flow.BUSINESS_TYPE,CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=2 THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE END BUSINESS_FORM_CODE,record.THIS_COUNT,record.INITIAL_COUNT,record.END_COUNT,flow.DEAL_TIME,CASE WHEN flow.BUSINESS_TYPE=2 AND tTrans.STATES=1 THEN record.THIS_COUNT ELSE 0 END zai_Tu_Count FROM (SELECT*FROM BASE_WAREHOUSE WHERE 1=1 ";
    private String QUERY_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=0 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
    private String QUERY_TAIZHANG_LIST_END = " WHERE flow.id IS NOT NULL";
    private String QUERY_TAIZHANG_LIST_CAIGOU = " LEFT JOIN L_WH_FORM_PROCURE tCaiGou ON flow.BUSINESS_TYPE=1 AND tCaiGou.id=flow.BUSINESS_FORM_ID ";
    private String QUERY_TAIZHANG_LIST_DIAOBO = " LEFT JOIN L_WH_FORM_TRANSFER tTrans ON (flow.BUSINESS_TYPE=2 or flow.BUSINESS_TYPE=4 or flow.BUSINESS_TYPE=6) AND tTrans.id=flow.BUSINESS_FORM_ID ";
    private String QUERY_TAIZHANG_LIST_CHUKU = " LEFT JOIN L_WH_FORM_OUTPUT tFormOut ON flow.BUSINESS_TYPE=3 AND tFormOut.id=flow.BUSINESS_FORM_ID ";
    private String QUERY_TAIZHANG_LIST_PANDIAN = " LEFT JOIN L_WH_FORM_INVENTORY tInventory ON flow.BUSINESS_TYPE=7 AND tInventory.id=flow.BUSINESS_FORM_ID ";
    private String QUERY_TAIZHANG_LIST_BAOFEI = " LEFT JOIN L_WH_FORM_SCRAPPED tScrapped ON flow.BUSINESS_TYPE=5 AND tScrapped.id=flow.BUSINESS_FORM_ID ";

    public GenericPager<Map<String, Object>> queryTaiZhangList(LWarehouseFlowParam param) {
        StringBuilder sqlQuery = new StringBuilder(QUERY_TAIZHANG_LIST_QUERY);
        StringBuilder sqlEndRecord = new StringBuilder(QUERY_TAIZHANG_LIST_RECORD);
        StringBuilder sqlCaiGou = new StringBuilder(QUERY_TAIZHANG_LIST_CAIGOU);
        StringBuilder sqlDiaoBo = new StringBuilder(QUERY_TAIZHANG_LIST_DIAOBO);
        StringBuilder sqlChuKu = new StringBuilder(QUERY_TAIZHANG_LIST_CHUKU);
        StringBuilder sqlBaoFei = new StringBuilder(QUERY_TAIZHANG_LIST_BAOFEI);
        StringBuilder sqlPanDian = new StringBuilder(QUERY_TAIZHANG_LIST_PANDIAN);
        StringBuilder sqlEnd = new StringBuilder(QUERY_TAIZHANG_LIST_END);

        HashMap<String, Object> paramts = new HashMap<>();
        //机构
        if (param.getAgencyId() != null) {
            sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
            paramts.put("lengthAgencyId", param.getAgencyId());
            paramts.put("agencyId", param.getAgencyId());
        }
        //仓库类型
        if (param.getWarehouseType() != null) {
            sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
            paramts.put("warehouseType", param.getWarehouseType());
        }
        if (param.getBaseWarehouseId() != null) {
            sqlQuery.append(" AND id = :warehouseId");
            paramts.put("warehouseId", param.getBaseWarehouseId());
        }
        //物品名称
        if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
            sqlEnd.append(" AND record.GOODS_TEMPLATE_NAME like :goodsTemplateName");
            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        if (param.getGoodsTemplateId() != null) {
            sqlEnd.append(" AND record.BASE_GOODS_TEMPLATE_ID=:goodsTemplateId");
            paramts.put("goodsTemplateId", param.getGoodsTemplateId());
        }
        //规格型号
        if (param.getBaseGoodsModelsId() != null) {
            sqlEnd.append(" AND record.BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
            paramts.put("baseGoodsModelsId", param.getBaseGoodsModelsId());
        }
        // 同码表，1采购入库 2退还入库 3调拨入库 4盘盈入库 5申领出库 6调拨出库 7盘亏出库 8报废出库 9其他出库
        Short flowType = param.getFlowType();
        if (flowType != null) {
            Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByFlowType(flowType);
            //本次调整类型（1=调增；2=调减）
            Short flowThisType = typeByFlowType.get("flowThisType");
            //单据类型 1 采购2 调拨 3出库4部门分发5报废6部门物品回退仓库7物品盘点
            Short flowBusinessType = typeByFlowType.get("flowBusinessType");
            if (flowThisType != null) {
                sqlEnd.append(" AND flow.THIS_TYPE=:flowThisType");
                paramts.put("flowThisType", flowThisType);
            }
            if (flowBusinessType != null) {
                sqlEnd.append(" AND flow.BUSINESS_TYPE=:flowBusinessType");
                paramts.put("flowBusinessType", flowBusinessType);
            }
        }
        // 单号
        String businessFormCode = param.getBusinessFormCode();
        if (StringUtils.isNotEmpty(businessFormCode)) {
            sqlCaiGou.append(" and tCaiGou.BUSINESS_FORM_CODE = :caoGouBusinessFormCode");
            paramts.put("caoGouBusinessFormCode", businessFormCode);
            sqlDiaoBo.append(" and tTrans.BUSINESS_FORM_CODE = :diaoBoBusinessFormCode");
            paramts.put("diaoBoBusinessFormCode", businessFormCode);
            sqlChuKu.append(" and tFormOut.BUSINESS_FORM_CODE = :chuKuBusinessFormCode");
            paramts.put("chuKuBusinessFormCode", businessFormCode);
            sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
            paramts.put("baoFeiBusinessFormCode", businessFormCode);
            sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
            paramts.put("panDianBusinessFormCode", businessFormCode);
        }
        // 操作时间
        if (param.getDealTimeStart() != null) {
            sqlEnd.append(" and flow.DEAL_TIME >=:dealTimeStart ");
            paramts.put("dealTimeStart", param.getDealTimeStart() * 1000000);
        }
        if (param.getDealTimeEnd() != null) {
            sqlEnd.append(" and flow.DEAL_TIME <:dealTimeEnd ");
            paramts.put("dealTimeEnd", param.getDealTimeEnd() * 1000000 + 240000);
        }
        sqlEnd.append(" ORDER BY record.DEAL_TIME desc,record.id DESC ");

        StringBuilder sql = new StringBuilder();
        sql.append(sqlQuery)
                .append(sqlEndRecord)
                .append(sqlCaiGou)
                .append(sqlDiaoBo)
                .append(sqlChuKu)
                .append(sqlBaoFei)
                .append(sqlPanDian)

                .append(sqlEnd);

        return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
    }
}

 consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java

@@ -25,7 +25,7 @@
    public GenericPager<Map<String, Object>> getListWithPage(WhWarningQry param) {
        StringBuilder sql = new StringBuilder(GET_LIST_WITH_PAGE);
        HashMap<String, Object> paramts = new HashMap<>();
        if (param.getStates() != null){
        if (param.getStates() != null) {
            sql.append(" AND wareWarn.states = :states");
            paramts.put("states", param.getStates());
        }
@@ -49,6 +49,9 @@
            sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName");
            paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
        }
        if (param.getGoodsTemplateId() != null) {
            sql.append(" AND goodsTemp.id=:goodsTemplateId");
            paramts.put("goodsTemplateId", param.getGoodsTemplateId());        }
        //分类
        if (param.getCategoryId() != null) {
            sql.append(" AND cate.id=:categoryId");