低值易耗品管理系统
parent: c4874c0c | 补丁 | 提交 | ignore whitespace
cy
2023-12-08 951e8fa8b82e56bd02bb6f821be070c21616f744 
feat: 1.调拨不再生成出库单 2.增加出库金额
3个文件已修改
292 ■■■■■ 已修改文件
admin-web/src/views/stock/transfer/transferApplication/detail.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 admin-web/src/views/stock/transfer/transferApplication/detail.vue


@@ -66,7 +66,7 @@


        </el-table-column>


        <el-table-column prop="price" label="金额" align="center">


          <template slot-scope="scope">


            {{ scope.row.price }}


            {{ scope.row.totalAmount }}


          </template>


        </el-table-column>


      </el-table>




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


@@ -1,25 +1,8 @@


package com.consum.base.controller;




import java.lang.reflect.Field;


import java.util.ArrayList;


import java.util.Comparator;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.Optional;


import java.util.stream.Collectors;




import javax.servlet.http.HttpServletResponse;




import org.apache.commons.compress.utils.Lists;


import org.apache.poi.ss.usermodel.Workbook;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import cn.afterturn.easypoi.excel.ExcelExportUtil;


import cn.afterturn.easypoi.excel.entity.TemplateExportParams;


import cn.hutool.core.util.ReflectUtil;


import com.consum.base.BaseController;


import com.consum.base.core.utils.CommonUtil;


import com.consum.base.core.utils.IdUtil;


@@ -37,31 +20,31 @@


import com.consum.base.pojo.response.GoodsTemplateCountVO;


import com.consum.base.pojo.response.LWHFromTransferExtendVO;


import com.consum.base.pojo.response.TransferInfoVO;


import com.consum.base.service.BaseWarehouseService;


import com.consum.base.service.LGoodsUserRecordCoreService;


import com.consum.base.service.LWhFormTransferService;


import com.consum.base.service.LWhProcureModelService;


import com.consum.base.service.LWhProcureModelUserRecordService;


import com.consum.base.service.LWhProcureModelUserService;


import com.consum.base.service.*;


import com.consum.base.service.impl.LWhFormTransferCoreService;


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenantUser;


import com.consum.model.po.LWhFormTransfer;


import com.consum.model.po.LWhProcureModelUser;


import com.consum.model.po.LWhProcureModelUserRecord;


import com.consum.model.po.*;


import com.iplatform.model.po.S_user_core;


import com.walker.db.page.GenericPager;


import com.walker.infrastructure.utils.CollectionUtils;


import com.walker.infrastructure.utils.DateUtils;


import com.walker.web.ResponseValue;




import cn.afterturn.easypoi.excel.ExcelExportUtil;


import cn.afterturn.easypoi.excel.entity.TemplateExportParams;


import cn.hutool.core.util.ReflectUtil;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import org.apache.commons.compress.utils.Lists;


import org.apache.poi.ss.usermodel.Workbook;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import javax.servlet.http.HttpServletResponse;


import java.lang.reflect.Field;


import java.util.*;


import java.util.stream.Collectors;




/**


 * @Description 调拨管理


@@ -279,7 +262,8 @@


        lWhFormTransfer.setOutWarehouseId(wareHouseId);


        lWhFormTransfer.setOutWarehouseName(warehouseName);


        lWhFormTransferService.update(lWhFormTransfer);


        lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());


//        lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());


        lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());


        return ResponseValue.success();


    }






 consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java


@@ -1,42 +1,28 @@


package com.consum.base.service.impl;




import java.util.ArrayList;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




import javax.annotation.Resource;




import cn.hutool.core.convert.Convert;


import com.consum.base.core.WhBusinessEnum;


import com.consum.base.core.service.LWhWarningCoreServiceImpl;


import com.consum.base.core.utils.IdUtil;


import com.consum.base.core.utils.LockManage;


import com.consum.base.service.*;


import com.consum.model.po.*;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.CollectionUtils;


import com.walker.infrastructure.utils.DateUtils;


import com.walker.infrastructure.utils.NumberGenerator;


import lombok.extern.slf4j.Slf4j;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import com.consum.base.core.WhBusinessEnum;


import com.consum.base.core.service.LWhWarningCoreServiceImpl;


import com.consum.base.core.utils.IdUtil;


import com.consum.base.core.utils.LockManage;


import com.consum.base.service.GoodsBaseServiceImpl;


import com.consum.base.service.LGoodsUserRecordServiceImpl;


import com.consum.base.service.LGoodsWhRecordServiceImpl;


import com.consum.base.service.LWarehouseFlowService;


import com.consum.base.service.LWhFormTransferService;


import com.consum.base.service.LWhGoodsRecordService;


import com.consum.base.service.LWhGoodsService;


import com.consum.model.po.LGoodsUserRecord;


import com.consum.model.po.LWarehouseFlow;


import com.consum.model.po.LWhFormTransfer;


import com.consum.model.po.LWhGoodsRecord;


import com.consum.model.po.LWhGoodsRecordDetails;


import com.consum.model.po.LWhProcureModelUser;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.CollectionUtils;


import com.walker.infrastructure.utils.DateUtils;


import com.walker.infrastructure.utils.NumberGenerator;




import cn.hutool.core.convert.Convert;


import lombok.extern.slf4j.Slf4j;


import javax.annotation.Resource;


import java.util.ArrayList;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




/**


 * @ClassName LWhFormTransferCoreService


@@ -51,6 +37,12 @@




    @Resource


    private LWhFormTransferService lWhFormTransferService;


    @Resource


    private LWhProcureModelService lWhProcureModelService;


    @Resource


    private BaseGoodsTemplateService baseGoodsTemplateService;






    @Resource


    private LWhFormOutputCoreService lWhFormOutputCoreService;


    @Resource


@@ -104,14 +96,14 @@


            // 根据调拨单 生成 出库单 这样就能公用出库


            lWhFormTransfer.getBusinessType();


            outWarehouseFormId =


                lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, businessEnum, currentUser, dealTime);


                    lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, businessEnum, currentUser, dealTime);


        } catch (Exception e) {


            log.error(e.getMessage());


            return;


        }


        // 出库单 出库，返回 出库单流水Id


        Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, businessEnum, currentUser,


            dealTime, whFormTransferId);


                dealTime, whFormTransferId);




        // 更新调拨单


        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);


@@ -125,6 +117,164 @@




        log.info("调拨单：{} 出库完成", whFormTransferId);


        return;




    }




    /**


     * 新调拨出库 ，不再生成出库单


     *


     * @param whFormTransferId


     * @param currentUser


     */


    public Long doTransferOutPutNew(Long whFormTransferId, S_user_core currentUser) {


        LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);


        lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);


        if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 0) {


            log.error("调拨失败！请检查调拨单状态");


            return null;


        }




        Long userId = currentUser.getId();


        String nickName = currentUser.getNick_name();


        long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());


        //申请调拨的物品


        List<LWhProcureModel> goodsModelNumList = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, whFormTransferId);


        if (CollectionUtils.isEmpty(goodsModelNumList)) {


            log.error("没有要出库的物品");


            return null;


        }


        List<LWhProcureModel> goodsModelNumUpdList = new ArrayList<>(goodsModelNumList.size());






        // 要出物品的仓库id


        Integer outWarehouseType = lWhFormTransfer.getOutWarehouseType();


        Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();


        String warehouseName = lWhFormTransfer.getOutWarehouseName();


        Integer inWarehouseType = lWhFormTransfer.getInWarehouseType();


        Long inWarehouseId = lWhFormTransfer.getInWarehouseId();


        String inWarehouseName = lWhFormTransfer.getInWarehouseName();




        // 流水记录总表ID


        long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();


        // 流水记录总表中 业务ID 。调拨单时  保存调拨单id  出库单时 保存出库单id


        long lWarehouseFlowBusinessId = whFormTransferId;




        // 物品状态（0=在途调拨；1=入库未分发；2=已下发；3=报废）


        Integer queryModelStatusT = 1;


        //采购方式（1：集采；2=自采）


        Integer buyTypeT = null;


        Integer modGoodsTransferingStatusT = null;


        //调拨出库


        queryModelStatusT = 1;


        buyTypeT = 1;


        modGoodsTransferingStatusT = 0;






        Integer queryModelStatus = queryModelStatusT;


        Integer buyType = buyTypeT;


        Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;




        ArrayList<Long> allChangModelList = new ArrayList<>();


        goodsModelNumList.forEach(itemModelInfo -> {


            // 需要调拨的物品的某个型号


            Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();


            LWhProcureModel updWhProcureModel = new LWhProcureModel(itemModelInfo.getId());


            //TODO 为空时不加入更新列表


            if (baseGoodsModelsId != null) {


                allChangModelList.add(baseGoodsModelsId);


            }


            // 需要调拨的物品某个型号的数量


            Integer counts = itemModelInfo.getCounts();


            //查询型号信息


            Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);


            Long tempGoodsId = (Long) tempGoodsInfo.get("goodsid");


            String goodsName = (String) tempGoodsInfo.get("goodsname");


            String modelName = (String) tempGoodsInfo.get("modelname");




            // 插入 各规格物品的进出库记录 L_WH_GOODS_RECORD


            long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();


            LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();


            whGoodsRecord.setId(whGoodsRecordId);


            whGoodsRecord.setWarehouseId(outWarehouseId);


            whGoodsRecord.setWarehouseFlowId(lWarehouseFlowId);


            whGoodsRecord.setBaseGoodsTemplateId(tempGoodsId);


            whGoodsRecord.setGoodsTemplateName(goodsName);


            whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);


            whGoodsRecord.setBaseGoodsModelsName(modelName);


            whGoodsRecord.setDealTime(dealTime);


            //本次调整类型 1=调增；2=调减


            whGoodsRecord.setThisType(2);


            whGoodsRecord.setThisCount(counts);




            //通过LockManage获得锁


            Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseType, outWarehouseId, baseGoodsModelsId);


            List<Long> outGoodsId = null;


            synchronized (warehouseModelLockObj) {


                // 获得锁后查询该型号的期初数量


                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);


                if (goodsModelNum < counts) {


                    log.error("出库失败！型号{} 的数量不足，需要调拨{}个，仓库中现存{}个", baseGoodsModelsId, counts, goodsModelNum);


                    // 手动回滚


                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                    throw new RuntimeException("出库失败!型号数量不足");


                }


                whGoodsRecord.setInitialCount(goodsModelNum);


                whGoodsRecord.setEndCount(goodsModelNum - counts);




                //出库时候，按 先入库的先出库，同时入库的，按价格高的先出库


                outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType,


                        counts);


                lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);


                // 批量插入 进出库流水明细[L_WH_GOODS_RECORD_DETAILS]


                lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);


            }


            long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsId);


            LWhProcureModel lWhProcureModel = new LWhProcureModel(itemModelInfo.getId());


            whGoodsRecord.setTotalPrice(totalAmount);


            lWhGoodsRecordServiceImpl.insert(whGoodsRecord);


            lWhProcureModel.setTotalAmount(totalAmount);


            lWhProcureModelService.update(lWhProcureModel);


            updWhProcureModel.setTotalAmount(totalAmount);


            goodsModelNumUpdList.add(updWhProcureModel);


        });


        // 更新L_WH_PROCURE_MODEL表内金额


        lWhProcureModelService.updateBatch(goodsModelNumUpdList);




        LWarehouseFlow warehouseFlow = new LWarehouseFlow();


        warehouseFlow.setId(lWarehouseFlowId);


        warehouseFlow.setWarehouseId(outWarehouseId);


        warehouseFlow.setWarehouseName(warehouseName);


        warehouseFlow.setThisType(2);


        warehouseFlow.setBusinessType(WhBusinessEnum.DIAOBO.getValue() + 0);




        warehouseFlow.setBusinessFormId(whFormTransferId == null ? lWarehouseFlowBusinessId : whFormTransferId);


        warehouseFlow.setOperatorId(userId);


        warehouseFlow.setOperatorName(nickName);


        warehouseFlow.setDealTime(dealTime);


        // 插入流水总表


        int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow);


        if (flowInsertFlag == 0) {


            return null;


        }




        //当库存变动时调用该方法


        if (outWarehouseType == 0) {


            lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);


        }




        // 更新调拨单


        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);


        //调拨单不再关联出入库单


        //        lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId);


        lWhFormTransfer.setStates(1);


        lWhFormTransfer.setOutOperatorId(userId);


        lWhFormTransfer.setOutOperatorName(nickName);


        lWhFormTransfer.setOutputTime(dealTime);


        lWhFormTransfer.setOutWarehouseFlowId(lWarehouseFlowId);


        lWhFormTransferService.update(lWhFormTransfer);




        log.info("调拨单：{} 出库完成", whFormTransferId);


        return lWarehouseFlowId;




    }




@@ -212,7 +362,7 @@


                }


                // 库存物品详情（L_WH_GOODS）中 状态设置为1


                lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName,


                    goodsStatus);


                        goodsStatus);




                // 通过物品id查询所有商品的总金额


//                long amount = lWhGoodsService.queryGoodsPriceById(outGoodsIds);


@@ -222,7 +372,7 @@




                // 获得锁后查询该型号的期初数量


                int goodsModelNum =


                    lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null);


                        lWhGoodsService.queryGoodsModelNum(inWarehouseType, inWarehouseId, baseGoodsModelsId, 1, null);


                whGoodsRecord.setInitialCount(goodsModelNum);


                whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount());


                long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsIds);


@@ -241,7 +391,7 @@


                if (!CollectionUtils.isEmpty(goodsUserInfo)) {


                    // 认为是A类物品


                    int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null)


                        .mapToInt(LWhProcureModelUser::getGoodsNum).sum();


                            .mapToInt(LWhProcureModelUser::getGoodsNum).sum();


                    if (totalGoodsNum != outGoodsIds.size()) {


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                        throw new RuntimeException("入库单失败，使用人使用数量与物品数量不一致");


@@ -288,7 +438,7 @@


            LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();


            lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);


            List<LWhGoodsRecordDetails> goodsRecordDetailsList =


                lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);


                    lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);


            for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {


                whGoodsRecordDetails.setId(null);


                whGoodsRecordDetails.setWhGoodsRecordId(whGoodsRecord.getId());


@@ -310,15 +460,15 @@




        // 当库存变动时调用该方法


        if (inWarehouseType == 0) {


            lWhWarningCoreService.updateKuCun(Convert.toShort(inWarehouseType, (short)0), inWarehouseId,


                allChangModelList, null, dealTime);


            lWhWarningCoreService.updateKuCun(Convert.toShort(inWarehouseType, (short) 0), inWarehouseId,


                    allChangModelList, null, dealTime);


        }


        log.info("调拨单：{} 入库完成", whFormTransferId);


        return;


    }




    private static String GET_GOODSID_BY_FLOWID =


        "SELECT goods.id FROM L_WH_GOODS_RECORD gr LEFT JOIN L_WH_GOODS_RECORD_DETAILS grd ON gr.id=grd.WH_GOODS_RECORD_ID LEFT JOIN L_WH_GOODS goods ON goods.id=grd.WH_GOODS_ID WHERE 1=1";


            "SELECT goods.id FROM L_WH_GOODS_RECORD gr LEFT JOIN L_WH_GOODS_RECORD_DETAILS grd ON gr.id=grd.WH_GOODS_RECORD_ID LEFT JOIN L_WH_GOODS goods ON goods.id=grd.WH_GOODS_ID WHERE 1=1";




    /**


     * 根据出库流水ID 查询 出库的物品ID


@@ -340,7 +490,7 @@


        if (CollectionUtils.isEmpty(outGoods)) {


            return null;


        }


        List<Long> whGoodsIds = outGoods.stream().map(map -> (Long)map.get("id")).collect(Collectors.toList());


        List<Long> whGoodsIds = outGoods.stream().map(map -> (Long) map.get("id")).collect(Collectors.toList());


        return whGoodsIds;


    }


}