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


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


package com.consum.base.service.impl;




import com.consum.base.service.core.LWhFormInventoryCoreService;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.Collections;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


@@ -34,6 +34,7 @@


import com.consum.base.service.LWhFormInventoryGoodsService;


import com.consum.base.service.LWhFormInventoryService;


import com.consum.base.service.LWhGoodsService;


import com.consum.base.service.core.LWhFormInventoryCoreService;


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenant;


import com.consum.model.po.FinSysTenantUser;


@@ -158,8 +159,8 @@


            paramts.put("inventoryDateEnd", param.getEndTime() * 1000000 + 240000);


        }


        // 机构


        sql.append("and AGENCY_ID =:AGENCY_ID ");


        paramts.put("AGENCY_ID", sysInfo.getTenantId());


        sql.append("and AGENCY_ID =:agencyId ");


        paramts.put("agencyId", sysInfo.getTenantId());




        sql.append("ORDER BY CREATE_TIME DESC ");


        return selectSplit(sql.toString(), paramts, new LWhFormInventory());


@@ -359,13 +360,6 @@


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


        param.put("warehouseId", warehouseId);




        // String sql =


        // "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME


        // baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "


        // + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "


        // + "where bgt.AGENCY_ID = :agencyId";


        // HashMap<String, Object> param = new HashMap<>();


        // param.put("agencyId", inventory.getAgencyId());


        List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());


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


        result.forEach(item -> {


@@ -393,7 +387,7 @@


        param.put("id", id);


        List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());


        if (CollectionUtils.isEmpty(select)) {


            return null;


            return Collections.emptyList();


        }


        List<InventoryExcelTemplate> list = Lists.newArrayList();


        select.forEach(item -> {