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


@@ -1,13 +1,11 @@


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 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;


@@ -15,11 +13,22 @@


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 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


@@ -35,13 +44,13 @@


    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;




@@ -49,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




@@ -63,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;


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


                inOutMap.putAll(ckMap);


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


                //2.根据出库单出库


                Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.PANDIAN, 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;


        }


@@ -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<>();