# 企业端用户

jiaosong

2023-08-25 2916c4c250268482d8dd31aa9cc00b950f6b7cc9

# 企业端用户

 server/src/main/java/doumeemes/api/ext/UnitExtController.java

@@ -48,7 +48,7 @@
    public ApiResponse create(@RequestBody Unit unit) {
        Integer result=unitService.create(unit);
        if(result==0){
            return ApiResponse.failed("同一单位类型下名称不能重复");
            return ApiResponse.failed("单位名称不能重复");
        }else{
            return ApiResponse.success(result);
        }

 server/src/main/java/doumeemes/service/business/CompanyUserService.java

@@ -1,5 +1,6 @@
package doumeemes.service.business;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.dao.business.model.CompanyUser;
@@ -81,6 +82,9 @@
     */
    List<CompanyUser> findList(CompanyUser companyUser);
  

    List<CompanyUser> findList(QueryWrapper<CompanyUser> wrapper);

    /**
     * 分页查询
     *

 server/src/main/java/doumeemes/service/business/impl/CompanyUserServiceImpl.java

@@ -95,6 +95,11 @@
        return companyUserMapper.selectList(wrapper);
    }
  
    @Override
    public List<CompanyUser> findList(QueryWrapper<CompanyUser> wrapper) {
        return companyUserMapper.selectList(wrapper);
    }

    @Override
    public PageData<CompanyUser> findPage(PageWrap<CompanyUser> pageWrap) {
        IPage<CompanyUser> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

 server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java

@@ -1,6 +1,7 @@
package doumeemes.service.business.impl;

import com.baomidou.mybatisplus.extension.api.R;
import doumeemes.biz.system.SystemDictBiz;
import doumeemes.core.constants.ResponseStatus;
import doumeemes.core.exception.BusinessException;
import doumeemes.core.model.ApiResponse;
@@ -17,6 +18,8 @@
import doumeemes.dao.ext.dto.DeviceImportDTO;
import doumeemes.dao.ext.dto.QueryDeviceExtDTO;
import doumeemes.dao.ext.vo.DeviceExtListVO;
import doumeemes.dao.system.SystemDictDataMapper;
import doumeemes.dao.system.model.SystemDictData;
import doumeemes.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -62,6 +65,13 @@

    @Autowired
    private WarehouseLocationMapper  warehouseLocationMapper;

    @Autowired
    private WarehouseMapper  warehouseMapper;


    @Autowired
    private SystemDictDataMapper systemDictDataMapper;

    @Override
    public Integer create(Device device) {
@@ -329,17 +339,41 @@
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"设备编码不存在");
            }



            QueryWrapper<WarehouseLocation> warehouseLocationQuery = new QueryWrapper<>();
            warehouseLocationQuery.lambda()
                                    .eq(WarehouseLocation::getRootDepartId,department.getRootId())
                                    .in(WarehouseLocation::getUnionName
                                            ,Arrays.asList(s.getFinishWarehouseLocationName(),s.getProduceWarehouseLocationName()));
            if(Objects.equals(list.size(),2)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"库位信息已存在");
            }
            List<WarehouseLocation> warehouseLocations = warehouseLocationMapper.selectList(warehouseLocationQuery);
                                    .eq(WarehouseLocation::getUnionName
                                            ,s.getProduceWarehouseLocationName()).last("limit 1");

            Map<String, WarehouseLocation> collect = warehouseLocations.stream().collect(Collectors.toMap(w -> w.getUnionName(), w -> w));
            WarehouseLocation warehouseLocation = warehouseLocationMapper.selectOne(warehouseLocationQuery);

            if (Objects.isNull(warehouseLocation)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"待生产货位不存在");
            }

            QueryWrapper<SystemDictData> systemDictDataQuery = new QueryWrapper<>();
            systemDictDataQuery.lambda()
                    .eq(SystemDictData::getDictId,3)
                    .eq(SystemDictData::getCode,"混合");
            SystemDictData systemDictData = systemDictDataMapper.selectOne(systemDictDataQuery);

            warehouseLocationQuery.clear();
            warehouseLocationQuery.lambda()
                                    .eq(WarehouseLocation::getRootDepartId,department.getRootId())
                                    .eq(WarehouseLocation::getSystemDicDataId,systemDictData.getId())
                                    .eq(WarehouseLocation::getUnionName,s.getFinishWarehouseLocationName()).last("limit 1");

            WarehouseLocation finishWarehouseLocations = warehouseLocationMapper.selectOne(warehouseLocationQuery);

            if (Objects.isNull(finishWarehouseLocations)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"已完工货位不存在");
            }

            Map<String, WarehouseLocation> collect =new HashMap<>();
            collect.put(warehouseLocation.getUnionName(),warehouseLocation);
            collect.put(finishWarehouseLocations.getUnionName(),finishWarehouseLocations);

            Device device = new Device();
            device.setDeleted(Constants.ZERO);
@@ -348,8 +382,8 @@
            device.setUpdateUser(user.getId());
            device.setUpdateTime(new Date());
//            device.setRemark();
            device.setRootDepartId(department.getRootId());
            device.setDepartId(procedures.getId());
            device.setRootDepartId(user.getRootDepartment().getId());
            device.setDepartId(user.getCurComDepartment().getId());
            device.setProcedureId(procedures.getId());

            device.setCode(StringUtils.isNotBlank(device.getCode()) ? device.getCode() : this.getNextCode(user.getCompany().getId()));
@@ -357,15 +391,23 @@
            device.setName(s.getDeviceName());
            device.setModel(s.getModel());
            device.setStatus(Constants.ZERO);
//            device.setSupplier();
            device.setStationCode(s.getStationCode());
//            device.setGroupId();
//            device.setSerialNum();
            device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElse(null));
            device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElse(null));
            device.setProduceWarehouseLocationId(Optional.ofNullable(collect.get(s.getProduceWarehouseLocationName())).map(m->m.getId()).orElseThrow(null));
            device.setFinishWarehouseLocationId(Optional.ofNullable(collect.get(s.getFinishWarehouseLocationName())).map(m->m.getId()).orElseThrow(null));
            deviceMapper.insert(device);
            if(StringUtils.isNotBlank(s.getUserIds())){
                this.dealDeviceUserId(Constants.ZERO,device.getUserIds().trim(),device.getId(),user);

                QueryWrapper<CompanyUser>  companyUserQuery = new QueryWrapper<>();

                companyUserQuery.lambda()
                                .eq(CompanyUser::getComDepartId,user.getComDepartment().getId())
                                .in(CompanyUser::getPhone,Arrays.asList(s.getUserIds().split("[.,;，]")));
                List<CompanyUser> list1 = companyUserService.findList(companyUserQuery);
                if (!CollectionUtils.isEmpty(list1)){
                    List<String> collect1 = list1.stream().map(c -> c.getId().toString()).collect(Collectors.toList());
                    this.dealDeviceUserId(Constants.ZERO,StringUtils.join(collect1,","),device.getId(),user);
                }

            }

        });

 server/src/main/java/doumeemes/service/business/impl/UnitServiceImpl.java

@@ -1,5 +1,7 @@
package doumeemes.service.business.impl;

import doumeemes.core.constants.ResponseStatus;
import doumeemes.core.exception.BusinessException;
import doumeemes.core.model.ApiResponse;
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.model.PageData;
@@ -50,7 +52,7 @@
            find.setDeleted(Constants.ZERO);
            find.setName(unit.getName());
            if( this.count(find)>0){
                throw new RuntimeException("同一单位类型下名称不能重复");
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"单位名称不能重复");
            }else{
                unitMapper.insert(unit);
            }

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -1813,7 +1813,7 @@
            wreev.setProcedureName(re.getProcedureName());
            wreev.setUnintname(unintname);
            if(re.getOmodel().getPlanNum() != null){
                wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
                wreev.setPlanNum(re.getOmodel().getPlanNum().toString() );
            }
            wreev.setMaterialDonetype(re.getMaterialDonetype());
            wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());

 server/src/main/resources/mappers/ProceduresExtMapper.xml

@@ -562,7 +562,7 @@
               dmodel.id as dmodelRouteProductId
        FROM `procedures` `a`
        LEFT JOIN route_procedure `dmodel`  on dmodel.PROCEDURE_ID=a.id
        where dmodel.ROUTE_ID=#{routeId} and dmodel.DELETED=0 and `a`.`DELETED`=0
        where dmodel.ROUTE_ID=#{routeId} and dmodel.DELETED=0 and `a`.`DELETED`=0 order by a.SORTNUM asc
    </select>