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


@@ -1,29 +1,36 @@


package com.consum.base.service.impl;




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.base.service.*;


import com.consum.model.po.LWarehouseFlow;


import com.consum.model.po.LWhFormScrapped;


import com.consum.model.po.LWhFormScrappedGoods;


import com.consum.model.po.LWhGoodsRecord;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.CollectionUtils;


import java.util.ArrayList;


import java.util.Arrays;


import lombok.extern.slf4j.Slf4j;


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 java.util.ArrayList;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;


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.base.service.BaseGoodsTemplateService;


import com.consum.base.service.GoodsBaseServiceImpl;


import com.consum.base.service.LWarehouseFlowService;


import com.consum.base.service.LWhFormScrappedGoodsService;


import com.consum.base.service.LWhGoodsRecordService;


import com.consum.base.service.LWhGoodsService;


import com.consum.model.po.LWarehouseFlow;


import com.consum.model.po.LWhFormScrapped;


import com.consum.model.po.LWhFormScrappedGoods;


import com.consum.model.po.LWhGoodsRecord;


import com.iplatform.model.po.S_user_core;


import com.walker.infrastructure.utils.CollectionUtils;




import cn.hutool.core.convert.Convert;


import lombok.extern.slf4j.Slf4j;




/**


 * @ClassName LWhFormScrappedCoreService


@@ -146,7 +153,8 @@


                    List<Long> srappedGoodsIds = null;


                    if (warehouseType == null || warehouseType == 0) {


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


                        goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);


                        goodsModelNum =


                            lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, null);


                        srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,


                            baseGoodsModelsId, (short)1, counts);


                    } else {


@@ -156,7 +164,8 @@


                        srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,


                            transBusinessId, userName, baseGoodsModelsId, (short)2, counts);


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


                        goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);


                        goodsModelNum =


                            lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 2, null);


                    }




                    if (goodsModelNum < counts) {