art: WMS 服务端接口提供

zhangherong

7 天以前 f45ac28c492886e2c55d915c83985db91ac4dfa5

 src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java

@@ -6,9 +6,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.UserFactory;
@@ -18,8 +18,7 @@
import org.jeecg.modules.base.model.FactoryTreeModel;
import org.jeecg.modules.base.service.IFactoryService;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.util.FindsProductionsChildrenUtil;
import org.springframework.cache.annotation.Cacheable;
import org.jeecg.modules.system.util.FindsFactorysChildrenUtil;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +26,8 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
@@ -93,7 +94,7 @@
        query.orderByAsc(Factory::getSorter);
        List<Factory> list = this.list(query);
        //调用wrapTreeDataToTreeList方法生成树状数据
        return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
        return FindsFactorysChildrenUtil.wrapTreeDataToTreeList(list);
    }

    /**
@@ -158,7 +159,43 @@
        query.orderByAsc(Factory::getSorter);
        List<Factory> list = this.list(query);
        //调用wrapTreeDataToTreeList方法生成树状数据
        return FindsProductionsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
        return FindsFactorysChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
    }

    /**
     * 根据id查询下级产线
     */
    @Override
    public List<Factory> queryFacByPid(String pid) {
        return this.baseMapper.queryFacByPid(pid);
    }

    /**
     * 递归查询所有子节点id
     */
    @Override
    public List<String> recursionChildren(String factoryId) {
        return this.baseMapper.recursionChildren(factoryId);
    }

    @Override
    public List<Factory> queryUserProductionLineList() {
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            return Collections.emptyList();
        }
        String productionIds = sysUser.getProductionIds();
        if(StringUtils.isBlank(productionIds)){
            return Collections.emptyList();
        }
        List<String> list = Arrays.asList(productionIds.split(","));
        LambdaQueryWrapper<Factory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0);
//        queryWrapper.eq(Factory::getFactoryCategory, "PRODUCTION_LINE");
        queryWrapper.in(Factory::getId, list);
        queryWrapper.orderByAsc(Factory::getSorter);
        return super.list(queryWrapper);
    }

    /**