# 企业端用户

jiaosong

2023-08-25 68848209fb33f4f2bd32ce60fd394531221d2773

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

@@ -330,14 +330,14 @@
            if(Objects.isNull(procedures)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"工序名称不存在");
            }
            QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
            queryDeviceExtDTO.setDeleted(Constants.ZERO);
            queryDeviceExtDTO.setCode(s.getDeviceCode());
            queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
            List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
            if(list.size() > 0){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"设备编码不存在");
            }
//            QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
//            queryDeviceExtDTO.setDeleted(Constants.ZERO);
//            queryDeviceExtDTO.setCode(s.getDeviceCode());
//            queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
//            List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
//            if(list.size() > 0){
//                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"设备编码不存在");
//            }



@@ -368,7 +368,7 @@
            WarehouseLocation finishWarehouseLocations = warehouseLocationMapper.selectOne(warehouseLocationQuery);

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

            Map<String, WarehouseLocation> collect =new HashMap<>();
@@ -386,7 +386,7 @@
            device.setDepartId(user.getCurComDepartment().getId());
            device.setProcedureId(procedures.getId());

            device.setCode(StringUtils.isNotBlank(device.getCode()) ? device.getCode() : this.getNextCode(user.getCompany().getId()));
            device.setCode(StringUtils.isNotBlank(s.getDeviceCode()) ? s.getDeviceCode() : this.getNextCode(user.getCompany().getId()));
            device.setType(StringUtils.isNotBlank(device.getCode()) ? device.getCode().trim().equals("设备") ? 1 : 0 : 1);
            device.setName(s.getDeviceName());
            device.setModel(s.getModel());