低值易耗品管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
futian.liu
2023-12-05 8e4000461f3a6bbee34068b78ed60292c0ada611 
 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java


@@ -1,45 +1,56 @@


package com.consum.base.service;




import com.consum.base.core.CodeGeneratorEnum;


import com.consum.base.core.CodeGeneratorService;


import com.consum.base.core.WhBusinessEnum;


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


import com.consum.model.po.*;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.NumberGenerator;


import lombok.extern.slf4j.Slf4j;


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


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;


import org.springframework.util.CollectionUtils;




import java.util.ArrayList;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




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


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;


import org.springframework.util.CollectionUtils;




import com.consum.base.core.CodeGeneratorEnum;


import com.consum.base.core.CodeGeneratorService;


import com.consum.base.core.WhBusinessEnum;


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


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenantUser;


import com.consum.model.po.LWhFormInventory;


import com.consum.model.po.LWhFormInventoryGoods;


import com.consum.model.po.LWhFormOutput;


import com.consum.model.po.LWhFormProcure;


import com.consum.model.po.LWhFormProcureGoods;


import com.consum.model.po.LWhProcureModel;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.NumberGenerator;




import lombok.extern.slf4j.Slf4j;




/**


 * @ClassName LWhFormInventoryCoreService




 * @Date 2023/11/1


 * @Description


 * @Version 1.0


 **/


@Slf4j


@Service


@Transactional(propagation = Propagation.REQUIRED)


public class LWhFormInventoryCoreService {




    private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;


    private LWhFormOutputCoreService lWhFormOutputCoreService;


    private CodeGeneratorService codeGeneratorService;


    private LWhFormProcureService lWhFormProcureService;


    private BaseWarehouseServiceImpl baseWarehouseService;


    private LWhFormProcureGoodsService lWhFormProcureGoodsService;


    private LWhFormProcureService lWhFormProcureServiceImpl;


    private BaseWarehouseService baseWarehouseService;


    private LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl;


    private LWhProcureModelService lWhProcureModelService;


    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;


    private BaseGoodsTemplateService baseGoodsTemplateService;


    private LWhGoodsService lWhGoodsService;


    private LWhFormInventoryServiceImpl lWhFormInventoryService;


    private LWhFormInventoryService lWhFormInventoryService;


    private LWhFormProcureCoreService lWhFormProcureCoreService;


    private LWhFormOutputServiceImpl lWhFormOutputService;




@@ -47,13 +58,13 @@


    public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,


                                       LWhFormOutputCoreService lWhFormOutputCoreService,


                                       CodeGeneratorService codeGeneratorService,


                                       LWhFormProcureService lWhFormProcureService,


                                       BaseWarehouseServiceImpl baseWarehouseService,


                                       LWhFormProcureGoodsService lWhFormProcureGoodsService,


                                       LWhFormProcureService lWhFormProcureServiceImpl,


                                       BaseWarehouseService baseWarehouseService,


                                       LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl,


                                       LWhProcureModelService lWhProcureModelService,


                                       BaseGoodsTemplateServiceImpl baseGoodsTemplateService,


                                       BaseGoodsTemplateService baseGoodsTemplateService,


                                       LWhGoodsService lWhGoodsService,


                                       LWhFormInventoryServiceImpl lWhFormInventoryService,


                                       LWhFormInventoryService lWhFormInventoryService,


                                       LWhFormProcureCoreService lWhFormProcureCoreService,


                                       LWhFormOutputServiceImpl lWhFormOutputService




@@ -61,9 +72,9 @@


        this.lWhFormInventoryGoods = lWhFormInventoryGoods;


        this.lWhFormOutputCoreService = lWhFormOutputCoreService;


        this.codeGeneratorService = codeGeneratorService;


        this.lWhFormProcureService = lWhFormProcureService;


        this.lWhFormProcureServiceImpl = lWhFormProcureServiceImpl;


        this.baseWarehouseService = baseWarehouseService;


        this.lWhFormProcureGoodsService = lWhFormProcureGoodsService;


        this.lWhFormProcureGoodsServiceImpl = lWhFormProcureGoodsServiceImpl;


        this.lWhProcureModelService = lWhProcureModelService;


        this.baseGoodsTemplateService = baseGoodsTemplateService;


        this.lWhGoodsService = lWhGoodsService;


@@ -73,12 +84,10 @@


    }




    /**


     * 根据 盘点单 生成 出库单 和 入库单


     * 盘点单中 盘盈物品生成入库单，盘亏生成出库单


     * 根据 盘点单 生成 出库单 和 入库单 盘点单中 盘盈物品生成入库单，盘亏生成出库单


     *


     * @param whformInventoryId 盘点单id


     * @return status true/false


     * errMsg 错误消息


     * @return status true/false errMsg 错误消息


     */


    @Transactional(rollbackFor = Exception.class)


    public String createInOutFormByInventoryId(Long whformInventoryId, S_user_core currentUser, FinSysTenantUser sysInfo) {


@@ -127,8 +136,8 @@


//                    rtnMap.put("errMsg", "创建入库单失败");


                    return "创建入库单失败";


                }


                Long inFormByInventoryId = (Long) inOutMap.get("inId");


                inOutMap.putAll(rkMap);


                Long inFormByInventoryId = (Long) inOutMap.get("inId");


                String errMsg = lWhFormProcureCoreService.doProcure(inFormByInventoryId, currentUser);


                if (errMsg != null) {


                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -152,7 +161,7 @@


                inOutMap.putAll(ckMap);


                Long lWhFormOutputId = (Long) inOutMap.get("outId");


                //2.根据出库单出库


                Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId,WhBusinessEnum.CAIGOU, currentUser, stopTime);


                Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.PANDIAN, currentUser, stopTime,null);


                if (lWarehouseFlowId == null) {


                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


//                    throw new RuntimeException("创建出库单失败");


@@ -203,7 +212,7 @@


        lWhFormProcure.setStates(1);


        lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());


        lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());


        int result = lWhFormProcureService.insert(lWhFormProcure);


        int result = lWhFormProcureServiceImpl.insert(lWhFormProcure);


        if (result == 0) {


            return null;


        }


@@ -233,9 +242,9 @@


                continue;


            }


            // 查询型号库存


            int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);


            int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);


            LWhProcureModel model = new LWhProcureModel();


            model.setId(NumberGenerator.getLongSequenceNumber());


            model.setId(IdUtil.generateId());


            model.setFromProcureGoodsId(fromProcureGoodsId);


            model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);


            model.setBusinessId(whFormProcureId);


@@ -247,7 +256,7 @@


            whProcureModeLlist.add(model);


            procureGoodList.add(procureGood);


        }


        lWhFormProcureGoodsService.insertBatch(procureGoodList);


        lWhFormProcureGoodsServiceImpl.insertBatch(procureGoodList);


        lWhProcureModelService.insertBatch(whProcureModeLlist);




        HashMap<String, Object> rtnMap = new HashMap<>();


@@ -273,6 +282,7 @@


        //出入库id


        long lWhFormOutputId = IdUtil.generateId();


        lWhFormOutput.setId(lWhFormOutputId);


        lWhFormOutput.setOutWarehouseType(0);


        lWhFormOutput.setWarehouseId(warehouseId);


        //根据仓库id查询仓库


        BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);


@@ -297,6 +307,7 @@


        if (flag1 != 1) {


            return null;


        }


        ArrayList<LWhProcureModel> lWhProcureModels = new ArrayList<>();


        for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {


            Long baseGoodsModelsId = inventoryGoods.getBaseGoodsModelsId();


            Integer counts = inventoryGoods.getErrorCounts();


@@ -304,15 +315,20 @@


                continue;


            }


            //根据物品型号查询物品库存


            int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);


            int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);


            //新增L_WH_PROCURE_MODEL记录


            LWhProcureModel lWhProcureModel = new LWhProcureModel();


            lWhProcureModel.setId(IdUtil.generateId());


            lWhProcureModel.setBusinessType(3);


            lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue() + 0);


            lWhProcureModel.setBusinessId(lWhFormOutputId);


            lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);


            lWhProcureModel.setCounts(counts);


            lWhProcureModel.setWorehouseCount(goodsNum);


            lWhProcureModelService.insert(lWhProcureModel);


//            lWhProcureModelService.insert(lWhProcureModel);


            lWhProcureModels.add(lWhProcureModel);


        }


        if (!CollectionUtils.isEmpty(lWhProcureModels)) {


            lWhProcureModelService.insertBatch(lWhProcureModels);


        }


        HashMap<String, Object> rtnMap = new HashMap<>();


        rtnMap.put("outId", lWhFormOutputId);