分转元

futian.liu

2023-12-04 43a322430e7e6dcea64242bec6918037da160986

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java

@@ -15,20 +15,30 @@
import com.consum.base.pojo.response.FormScrappedGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
import com.consum.model.po.*;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormScrapped;
import com.consum.model.po.LWhFormScrappedGoods;
import com.consum.model.po.SDictData;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;

import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description 报废单
@@ -41,9 +51,9 @@
    @Autowired
    private CodeGeneratorService codeGeneratorService;
    @Autowired
    private BaseWarehouseServiceImpl baseWarehouseService;
    private BaseWarehouseService baseWarehouseService;
    @Autowired
    private FinSysTenantDepartmentServiceImpl departmentService;
    private FinSysTenantDepartmentService departmentService;
    @Autowired
    private LWhGoodsService lWhGoodsService;
    @Autowired
@@ -51,9 +61,9 @@
    @Autowired
    private SDictDataServiceImpl sDictDataService;
    @Autowired
    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
    private BaseGoodsModelsService baseGoodsModelsService;
    @Autowired
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    private BaseGoodsTemplateService baseGoodsTemplateService;
    @Autowired
    private LWhFormScrappedCoreService lWhFormScrappedCoreService;

@@ -72,7 +82,7 @@
     * @return 1.新增报废单  2.新增报废单物品
     */

    public int add(LWhFormScrappedParam param,  S_user_core currentUser, FinSysTenantUser sysInfo) {
    public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
        //1.新增报废单记录
        LWhFormScrapped lWhFormScrapped = new LWhFormScrapped();
        //报废单id
@@ -93,25 +103,6 @@
            return 0;
        }
        wareHouseName = warehouse.getWarehouseName();
//        if (0 == 0) {
//            warehouseId = param.getWarehouseId();
//            //根据仓库id查询仓库
//            BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
//            if (warehouse == null) {
//                log.error("仓库不存在");
//                return 0;
//            }
//            wareHouseName = warehouse.getWarehouseName();
//        } else {
//            // 查询部门名称
//            warehouseId = param.getDepartmentId();
//            FinSysTenantDepartment sysTenantDepartment = departmentService.getById(warehouseId);
//            if (sysTenantDepartment == null) {
//                log.error("部门不存在");
//                return 0;
//            }
//            wareHouseName = sysTenantDepartment.getName();
//        }
        lWhFormScrapped.setWarehouseId(warehouseId);
        lWhFormScrapped.setWarehouseName(wareHouseName);
        lWhFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));