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


@@ -1,10 +1,7 @@


package com.consum.base.service.impl;




import com.consum.base.service.BaseWarehouseService;


import com.consum.base.service.FinSysTenantServiceImpl;


import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;


import com.consum.base.service.LWhFormInventoryService;


import com.consum.base.service.LWhGoodsService;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


@@ -31,6 +28,11 @@


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


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


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


import com.consum.base.service.BaseWarehouseService;


import com.consum.base.service.FinSysTenantService;


import com.consum.base.service.LWhFormInventoryGoodsService;


import com.consum.base.service.LWhFormInventoryService;


import com.consum.base.service.LWhGoodsService;


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenant;


import com.consum.model.po.FinSysTenantUser;


@@ -57,11 +59,11 @@


    @Autowired


    private BaseWarehouseService baseWarehouseService;


    @Autowired


    private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;


    private LWhFormInventoryGoodsService inventoryGoodsService;


    @Autowired


    private LWhGoodsService lWhGoodsService;


    @Autowired


    private FinSysTenantServiceImpl finSysTenantService;


    private FinSysTenantService finSysTenantService;


    @Autowired


    @Lazy


    private LWhFormInventoryCoreService lWhFormInventoryCoreService;


@@ -208,7 +210,7 @@


            log.error("盘点单物品为空");


            return 0;


        }


        this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);


        inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);


        // 修改盘点单


        if (state == 2) {


            // 完成盘点时设置完成盘点时间


@@ -357,8 +359,9 @@


        List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();


        result.forEach(item -> {


            FormInventoryGoodsVO baseGoodsModels = MapUtils.convertMapToObj(item, FormInventoryGoodsVO.class);


            List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));


            int inventoryCount =


                this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModels.getId(), 1, null);


                this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModels.getId(), 1, null);


            baseGoodsModels.setInventoryCount(inventoryCount);


            goodsVOList.add(baseGoodsModels);


        });