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


@@ -3,6 +3,7 @@


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


import com.consum.model.po.LWhFormScrapped;


@@ -10,17 +11,16 @@


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




/**


 * @ClassName LWhFormScrappedCoreService


@@ -30,11 +30,12 @@


 **/


@Service


@Slf4j


@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)


public class LWhFormScrappedCoreService {




    private GoodsBaseServiceImpl goodsBaseService;


    private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;


    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;


    private BaseGoodsTemplateService baseGoodsTemplateService;


    private LWhGoodsService lWhGoodsService;


    private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;


    private LWhGoodsRecordService lWhGoodsRecordService;


@@ -44,7 +45,7 @@


    @Autowired


    public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,


                                      LWhFormScrappedGoodsService lWhFormScrappedGoodsService,


                                      BaseGoodsTemplateServiceImpl baseGoodsTemplateService,


                                      BaseGoodsTemplateService baseGoodsTemplateService,


                                      LWhGoodsService lWhGoodsService,


                                      LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,


                                      LWhGoodsRecordService lWhGoodsRecordService,


@@ -87,7 +88,7 @@


        Long warehouseId = lWhFormScrapped.getWarehouseId();


        String warehouseName = lWhFormScrapped.getWarehouseName();


        // 流水记录总表ID


        long lWarehouseFlowId = NumberGenerator.getLongSequenceNumberNano();


        long lWarehouseFlowId = IdUtil.generateId();




        //要报废的物品


        LWhFormScrappedGoods goods = new LWhFormScrappedGoods();


@@ -117,7 +118,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);


@@ -190,11 +191,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);