feat: 部门台账

cy

2023-11-29 d6a442fa7c8b9be884870c030968786b8f04b2d6

feat: 部门台账

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

@@ -79,7 +79,7 @@
    }

    @GetMapping("/getTaiZhangList")
    public ResponseValue getTaiZhangList( ) {
    public ResponseValue getTaiZhangList() {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
@@ -99,4 +99,30 @@
        return ResponseValue.success(genericPager);
    }

    /**
     * 部门台账
     *
     * @return
     */
    @GetMapping("/getDeptTaiZhangList")
    public ResponseValue getDeptTaiZhangList() {
        S_user_core currentUser = this.getCurrentUser();
        if (currentUser == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
        LWarehouseFlowParam param2 = new LWarehouseFlowParam();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        /*当前登录人只能看到自己机构下的列表*/
        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.queryDeptTaiZhangList(param);
        return ResponseValue.success(genericPager);
    }

}

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

@@ -411,4 +411,17 @@
        lWhFormTransferService.queryDepartmentTransferOrder();
        return ResponseValue.success(transferInfoVO);
    }

    @ApiOperation(value = "查询部门下的分发单", notes = "查询部门下的分发单")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")
    })
    @GetMapping("/query/transfList")
    public ResponseValue queryDepartmentTransferOrderList() {

        TransferInfoVO transferInfoVO = new TransferInfoVO();

        lWhFormTransferService.queryDepartmentTransferOrder();
        return ResponseValue.success(transferInfoVO);
    }
}

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

@@ -118,4 +118,49 @@
        rtnMap.put("flowThisType", flowThisType);
        return rtnMap;
    }

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

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

@@ -33,6 +33,9 @@
    @ApiModelProperty(value = "机构")
    private Long agencyId;

    @ApiModelProperty("部门ID")
    private Long departmentId;

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

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

    @ApiModelProperty("同码表，1 物品申领 2 物品分发 3 物品退还 4 物品报废")
    private Short depFlowType;

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

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

@@ -1,22 +1,19 @@
package com.consum.base.service;

import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.core.utils.MixType;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.core.utils.*;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.OutAndInDetailVO;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;

/**
 * @ClassName LWarehouseFlowService
@@ -111,8 +108,9 @@
        HashMap<String, Object> paramts = new HashMap<>();
        //机构
        if (param.getAgencyId() != null) {
            sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
            paramts.put("lengthAgencyId", param.getAgencyId());
//            sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
            sqlQuery.append(" AND AGENCY_ID=:agencyId");
//            paramts.put("lengthAgencyId", param.getAgencyId());
            paramts.put("agencyId", param.getAgencyId());
        }
        //仓库类型
@@ -203,6 +201,125 @@
        return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
    }

    /**
     * 台账查询
     *
     * @param param
     * @return
     */
    private String QUERY_DEPT_TAIZHANG_LIST_QUERY = "SELECT CASE WHEN flow.BUSINESS_TYPE=1 THEN tCaiGou.AGENCY_NAME WHEN (flow.BUSINESS_TYPE=2 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.OPERATOR_NAME WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.AGENCY_NAME WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.AGENCY_NAME WHEN flow.BUSINESS_TYPE=7 THEN tInventory.AGENCY_NAME END AGENCY_NAME,ware.NAME as dept_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 OR flow.BUSINESS_TYPE=4 OR flow.BUSINESS_TYPE=6) THEN tTrans.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=3 THEN tFormOut.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=5 THEN tScrapped.BUSINESS_FORM_CODE WHEN flow.BUSINESS_TYPE=7 THEN tInventory.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 fin_sys_tenant_department WHERE 1=1 ";
    private String QUERY_DEPT_TAIZHANG_LIST_RECORD = ")ware LEFT JOIN L_WAREHOUSE_FLOW flow ON ware.id=flow.WAREHOUSE_ID AND flow.WAREHOUSE_TYPE=1 LEFT JOIN L_WH_GOODS_RECORD record ON flow.id=record.WAREHOUSE_FLOW_ID ";
    private String QUERY_DEPT_TAIZHANG_LIST_END = " WHERE record.id IS NOT NULL";
    private String QUERY_DEPT_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_DEPT_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_DEPT_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_DEPT_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_DEPT_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>> queryDeptTaiZhangList(LWarehouseFlowParam param) {
        StringBuilder sqlQuery = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_QUERY);
        StringBuilder sqlEndRecord = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_RECORD);
        StringBuilder sqlCaiGou = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CAIGOU);
        StringBuilder sqlDiaoBo = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_DIAOBO);
        StringBuilder sqlChuKu = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_CHUKU);
        StringBuilder sqlBaoFei = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_BAOFEI);
        StringBuilder sqlPanDian = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_PANDIAN);
        StringBuilder sqlEnd = new StringBuilder(QUERY_DEPT_TAIZHANG_LIST_END);

        HashMap<String, Object> paramts = new HashMap<>();
        //机构
        if (param.getAgencyId() != null) {
//            sqlQuery.append(" AND left(AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
            sqlQuery.append(" AND TENANT_ID=:agencyId");
//            paramts.put("lengthAgencyId", param.getAgencyId());
            paramts.put("agencyId", param.getAgencyId());
        }
        // 部门
        if (param.getDepartmentId() != null) {
            sqlQuery.append(" and ID= :departmentId");
            paramts.put("departmentId", param.getDepartmentId());
        }
        //仓库类型
        if (param.getWarehouseType() != null) {
            sqlQuery.append(" AND WAREHOUSE_TYPE = :warehouseType");
            paramts.put("warehouseType", param.getWarehouseType());
        }
        //物品名称
        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 物品报废
        Short flowType = param.getFlowType();
        if (flowType != null) {
            Map<String, Short> typeByFlowType = WhBusinessEnum.getTypeByDeptFlowType(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);

            sqlEnd.append(" and case when flow.BUSINESS_TYPE = 1 THEN tCaiGou.BUSINESS_FORM_CODE" +
                    " WHEN ( flow.BUSINESS_TYPE = 2 OR flow.BUSINESS_TYPE = 4 OR flow.BUSINESS_TYPE = 6 ) THEN tTrans.BUSINESS_FORM_CODE" +
                    " WHEN flow.BUSINESS_TYPE = 3 THEN tFormOut.BUSINESS_FORM_CODE" +
                    " WHEN flow.BUSINESS_TYPE = 5 THEN tScrapped.BUSINESS_FORM_CODE" +
                    " WHEN flow.BUSINESS_TYPE = 7 THEN tInventory.BUSINESS_FORM_CODE end =:whereBusinessFormCode");
            paramts.put("whereBusinessFormCode", 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());
    }

    public PageUtil queryAllBusinessFlow(LWhFormOutputQry param) {
        StringBuilder sql = new StringBuilder("SELECT\n"