From 600d3b46ee56583c7c75bd4d4dbb9c5b79dd1e06 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 12 Jan 2026 16:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 ++-- .../dashboard/pojo/dto/BsCraftAbilityDTO.java | 0 .../desk/dashboard/pojo/dto/BsPlatingDTO.java | 0 .../pojo/dto/BsPlatingTypeAssignDTO.java | 0 .../dashboard/pojo/dto/BsPlatingTypeDTO.java | 0 .../pojo/dto/BsPlatingTypeSmallDTO.java | 0 .../dashboard/pojo/dto/BsProcessGroupDTO.java | 0 .../dashboard/pojo/dto/BsProcessSetDTO.java | 0 .../dashboard/pojo/dto/BsProcessTeamDTO.java | 0 .../desk/dashboard/pojo/dto/BsTeamSetDTO.java | 0 .../dashboard/pojo/dto/BsWorkCenterDTO.java | 0 .../pojo/dto/DsBatchPreservePlanDTO.java | 0 .../pojo/dto/DsBatchPreserveTaskDTO.java | 0 .../pojo/dto/DsBatchWorkCenterSetDTO.java | 0 .../desk/dashboard/pojo/dto/DsBomDTO.java | 0 .../desk/dashboard/pojo/dto/DsCraftDTO.java | 0 .../desk/dashboard/pojo/dto/DsHourQuotaDTO.java | 0 .../pojo/dto/DsHourQuotaDetailDTO.java | 0 .../pojo/dto/DsMainSaltAddQuantityDTO.java | 0 .../desk/dashboard/pojo/dto/DsPartDTO.java | 0 .../dashboard/pojo/dto/DsPartRelationDTO.java | 0 .../desk/dashboard/pojo/dto/DsProDetailDTO.java | 0 .../desk/dashboard/pojo/dto/DsProModelDTO.java | 0 .../desk/dashboard/pojo/dto/DsProcessDTO.java | 0 .../pojo/dto/DsProcessMeasuringToolDTO.java | 0 .../pojo/dto/DsProcessMoldToolDTO.java | 0 .../dashboard/pojo/dto/DsProcessProjectDTO.java | 0 .../dashboard/pojo/dto/DsSimilarPartsDTO.java | 0 .../dashboard/pojo/dto/DsSpecialProDTO.java | 0 .../desk/dashboard/pojo/dto/DsTaskBillDTO.java | 0 .../desk/dashboard/pojo/dto/DsTaskingDTO.java | 0 .../dashboard/pojo/dto/PrReworkProcessDTO.java | 0 .../pojo/entity/BsCraftAbilityEntity.java | 0 .../dashboard/pojo/entity/BsPlatingEntity.java | 0 .../pojo/entity/BsPlatingTypeAssignEntity.java | 0 .../pojo/entity/BsPlatingTypeEntity.java | 0 .../pojo/entity/BsPlatingTypeSmallEntity.java | 0 .../pojo/entity/BsProcessGroupEntity.java | 0 .../pojo/entity/BsProcessSetEntity.java | 0 .../pojo/entity/BsProcessTeamEntity.java | 0 .../dashboard/pojo/entity/BsTeamSetEntity.java | 0 .../pojo/entity/BsWorkCenterEntity.java | 0 .../pojo/entity/DsBatchPreservePlanEntity.java | 0 .../pojo/entity/DsBatchPreserveTaskEntity.java | 0 .../pojo/entity/DsBatchWorkCenterSetEntity.java | 0 .../desk/dashboard/pojo/entity/DsBomEntity.java | 0 .../dashboard/pojo/entity/DsCraftEntity.java | 0 .../pojo/entity/DsHourQuotaDetailEntity.java | 0 .../pojo/entity/DsHourQuotaEntity.java | 0 .../entity/DsMainSaltAddQuantityEntity.java | 0 .../dashboard/pojo/entity/DsPartEntity.java | 0 .../pojo/entity/DsPartRelationEntity.java | 0 .../pojo/entity/DsProDetailEntity.java | 0 .../dashboard/pojo/entity/DsProModelEntity.java | 0 .../dashboard/pojo/entity/DsProcessEntity.java | 0 .../entity/DsProcessMeasuringToolEntity.java | 0 .../pojo/entity/DsProcessMoldToolEntity.java | 0 .../pojo/entity/DsProcessProjectEntity.java | 0 .../pojo/entity/DsSimilarPartsEntity.java | 0 .../pojo/entity/DsSpecialProEntity.java | 0 .../dashboard/pojo/entity/DsTaskBillEntity.java | 0 .../dashboard/pojo/entity/DsTaskingEntity.java | 0 .../pojo/entity/PrReworkProcessEntity.java | 0 .../pojo/vo/BsCompilationCompletedVO.java | 0 .../dashboard/pojo/vo/BsCraftAbilityVO.java | 0 .../pojo/vo/BsPlatingTypeAssignVO.java | 0 .../dashboard/pojo/vo/BsPlatingTypeListVO.java | 0 .../dashboard/pojo/vo/BsPlatingTypeSmallVO.java | 0 .../desk/dashboard/pojo/vo/BsPlatingTypeVO.java | 0 .../desk/dashboard/pojo/vo/BsPlatingVO.java | 0 .../dashboard/pojo/vo/BsProcessGroupVO.java | 0 .../desk/dashboard/pojo/vo/BsProcessSetVO.java | 0 .../desk/dashboard/pojo/vo/BsProcessTeamVO.java | 0 .../desk/dashboard/pojo/vo/BsTeamProcessVO.java | 0 .../dashboard/pojo/vo/BsTeamSetEntityVO.java | 0 .../desk/dashboard/pojo/vo/BsTeamSetVO.java | 0 .../desk/dashboard/pojo/vo/BsWorkCenterVO.java | 0 .../desk/dashboard/pojo/vo/CraftTreeVO.java | 0 .../pojo/vo/DsBatchPreservePlanVO.java | 0 .../pojo/vo/DsBatchPreserveTaskVO.java | 0 .../pojo/vo/DsBatchWorkCenterSetVO.java | 0 .../desk/dashboard/pojo/vo/DsBomVO.java | 0 .../desk/dashboard/pojo/vo/DsCraftExpireVO.java | 0 .../desk/dashboard/pojo/vo/DsCraftVO.java | 0 .../dashboard/pojo/vo/DsHourQuotaDetailVO.java | 0 .../desk/dashboard/pojo/vo/DsHourQuotaVO.java | 0 .../pojo/vo/DsMainSaltAddQuantityVO.java | 0 .../dashboard/pojo/vo/DsModelAndDetailVO.java | 0 .../dashboard/pojo/vo/DsPartAuthorizedVO.java | 0 .../desk/dashboard/pojo/vo/DsPartBomVO.java | 0 .../pojo/vo/DsPartCodeAndPartNameVO.java | 0 .../dashboard/pojo/vo/DsPartRelationVO.java | 0 .../dashboard/pojo/vo/DsPartSynthesisVO.java | 0 .../desk/dashboard/pojo/vo/DsPartTreeVO.java | 0 .../desk/dashboard/pojo/vo/DsPartVO.java | 0 .../desk/dashboard/pojo/vo/DsProDetailVO.java | 0 .../pojo/vo/DsProModelDetailListVO.java | 0 .../desk/dashboard/pojo/vo/DsProModelVO.java | 0 .../pojo/vo/DsProcessMeasuringToolVO.java | 0 .../dashboard/pojo/vo/DsProcessMoldToolVO.java | 0 .../dashboard/pojo/vo/DsProcessProjectVO.java | 0 .../desk/dashboard/pojo/vo/DsProcessSaveVO.java | 0 .../dashboard/pojo/vo/DsProcessSynthesisVO.java | 0 .../desk/dashboard/pojo/vo/DsProcessVO.java | 0 .../desk/dashboard/pojo/vo/DsReworkTaskVO.java | 0 .../dashboard/pojo/vo/DsSimilarPartsVO.java | 0 .../desk/dashboard/pojo/vo/DsSpecialProVO.java | 0 .../desk/dashboard/pojo/vo/DsTaskBillVO.java | 0 .../desk/dashboard/pojo/vo/DsTaskingVO.java | 0 .../pojo/vo/PrReworkCompilationCompletedVO.java | 0 .../dashboard/pojo/vo/PrReworkProcessVO.java | 0 .../desk/dashboard/pojo/vo/ProcessTreeVO.java | 0 .../desk/dashboard/pojo/vo/SyncResult.java | 0 .../controller/BsProcessGroupController.java | 2 +- .../controller/BsProcessSetController.java | 2 +- .../dashboard/mapper/BsProcessGroupMapper.java | 1 + .../dashboard/mapper/ProcessGroupMapper.xml | 5 ++++- .../service/IBsProcessGroupService.java | 6 ++++++ .../service/impl/BsProcessGroupServiceImpl.java | 17 +++++++++++++++++ 119 files changed, 32 insertions(+), 5 deletions(-) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsCraftAbilityDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeAssignDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeSmallDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessGroupDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessSetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessTeamDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsTeamSetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsWorkCenterDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreservePlanDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreserveTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchWorkCenterSetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBomDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsCraftDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsMainSaltAddQuantityDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProModelDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMeasuringToolDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMoldToolDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessProjectDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSimilarPartsDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSpecialProDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/dto/PrReworkProcessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeAssignEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeSmallEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessGroupEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessSetEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessTeamEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsWorkCenterEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchWorkCenterSetEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBomEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaDetailEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMainSaltAddQuantityEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProDetailEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProModelEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessProjectEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSimilarPartsEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/entity/PrReworkProcessEntity.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCraftAbilityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeAssignVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeListVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeSmallVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessGroupVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessSetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessTeamVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamProcessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetEntityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsWorkCenterVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreservePlanVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreserveTaskVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchWorkCenterSetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBomVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftExpireVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsModelAndDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartCodeAndPartNameVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartSynthesisVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelDetailListVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMeasuringToolVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMoldToolVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSynthesisVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsReworkTaskVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSimilarPartsVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkCompilationCompletedVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkProcessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/pojo/vo/SyncResult.java (100%) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 0ff16892..9459299e 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -12,11 +12,11 @@ public interface LauncherConstant { /** * nacos 命名空间 */ -// String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; + String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 // String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 - String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; +// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** * nacos 用户名 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsCraftAbilityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsCraftAbilityDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsCraftAbilityDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsCraftAbilityDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeAssignDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeAssignDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeAssignDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeAssignDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeSmallDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeSmallDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeSmallDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsPlatingTypeSmallDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessGroupDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessGroupDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessGroupDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessGroupDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessTeamDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessTeamDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessTeamDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsProcessTeamDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsTeamSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsTeamSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsTeamSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsTeamSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsWorkCenterDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsWorkCenterDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsWorkCenterDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/BsWorkCenterDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreservePlanDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreservePlanDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreservePlanDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreservePlanDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreserveTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreserveTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreserveTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchPreserveTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchWorkCenterSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchWorkCenterSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchWorkCenterSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBatchWorkCenterSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBomDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBomDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBomDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsBomDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsCraftDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsCraftDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsCraftDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsCraftDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsHourQuotaDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsMainSaltAddQuantityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsMainSaltAddQuantityDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsMainSaltAddQuantityDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsMainSaltAddQuantityDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsPartRelationDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProModelDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProModelDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProModelDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProModelDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMeasuringToolDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMeasuringToolDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMeasuringToolDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMeasuringToolDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMoldToolDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMoldToolDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMoldToolDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessMoldToolDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessProjectDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessProjectDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessProjectDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsProcessProjectDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSimilarPartsDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSimilarPartsDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSimilarPartsDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSimilarPartsDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSpecialProDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSpecialProDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSpecialProDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsSpecialProDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskBillDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/DsTaskingDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/PrReworkProcessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/PrReworkProcessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/dto/PrReworkProcessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/dto/PrReworkProcessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeAssignEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeAssignEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeAssignEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeAssignEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeSmallEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeSmallEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeSmallEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsPlatingTypeSmallEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessGroupEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessGroupEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessGroupEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessGroupEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessSetEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessSetEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessSetEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessTeamEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessTeamEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessTeamEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsProcessTeamEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsWorkCenterEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsWorkCenterEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsWorkCenterEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsWorkCenterEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreservePlanEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchPreserveTaskEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchWorkCenterSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchWorkCenterSetEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchWorkCenterSetEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBatchWorkCenterSetEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBomEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBomEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBomEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsBomEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaDetailEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaDetailEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaDetailEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaDetailEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsHourQuotaEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMainSaltAddQuantityEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMainSaltAddQuantityEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMainSaltAddQuantityEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMainSaltAddQuantityEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsPartRelationEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProDetailEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProDetailEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProDetailEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProDetailEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProModelEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProModelEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProModelEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProModelEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessProjectEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessProjectEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessProjectEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessProjectEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSimilarPartsEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSimilarPartsEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSimilarPartsEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSimilarPartsEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsSpecialProEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskBillEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/PrReworkProcessEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/PrReworkProcessEntity.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/entity/PrReworkProcessEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/PrReworkProcessEntity.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCompilationCompletedVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCraftAbilityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCraftAbilityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCraftAbilityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsCraftAbilityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeAssignVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeAssignVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeAssignVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeAssignVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeListVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeListVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeSmallVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeSmallVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeSmallVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeSmallVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingTypeVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsPlatingVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessGroupVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessGroupVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessGroupVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessGroupVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessTeamVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessTeamVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessTeamVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsProcessTeamVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamProcessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamProcessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamProcessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamProcessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetEntityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetEntityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetEntityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetEntityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsTeamSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsWorkCenterVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsWorkCenterVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsWorkCenterVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/BsWorkCenterVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/CraftTreeVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreservePlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreservePlanVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreservePlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreservePlanVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreserveTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreserveTaskVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreserveTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchPreserveTaskVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchWorkCenterSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchWorkCenterSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchWorkCenterSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBatchWorkCenterSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBomVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBomVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBomVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsBomVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftExpireVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftExpireVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftExpireVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftExpireVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsCraftVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsHourQuotaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsModelAndDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsModelAndDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsModelAndDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsModelAndDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartAuthorizedVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBomVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartCodeAndPartNameVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartCodeAndPartNameVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartCodeAndPartNameVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartCodeAndPartNameVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartRelationVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartSynthesisVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartSynthesisVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartSynthesisVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartSynthesisVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartTreeVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelDetailListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelDetailListVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelDetailListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelDetailListVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProModelVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMeasuringToolVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMeasuringToolVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMeasuringToolVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMeasuringToolVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMoldToolVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMoldToolVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMoldToolVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessMoldToolVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSaveVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSynthesisVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSynthesisVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSynthesisVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessSynthesisVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsReworkTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsReworkTaskVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsReworkTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsReworkTaskVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSimilarPartsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSimilarPartsVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSimilarPartsVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSimilarPartsVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskingVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkCompilationCompletedVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkCompilationCompletedVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkCompilationCompletedVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkCompilationCompletedVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkProcessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkProcessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkProcessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/PrReworkProcessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/ProcessTreeVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/SyncResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/SyncResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/pojo/vo/SyncResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/SyncResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessGroupController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessGroupController.java index acabbdd5..cdbbf3f4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessGroupController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessGroupController.java @@ -107,7 +107,7 @@ public class BsProcessGroupController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入bsProcessGroup") public R save(@Valid @RequestBody BsProcessGroupEntity bsProcessGroup) { - return R.status(bsProcessGroupService.save(bsProcessGroup)); + return R.status(bsProcessGroupService.saveProcessGroup(bsProcessGroup)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java index 804d2199..52503fb5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java @@ -104,7 +104,7 @@ public class BsProcessSetController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入bsProcessSet") public R> list(@Parameter(hidden = true) @RequestParam Map bsProcessSet, Query query) { - IPage pages = bsProcessSetService.page(Condition.getPage(query), Condition.getQueryWrapper(bsProcessSet, BsProcessSetEntity.class)); + IPage pages = bsProcessSetService.page(Condition.getPage(query), Condition.getQueryWrapper(bsProcessSet, BsProcessSetEntity.class).orderByDesc("update_time")); return R.data(BsProcessSetWrapper.build().pageVO(pages)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BsProcessGroupMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BsProcessGroupMapper.java index bf077536..ead4ecdd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BsProcessGroupMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/BsProcessGroupMapper.java @@ -60,4 +60,5 @@ public interface BsProcessGroupMapper extends BaseMapper { */ List exportBsProcessGroup(@Param("ew") Wrapper queryWrapper); + BsProcessGroupEntity selectByGroupCode(@Param("groupCode") String groupCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml index 5e52a910..0ec1751b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessGroupMapper.xml @@ -14,7 +14,6 @@ - @@ -31,5 +30,9 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessGroupService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessGroupService.java index 0d1c3a42..9b6fd764 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessGroupService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessGroupService.java @@ -58,4 +58,10 @@ public interface IBsProcessGroupService extends BaseService exportBsProcessGroup(Wrapper queryWrapper); + /** + * 工序组新增 + * @param bsProcessGroup + * @return + */ + boolean saveProcessGroup(BsProcessGroupEntity bsProcessGroup); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessGroupServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessGroupServiceImpl.java index b2b74838..344191c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessGroupServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessGroupServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; +import org.springblade.core.log.exception.ServiceException; import org.springblade.desk.dashboard.pojo.entity.BsProcessGroupEntity; import org.springblade.desk.dashboard.pojo.vo.BsProcessGroupVO; import org.springblade.desk.dashboard.excel.BsProcessGroupExcel; @@ -60,4 +61,20 @@ public class BsProcessGroupServiceImpl extends BaseServiceImpl