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


@@ -1,8 +1,19 @@


package com.consum.base.service;




import cn.hutool.core.convert.Convert;


import java.util.ArrayList;


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 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.model.po.LWarehouseFlow;


import com.consum.model.po.LWhFormScrapped;


@@ -10,18 +21,9 @@


import com.consum.model.po.LWhGoodsRecord;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.CollectionUtils;


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


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.util.ArrayList;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;


import cn.hutool.core.convert.Convert;


import lombok.extern.slf4j.Slf4j;




/**


 * @ClassName LWhFormScrappedCoreService


@@ -36,20 +38,20 @@




    private GoodsBaseServiceImpl goodsBaseService;


    private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;


    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;


    private BaseGoodsTemplateService baseGoodsTemplateService;


    private LWhGoodsService lWhGoodsService;


    private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;


    private LWhGoodsRecordService lWhGoodsRecordService;


    private LWhGoodsRecordService lWhGoodsRecordServiceImpl;


    private LWarehouseFlowService lWarehouseFlowService;


    private LWhWarningCoreServiceImpl lWhWarningCoreService;




    @Autowired


    public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,


                                      LWhFormScrappedGoodsService lWhFormScrappedGoodsService,


                                      BaseGoodsTemplateServiceImpl baseGoodsTemplateService,


                                      BaseGoodsTemplateService baseGoodsTemplateService,


                                      LWhGoodsService lWhGoodsService,


                                      LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,


                                      LWhGoodsRecordService lWhGoodsRecordService,


                                      LWhGoodsRecordService lWhGoodsRecordServiceImpl,


                                      LWarehouseFlowService lWarehouseFlowService,


                                      LWhWarningCoreServiceImpl lWhWarningCoreService) {


//        this.lWhFormScrappedService = lWhFormScrappedService;


@@ -57,7 +59,7 @@


        this.baseGoodsTemplateService = baseGoodsTemplateService;


        this.lWhGoodsService = lWhGoodsService;


        this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;


        this.lWhGoodsRecordService = lWhGoodsRecordService;


        this.lWhGoodsRecordServiceImpl = lWhGoodsRecordServiceImpl;


        this.lWarehouseFlowService = lWarehouseFlowService;


        this.goodsBaseService = goodsBaseService;


        this.lWhWarningCoreService = lWhWarningCoreService;


@@ -89,7 +91,7 @@


        Long warehouseId = lWhFormScrapped.getWarehouseId();


        String warehouseName = lWhFormScrapped.getWarehouseName();


        // 流水记录总表ID


        long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();


        long lWarehouseFlowId = IdUtil.generateId();




        //要报废的物品


        LWhFormScrappedGoods goods = new LWhFormScrappedGoods();


@@ -119,7 +121,7 @@


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


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


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


            long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano();


            long whGoodsRecordId = IdUtil.generateId();


            LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();


            whGoodsRecord.setId(whGoodsRecordId);


            whGoodsRecord.setWarehouseType(warehouseType);


@@ -169,7 +171,7 @@


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


                    lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);


                }


                lWhGoodsRecordService.insert(whGoodsRecord);


                lWhGoodsRecordServiceImpl.insert(whGoodsRecord);


            }




        }


@@ -192,11 +194,6 @@


        }


        // 更新报废单


        lWhFormScrapped = new LWhFormScrapped(formScrappedId);


        lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);


        if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {


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


            return null;


        }


        lWhFormScrapped.setLWarehouseFlowId(lWarehouseFlowId);


        lWhFormScrapped.setStates(1);


        lWhFormScrapped.setOperatorId(userId);