# 企业端用户

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(),"设备编码不存在");
//            }




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

@@ -232,7 +232,7 @@
        Bom bom = bomList.get(Constants.ZERO);
        List<Procedures> proceduresList = proceduresMapper.selectList(
                new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID  from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' order by r.SORTNUM  )  ")
                        .orderByAsc( " SORTNUM  ")

        );
       return proceduresList;
    }