server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -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()); server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
@@ -231,7 +231,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()+"' ) ") 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; 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 order by a.SORTNUM asc where dmodel.ROUTE_ID=#{routeId} and dmodel.DELETED=0 and `a`.`DELETED`=0 order by dmodel.SORTNUM asc </select>
