From 1dcff07d436c6558a5e57c178380ea4a04ee6803 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 5 Dec 2023 17:39:05 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=20=E4=BB=A3=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/AppRun.java          |   3 +-
 .../domain/constant/DictConstantPool.java     |   3 +-
 .../org/nl/common/domain/query/BaseQuery.java |   8 +-
 .../org/nl/common/domain/query/LConsumer.java |   9 +-
 .../org/nl/common/domain/query/PageQuery.java |   6 +-
 .../org/nl/common/domain/query/QParam.java    |   3 +-
 .../java/org/nl/common/domain/vo/DeptVo.java  |   5 +-
 .../java/org/nl/common/enums/LogTypeEnum.java |  10 +
 .../java/org/nl/common/enums/NoticeEnum.java  |   5 +
 .../java/org/nl/common/enums/QueryTEnum.java  |   3 +-
 .../nl/common/enums/wms/PointStatusEnum.java  |   4 +
 .../handler/GlobalExceptionHandler.java       |   1 -
 .../nl/common/logging/aspect/LogAspect.java   |   1 -
 .../security/satoken/SaTokenConfigure.java    |  21 +-
 .../java/org/nl/common/utils/CodeUtil.java    |   8 +
 .../java/org/nl/common/utils/ColUtil.java     |   8 +
 .../java/org/nl/common/utils/CopyUtil.java    |   3 +-
 .../java/org/nl/common/utils/DesUtil.java     |  13 +-
 .../java/org/nl/common/utils/FileUtil.java    |   1 -
 .../org/nl/common/utils/SecurityUtils.java    |   1 -
 .../java/org/nl/common/utils/YamlUtil.java    |  11 -
 .../org/nl/common/utils/dto/CurrentUser.java  |  13 +-
 .../org/nl/config/ElPermissionConfig.java     |   4 -
 .../src/main/java/org/nl/config/IdUtil.java   |   8 +
 .../src/main/java/org/nl/config/MapOf.java    |   3 +-
 .../org/nl/config/SpringContextHolder.java    |   4 +-
 .../java/org/nl/config/StringConverter.java   |   8 +
 .../config/jackson/JacksonObjectMapper.java   |  21 +-
 .../config/language/InitLocaleResolver.java   |   3 +-
 .../org/nl/config/language/LangProcess.java   |   3 +-
 .../nl/config/lucene/DynamicLogAppender.java  |  11 +-
 .../org/nl/config/lucene/DynamicLogger.java   |  24 +-
 .../java/org/nl/config/lucene/Indexer.java    |  13 +-
 .../nl/config/lucene/LuceneIndexWriter.java   |  14 +-
 .../java/org/nl/config/lucene/Searcher.java   |  55 +--
 .../org/nl/config/lucene/StaticConfig.java    |  11 +-
 .../java/org/nl/config/lucene/UrlConfig.java  |   8 +
 .../org/nl/config/mybatis/CodeGenerator.java  |  41 +--
 .../nl/config/mybatis/MybatisPlusConfig.java  |   8 +
 .../org/nl/config/redis/RedisConvert.java     |   7 +
 .../nl/config/saconfig/LoginUserHandler.java  |   3 +-
 .../org/nl/config/saconfig/SaInitConfig.java  |   3 +-
 .../src/main/java/org/nl/start/Init.java      |   5 +
 .../controller/dept/DeptController.java       |   3 -
 .../controller/dict/SysDictController.java    |   8 -
 .../controller/logging/SysLogController.java  |   6 -
 .../controller/logicflow/StageController.java |   5 -
 .../logicflow/StageImageController.java       |   5 -
 .../controller/lucence/LuceneController.java  |   9 +-
 .../notice/SysNoticeController.java           |   4 -
 .../controller/param/SysParamController.java  |   4 -
 .../SysDataPermissionController.java          |   4 -
 .../secutiry/AuthorizationController.java     |   4 +-
 .../MobileAuthorizationController.java        |  15 +-
 .../tools/ToolLocalStorageController.java     |   2 -
 .../controller/user/OnlineController.java     |   3 -
 .../controller/user/UserController.java       |   9 -
 .../coderule/ISysCodeRuleDetailService.java   |  10 +
 .../coderule/impl/SysCodeRuleServiceImpl.java |   2 +-
 .../coderule/utils/CodeRuleTypeEnum.java      |   3 +
 .../system/service/dept/ISysDeptService.java  |  14 +
 .../dept/dao/mapper/SysDeptMapper.java        |  17 +-
 .../nl/system/service/dept/dto/DeptQuery.java |   3 +-
 .../generator/ICodeGeneratorService.java      |  10 +-
 .../generator/dao/CodeColumnConfig.java       |   7 +-
 .../dao/mapper/CodeColumnConfigMapper.java    |  13 +-
 .../lucene/LuceneExecuteLogService.java       |  12 +-
 .../system/service/lucene/LuceneService.java  |  11 +-
 .../service/lucene/dto/LuceneLogDto.java      | 106 +++---
 .../impl/LuceneExecuteLogServiceImpl.java     |   6 +-
 .../lucene/impl/LuceneServiceImpl.java        |  17 +-
 .../system/service/menu/ISysMenuService.java  |  28 +-
 .../menu/dao/mapper/SysMenuMapper.java        |  21 ++
 .../nl/system/service/menu/dto/MenuDto.java   |  18 +-
 .../service/menu/impl/SysMenuServiceImpl.java |   3 +-
 .../service/notice/ISysNoticeService.java     |   9 +-
 .../notice/impl/SysNoticeServiceImpl.java     |   1 -
 .../permission/ISysDataPermissionService.java |  17 +-
 .../dao/mapper/SysDataPermissionMapper.java   |  30 ++
 .../service/permission/dto/DataScopeEnum.java |   3 +
 .../impl/SysDataPermissionServiceImpl.java    |   6 +-
 .../service/quartz/ISysQuartzJobService.java  |   7 +-
 .../service/quartz/config/JobRunner.java      |  12 +-
 .../quartz/task/AutoClearInteractionData.java |   1 -
 .../quartz/task/AutoClearLuceneData.java      |   3 +-
 .../service/redis/dao/RedisKeyDefine.java     |  12 +-
 .../service/redis/dao/RedisKeyRegistry.java   |   8 +-
 .../service/redis/impl/RedisServiceImpl.java  |  14 +-
 .../system/service/role/ISysRoleService.java  |  11 +
 .../role/dao/mapper/SysRoleMapper.java        |  19 ++
 .../secutiry/impl/OnlineUserService.java      |  29 +-
 .../tools/IToolLocalStorageService.java       |   6 +
 .../system/service/user/ISysUserService.java  |  43 +++
 .../user/dao/mapper/SysUserMapper.java        |  35 ++
 .../service/user/dto/SysUserDetail.java       |   4 +-
 .../nl/system/service/user/dto/UserQuery.java |   3 +-
 .../user/impl/ISysUserServiceImpl.java        |   2 +-
 .../main/java/org/nl/wms/LanguageTest.java    |  23 --
 .../MdBaseClassstandardController.java        |   6 -
 .../service/IMdBaseClassstandardService.java  |   2 +-
 .../impl/MdBaseClassstandardServiceImpl.java  |  19 +-
 .../controller/MdBaseMaterialController.java  |   5 -
 .../service/IMdBaseMaterialService.java       |   5 +
 .../impl/MdBaseMaterialServiceImpl.java       |   9 +-
 .../controller/MdBaseVehicleController.java   |   4 -
 .../impl/MdBaseVehicleServiceImpl.java        |   3 +-
 .../controller/MdBaseWorkshopController.java  |   5 -
 .../wms/ext/acs/service/AcsToWmsService.java  |  20 +-
 .../ext/acs/service/dto/to/BaseRequest.java   |   5 +
 .../ext/acs/service/dto/to/BaseResponse.java  |   8 +
 .../service/dto/to/wms/ApplyTaskRequest.java  |   5 +
 .../dto/to/wms/FeedBackTaskStatusRequest.java |   5 +
 .../acs/service/impl/AcsToWmsServiceImpl.java |  78 +----
 .../service/dao/mapper/MesRequestMapper.java  |   9 -
 .../service/dao/mapper/MesRequestMapper.xml   |   4 -
 .../nl/wms/ext/mes/service/dto/CusterVo.java  |  14 -
 .../ext/mes/service/dto/MesGdyInfoDto.java    |  35 --
 .../mes/service/dto/MesGdyInfoWaitDto.java    |  47 ---
 .../mes/service/dto/MesGdyMaterialInDto.java  |  33 --
 .../mes/service/dto/MesGdyMaterialOutDto.java |  33 --
 .../mes/service/dto/MesMudConsumptionDto.java |  38 ---
 .../wms/ext/mes/service/dto/MesOrderInfo.java |  27 --
 .../mes/service/dto/MesProductDataDto.java    |  46 ---
 .../service/dto/MesQSPressMonitorData.java    |  58 ----
 .../service/dto/MesSemiProductionInfo.java    |  32 --
 .../dto/MesSemiProductionInfoInDto.java       |  39 ---
 .../dto/MesSemiProductionInfoOutDto.java      |  34 --
 .../wms/ext/mes/service/dto/MesShelfInfo.java |  77 -----
 .../wms/ext/mes/service/dto/MesUnusedDto.java |  55 ---
 .../ext/mes/service/dto/MesWorkOrderDto.java  |  62 ----
 .../SysInteractRecordController.java          |   4 -
 .../service/ISysInteractRecordService.java    |  17 +-
 .../dao/mapper/SysInteractRecordMapper.java   |   9 +
 .../impl/SysInteractRecordServiceImpl.java    |  12 +-
 .../PdmBdMudConsumptionController.java        |  66 ----
 .../service/IPdmBdMudConsumptionService.java  |  43 ---
 .../service/dao/PdmBdMudConsumption.java      |  56 ---
 .../dao/mapper/PdmBdMudConsumptionMapper.java |  12 -
 .../dao/mapper/PdmBdMudConsumptionMapper.xml  |   5 -
 .../service/dto/PdmBdMudConsumptionDto.java   |  41 ---
 .../service/dto/PdmBdMudConsumptionQuery.java |  12 -
 .../impl/PdmBdMudConsumptionServiceImpl.java  |  70 ----
 .../PdmBdRequestMaterialRecordController.java |  66 ----
 .../IPdmBdRequestMaterialRecordService.java   |  49 ---
 .../dao/PdmBdRequestMaterialRecord.java       |  44 ---
 .../PdmBdRequestMaterialRecordMapper.java     |  12 -
 .../PdmBdRequestMaterialRecordMapper.xml      |   5 -
 .../dto/PdmBdRequestMaterialRecordDto.java    |  36 --
 .../dto/PdmBdRequestMaterialRecordQuery.java  |  12 -
 ...PdmBdRequestMaterialRecordServiceImpl.java |  74 ----
 .../PdmBdMaterialResidueController.java       |  66 ----
 .../service/IPdmBdMaterialResidueService.java |  49 ---
 .../service/dao/PdmBdMaterialResidue.java     |  46 ---
 .../mapper/PdmBdMaterialResidueMapper.java    |  12 -
 .../dao/mapper/PdmBdMaterialResidueMapper.xml |   5 -
 .../service/dto/PdmBdMaterialResidueDto.java  |  34 --
 .../dto/PdmBdMaterialResidueQuery.java        |  12 -
 .../impl/PdmBdMaterialResidueServiceImpl.java |  74 ----
 .../IPdmBiSubpackagerelationService.java      |   1 +
 .../mapper/PdmBiSubpackagerelationMapper.java |   6 +
 .../service/dto/SubPackageQuery.java          |   3 +-
 ...BdProductionProcessTrackingController.java |  68 ----
 ...PdmBdProductionProcessTrackingService.java |  44 ---
 .../dao/PdmBdProductionProcessTracking.java   |  56 ---
 .../PdmBdProductionProcessTrackingMapper.java |  16 -
 .../PdmBdProductionProcessTrackingMapper.xml  |  35 --
 .../PdmBdProductionProcessTrackingDto.java    |  28 --
 .../PdmBdProductionProcessTrackingQuery.java  |  16 -
 ...dProductionProcessTrackingServiceImpl.java |  68 ----
 .../PdmBdVehicleBindingController.java        |  66 ----
 .../service/IPdmBdVehicleBindingService.java  |  43 ---
 .../service/dao/PdmBdVehicleBinding.java      |  58 ----
 .../dao/mapper/PdmBdVehicleBindingMapper.java |  12 -
 .../dao/mapper/PdmBdVehicleBindingMapper.xml  |   5 -
 .../service/dto/PdmBdVehicleBindingDto.java   |  46 ---
 .../service/dto/PdmBdVehicleBindingQuery.java |  12 -
 .../impl/PdmBdVehicleBindingServiceImpl.java  |  68 ----
 .../report/controller/ReportController.java   |  76 -----
 .../nl/wms/report/service/ReportService.java  |  31 --
 .../service/dao/mapper/ReportMapper.java      |  21 --
 .../service/dao/mapper/ReportMapper.xml       |  64 ----
 .../report/service/dao/vo/IOKilnReportVo.java |  19 --
 .../service/dao/vo/MaterialTimeoutVo.java     |  18 -
 .../service/impl/ReportServiceImpl.java       |  54 ---
 ...SchBaseVehiclematerialgroupController.java |   4 -
 .../SchBaseVehiclematerialgroupMapper.java    |  16 +
 ...BaseAcsandlmsinteractivelogController.java |   4 -
 .../controller/SchBasePointController.java    |   5 -
 .../sch/point/service/dao/SchBasePoint.java   |   4 +-
 .../service/impl/SchBasePointServiceImpl.java |   2 +-
 .../controller/SchBaseRegionController.java   |   7 -
 .../region/service/ISchBaseRegionService.java |  15 +-
 .../controller/SchBaseTaskController.java     |   6 -
 .../SchBaseTaskconfigController.java          |   4 -
 .../sch/task/service/ISchBaseTaskService.java |  16 +-
 .../service/impl/SchBaseTaskServiceImpl.java  |   5 +-
 .../nl/wms/sch/task_manage/AbstractTask.java  |  13 +-
 .../nl/wms/sch/task_manage/AcsTaskDto.java    |   8 +
 .../wms/sch/task_manage/AutoCreateTask.java   |   8 +
 .../task_manage/enums/GroupStatusEnum.java    |   6 +
 .../sch/task_manage/enums/NoticeTypeEnum.java |   3 +
 .../task_manage/enums/PointStatusEnum.java    |   3 +
 .../enums/TaskFinishedTypeEnum.java           |   3 +
 .../enums/WorkOrderStatusEnum.java            |   7 +
 .../nl/wms/sch/task_manage/task/AcsUtil.java  |   5 +
 .../sch/task_manage/task/TaskListType.java    |   1 -
 .../sch/task_manage/task/TaskServiceImpl.java |  34 --
 .../task_manage/task/core/TaskApplyDto.java   |   1 -
 .../task_manage/task/core/TaskApplyType.java  |  16 +-
 .../sch/task_manage/task/core/TaskDto.java    |  11 -
 .../task/core/TaskOperateType.java            |  10 +
 .../sch/task_manage/task/core/TaskStatus.java |  29 +-
 .../task/tasks/auto/RYKQLTask.java            | 164 ---------
 .../task_manage/task/tasks/dtk/CTQKTask.java  | 211 ------------
 .../task_manage/task/tasks/dtk/DTSKTask.java  | 206 -----------
 .../task/tasks/dtk/mapper/DTKMapper.java      |  21 --
 .../task/tasks/dtk/mapper/DTKMapper.xml       |  35 --
 .../task_manage/task/tasks/fj/FJMKTask.java   | 300 ----------------
 .../task_manage/task/tasks/fj/FJQKTask.java   | 223 ------------
 .../task_manage/task/tasks/fj/FJQLTask.java   | 251 --------------
 .../task_manage/task/tasks/fj/FJQZRKTask.java | 234 -------------
 .../task_manage/task/tasks/fj/FJRKTask.java   | 256 --------------
 .../task_manage/task/tasks/fj/FJSKTask.java   | 238 -------------
 .../task_manage/task/tasks/fj/FJSLTask.java   | 267 ---------------
 .../task/tasks/fj/mapper/FJMapper.java        |  33 --
 .../task/tasks/fj/mapper/FJMapper.xml         |  79 -----
 .../task_manage/task/tasks/hn/HNMLTask.java   | 321 ------------------
 .../task_manage/task/tasks/hn/HNQKTask.java   | 166 ---------
 .../task/tasks/hn/mapper/HNMapper.java        |  19 --
 .../task/tasks/hn/mapper/HNMapper.xml         |  53 ---
 .../task_manage/task/tasks/yao/CYZCTask.java  | 284 ----------------
 .../task_manage/task/tasks/yao/GZYQLTask.java | 234 -------------
 .../task_manage/task/tasks/yz/YZQKTask.java   | 221 ------------
 .../task_manage/task/tasks/yz/YZQLTask.java   | 171 ----------
 .../task_manage/task/tasks/yz/YZSKTask.java   | 242 -------------
 .../task_manage/task/tasks/yz/YZSLTask.java   | 255 --------------
 .../sch/task_manage/task/tasks/yz/backup.txt  |  32 --
 .../task/tasks/yz/mapper/YZMapper.java        |  25 --
 .../task/tasks/yz/mapper/YZMapper.xml         |  44 ---
 .../wms/storage_manage/ios/enums/IOSEnum.java |   3 +-
 .../iostorInv/IStIvtIostorinvOutService.java  |   3 +-
 .../iostorInv/IStIvtIostorinvService.java     |   3 +-
 .../iostorInv/IStIvtIostorinvdtlService.java  |   2 +-
 .../service/iostorInv/dto/IostorInvQuery.java |   3 +-
 .../impl/StIvtIostorinvOutServiceImpl.java    |  66 ++--
 .../impl/StIvtIostorinvServiceImpl.java       |  50 ++-
 .../impl/StIvtIostorinvdisServiceImpl.java    |   2 +-
 .../impl/StIvtIostorinvdtlServiceImpl.java    |  17 +-
 .../storage_manage/ios/util/dto/RuleDto.java  |  10 +-
 .../ios/util/impl/IosInRuleServiceImpl.java   |   2 +-
 .../ios/util/impl/IosOutRuleServiceImpl.java  |   2 +-
 .../java/org/nl/wms/util/CommonUtils.java     | 102 ------
 .../java/org/nl/wms/util/DatabaseBackup.java  |   3 +-
 .../main/java/org/nl/wms/util/MainConfig.java |  14 -
 .../java/org/nl/wms/util/MyEventListener.java |  22 --
 .../main/java/org/nl/wms/util/MyListener.java |  17 -
 .../org/nl/wms/util/OracleJDBCExample.java    |  55 ---
 .../main/java/org/nl/wms/util/PointUtils.java |   3 +-
 .../main/java/org/nl/wms/util/TaskUtils.java  |  24 +-
 .../java/org/nl/wms/util/TreePrinter.java     |  45 ---
 .../java/org/nl/wms/util/XmlFormatter.java    | 100 ------
 .../nl/wms/util/test/mapper/TestMapper.java   |  42 ---
 .../nl/wms/util/test/mapper/TestMapper.xml    |  90 -----
 .../src/test/java/org/nl/ApplicationTest.java |  66 +---
 .../src/test/java/org/nl/task/MapperTest.java | 232 -------------
 265 files changed, 1135 insertions(+), 8450 deletions(-)
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YamlUtil.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/LanguageTest.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoWaitDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialInDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialOutDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesQSPressMonitorData.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoInDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoOutDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesShelfInfo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesUnusedDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/PdmBdRequestMaterialRecord.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/controller/PdmBdProductionProcessTrackingController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingQuery.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/impl/PdmBdProductionProcessTrackingServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/MaterialTimeoutVo.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/backup.txt
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MainConfig.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TreePrinter.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.java
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml
 delete mode 100644 lms/nladmin-system/nlsso-server/src/test/java/org/nl/task/MapperTest.java

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
index 7537460..5873cbe 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 开启审计功能 -> @EnableJpaAuditing
  * https://www.cnblogs.com/niceyoo/p/10908647.html
+ * https://blog.csdn.net/qq_36850813/article/details/101194250
  *
  * @author ldjun
  * @date 2021/2/22 9:20:19
@@ -31,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
 })
-@ServletComponentScan //https://blog.csdn.net/qq_36850813/article/details/101194250
+@ServletComponentScan
 @EnableTransactionManagement
 @EnableMethodCache(basePackages = "org.nl")
 @EnableCreateCacheAnnotation
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
index 860d846..a3cb0ca 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/constant/DictConstantPool.java
@@ -1,6 +1,7 @@
 package org.nl.common.domain.constant;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/12/26 9:29 上午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
index 71ccd84..1bfaced 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
@@ -13,10 +13,10 @@ import java.lang.reflect.Type;
 import java.util.Date;
 import java.util.Map;
 
-/*
+/**
+ * 泛型必须为数据tb对应do:由mybatis管理
  * @author ZZQ
  * @Date 2022/12/14 6:33 下午
- * 泛型必须为数据tb对应do:由mybatis管理
  */
 @Data
 public class BaseQuery<T> {
@@ -53,8 +53,10 @@ public class BaseQuery<T> {
         JSONObject json = (JSONObject)JSONObject.toJSON(this);
         Type[] types = ((ParameterizedTypeImpl) this.getClass().getGenericSuperclass()).getActualTypeArguments();
         Map<String, ColumnCache> columnMap = LambdaUtils.getColumnMap((Class<?>) types[0]);
+
+        String dopStr = "doP";
         json.forEach((key, vel) -> {
-            if (vel != null && !key.equals("doP")){
+            if (vel != null && !key.equals(dopStr)){
                 QParam qParam = doP.get(key);
                 if (qParam != null){
                     QueryTEnum.build(qParam.type,wrapper,qParam.k,vel);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
index 94e775c..5540d74 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java
@@ -2,13 +2,20 @@ package org.nl.common.domain.query;
 
 import java.util.Objects;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/12/14 8:40 下午
  */
 @FunctionalInterface
 public interface LConsumer<X,Y,Z> {
 
+    /**
+     * 切面
+     * @param x 、
+     * @param y 、
+     * @param z 、
+     */
     void accept(X x,Y y,Z z);
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
index e268c0b..300991c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
@@ -11,9 +11,13 @@ import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.Locale;
 
-
 /**
+ * <p>
  * 分页参数
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Data
 public class PageQuery implements Serializable {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
index dee5c8d..1a44194 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
@@ -6,7 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.nl.common.enums.QueryTEnum;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/12/15 1:41 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
index 0c88942..0cd2ef5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
@@ -65,7 +65,10 @@ public class DeptVo extends BaseDTO implements Serializable {
 
     @ApiModelProperty(value = "子节点数目", hidden = true)
     private Integer sub_count = 0;
-    //前端显示
+
+    /**
+     * 前端显示
+     */
     private Boolean has_children =Boolean.FALSE;
 
     private List<DeptVo> children;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java
index 112429a..0abdb05 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java
@@ -1,7 +1,17 @@
 package org.nl.common.enums;
 
+/**
+ * <p>
+ * 日志类型枚举
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public enum LogTypeEnum {
+    // 设备日志
     DEVICE_LOG("设备日志"),
+    // v
     INTERFACE_LOG("接口日志");
 
     private String desc;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java
index 4e6be7b..bbceb4f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java
@@ -11,10 +11,15 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum NoticeEnum {
+    // 未读
     HAVE_READ_OFF("1","未读"),
+    // 已读
     HAVE_READ_ON("2", "已读"),
+    // 未处理
     DEAL_STATUS_NO("1", "未处理"),
+    // 已处理
     DEAL_STATUS_YES("2", "已处理"),
+    // 无需处理
     DEAL_STATUS_NO_NEED("3", "无需处理");
 
     private final String value;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java
index 5a56212..b790cdb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java
@@ -7,7 +7,8 @@ import org.nl.common.domain.query.LConsumer;
 
 import java.util.Collection;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/12/14 8:26 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java
index 2cdc02f..de9b5e2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/wms/PointStatusEnum.java
@@ -11,9 +11,13 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum PointStatusEnum {
+    // 空位
     EMPTY_PLACE("1", "空位"),
+    // 有料
     FULL_MATERIAL("2", "有料"),
+    // 空载具
     EMPTY_VEHICLE("3", "空载具");
+
     private final String value;
     private final String description;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java
index 9760c7b..73bf4aa 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java
@@ -63,7 +63,6 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(value = NotLoginException.class)
     public ResponseEntity<ApiError> notLoginException(Exception e) {
-//        log.error(ThrowableUtil.getStackTrace(e));
         return buildResponseEntity(ApiError.error(401,"token 失效"));
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
index 9b25100..5253ed6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
@@ -86,7 +86,6 @@ public class LogAspect {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         HttpServletResponse response = attributes.getResponse();
-//        HttpServletRequest request = RequestHolder.getHttpServletRequest();
 
 
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
index ab83e17..423c90b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
@@ -21,23 +21,34 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class SaTokenConfigure implements WebMvcConfigurer {
 
-    // 白名单
+    /**
+     * 白名单
+     */
     @Autowired
     private SecurityProperties securityProperties;
 
-    // Sa-Token 整合 jwt (Simple 简单模式)
+    /**
+     * Sa-Token 整合 jwt (Simple 简单模式)
+     * @return StpLogic/
+     */
     @Bean
     public StpLogic getStpLogicJwt() {
         return new StpLogicJwtForSimple();
     }
 
-    // 注册 Sa-Token 拦截器，打开注解式鉴权功能
+    /**
+     * 注册 Sa-Token 拦截器，打开注解式鉴权功能
+     * @param registry
+     */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        // 注册 Sa-Token 拦截器，打开注解式鉴权功能
+        /*
+         * 注册 Sa-Token 拦截器，打开注解式鉴权功能
+         * .excludePathPatterns(securityProperties.getExcludes()): 白名单
+         */
         registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
                 .addPathPatterns("/**")
-                .excludePathPatterns(securityProperties.getExcludes()); // 白名单
+                .excludePathPatterns(securityProperties.getExcludes());
     }
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
index 76cbada..b6a492f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
@@ -11,6 +11,14 @@ import org.redisson.api.RedissonClient;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * <p>
+ * 编码工具类
+ * </p>
+ *
+ * @author lyd
+ * @since 2023-05-03
+ */
 public class CodeUtil {
 
     @SneakyThrows
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ColUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ColUtil.java
index ad0aa1d..50b19c0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ColUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ColUtil.java
@@ -6,6 +6,14 @@ import org.apache.commons.configuration.PropertiesConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * <p>
+ * 工具类
+ * </p>
+ *
+ * @author lyd
+ * @since 2023-05-03
+ */
 public class ColUtil {
     private static final Logger log = LoggerFactory.getLogger(ColUtil.class);
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java
index 69f3153..de4f379 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CopyUtil.java
@@ -7,7 +7,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-/*
+/**
+ * 复制工具类
  * @author ZZQ
  * @Date 2022/12/1 3:35 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java
index 35f7c49..d31d301 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java
@@ -18,12 +18,21 @@ import java.io.IOException;
 import java.security.SecureRandom;
 
 /**
+ * <p>
  * Des加密解密算法工具类
+ * </p>
+ *
+ * @author lyd
+ * @since 2023-05-03
  */
 public class DesUtil {
-    //加密算法是des
+    /**
+     * 加密算法是des
+     */
     private static final String ALGORITHM = "DES";
-    //转换格式
+    /**
+     * 转换格式
+     */
     private static final String TRANSFORMATION = "DES/CBC/PKCS5Padding";
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
index c4a6a70..a03479e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
@@ -97,7 +97,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         File file = null;
         try {
             // 用uuid作为文件名，防止生成的临时文件重复
-            //file = File.createTempFile(IdUtil.simpleUUID(), prefix);
             file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
             // MultipartFile to File
             multipartFile.transferTo(file);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java
index b434369..d5389e0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java
@@ -67,7 +67,6 @@ public class SecurityUtils {
      * @return 系统用户Id
      */
     public static Long getDeptId() {
-//        return getCurrentUser().getUser().getDept().getId();
         return 1L;
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YamlUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YamlUtil.java
deleted file mode 100644
index b8e6c21..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YamlUtil.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.nl.common.utils;
-
-import java.util.Properties;
-
-public class YamlUtil {
-    public static Properties properties;
-
-    public static String getValue(String key) {
-        return (String) properties.get(key);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
index 440752f..ddaa4a4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/dto/CurrentUser.java
@@ -19,12 +19,19 @@ public class CurrentUser implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private String id;
 
-    //账号
+    /**
+     * 账号
+     */
     private String username;
-    //姓名
+
+    /**
+     * 姓名
+     */
     private String presonName;
 
-    //用户详细信息
+    /**
+     * 用户详细信息
+     */
     private SysUser user;
 
     private List<String> permissions = new ArrayList<>();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
index 4abc37f..f715304 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java
@@ -24,10 +24,6 @@ import org.springframework.stereotype.Service;
 public class ElPermissionConfig {
 
     public Boolean check(String ...permissions){
-        // 获取当前用户的所有权限
-//        List<String> elPermissions = SecurityUtils.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
-        // 判断当前用户的所有权限是否包含接口上定义的权限
-//        return elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains);
         return true;
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java
index 5980d3a..fcd489e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/IdUtil.java
@@ -1,5 +1,13 @@
 package org.nl.config;
 
+/**
+ * <p>
+ * ID生成工具类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class IdUtil {
     public static Long getLongId() {
         return cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
index 7ecd4bf..2b5d8e2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
@@ -8,7 +8,8 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/11/29 2:55 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java
index 3a2ae32..3ca72c1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java
@@ -31,7 +31,9 @@ import java.util.List;
 public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
 
     private static ApplicationContext applicationContext = null;
-    //数据库连接的bean名字
+    /**
+     * 数据库连接的bean名字
+     */
     public  static   String dataSourceBeanName="dataSource";
     private static final List<CallBack> CALL_BACKS = new ArrayList<>();
     private static boolean addCallback = true;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/StringConverter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/StringConverter.java
index e7506c7..671df4f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/StringConverter.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/StringConverter.java
@@ -5,6 +5,14 @@ import cn.hutool.core.util.StrUtil;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
+/**
+ * <p>
+ * String工具类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Component
 public class StringConverter implements Converter<String, String> {
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java
index c97d5dc..acb815d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java
@@ -20,25 +20,14 @@ import java.time.format.DateTimeFormatter;
 import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
 
 /**
- * jackson 配置
- *
- * @author Lion Li
- * @author JohanChan
- * @ProjectName Demo
- * @Description 与前端交互时对实体类中Long类型的ID字段序列号
- * @time 2021/6/23 11:30
- */
-/**
- * @author JohanChan
- * @ProjectName Demo
- * @Description 与前端交互时对实体类中Long类型的ID字段序列号
- * @time 2021/6/23 11:30
- */
-
-/**
+ * <p>
  * 对象映射器:基于jackson将Java对象转为json，或者将json转为Java对象
  * 将JSON解析为Java对象的过程称为 [从JSON反序列化Java对象]
  * 从Java对象生成JSON的过程称为 [序列化Java对象到JSON]
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 public class JacksonObjectMapper extends ObjectMapper {
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
index 4d68152..d06a4a1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
@@ -11,7 +11,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Locale;
 import java.util.Map;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2023/11/13 09:36
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java
index 8fe24cc..a11ae59 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java
@@ -5,7 +5,8 @@ import org.nl.config.SpringContextHolder;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2023/11/13 09:45
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java
index 000ca5e..857eb8a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java
@@ -11,6 +11,14 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.nio.charset.Charset;
 
+/**
+ * <p>
+ * 日志
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class DynamicLogAppender {
     /**
      * 通过传入的动态名字,动态设置appender
@@ -36,7 +44,8 @@ public class DynamicLogAppender {
         //设置日志记录器的滚动策略
         TimeBasedRollingPolicy policy = new TimeBasedRollingPolicy();
         policy.setFileNamePattern(oldLogPath+dynamicName+".%d{yyyy-MM-dd}.log");
-        policy.setParent(appender); //设置父节点是appender
+        //设置父节点是appender
+        policy.setParent(appender);
         policy.setContext(context);
         policy.start();
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java
index 566a899..922d3b4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java
@@ -8,12 +8,25 @@ import org.slf4j.LoggerFactory;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * <p>
+ * 日志储存
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class DynamicLogger {
-    String logPath;//日志存储路径
+    /**
+     * 日志存储路径
+     */
+    String logPath;
     public DynamicLogger(String logPath) {
         this.logPath = logPath;
     }
-    //对外暴露日志对象：每次拿的对象从内存里拿，没有再构建
+    /**
+     * 对外暴露日志对象：每次拿的对象从内存里拿，没有再构建
+     */
     private static Map<String,Logger> container = new HashMap<>();
     public Logger getLogger(String dynamicName) {
         Logger logger = container.get(dynamicName);
@@ -24,7 +37,12 @@ public class DynamicLogger {
         container.put(dynamicName,logger);
         return logger;
     }
-    //构建Logger对象，给Logger指定appender
+
+    /**
+     * 构建Logger对象，给Logger指定appender
+     * @param dynamicName /
+     * @return Logger
+     */
     private Logger build(String dynamicName) {
         RollingFileAppender runTaskAppender =new DynamicLogAppender().getAppender(this.logPath,dynamicName);
         LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
index fa22002..64895ee 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java
@@ -21,7 +21,12 @@ import java.nio.file.Paths;
 import java.util.Set;
 
 /**
+ * <p>
  * lucene索引器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 public class Indexer {
     /**
@@ -67,7 +72,6 @@ public class Indexer {
             }
         }
         //返回索引的文件数
-//        return writer.numDocs();
         return writer.numRamDocs();
     }
 
@@ -84,7 +88,6 @@ public class Indexer {
         //添加索引文档
         //Document doc = json2Doc(jsonDoc);
 //        Document doc = new Document();
-//        doc.add(new TextField("content", jsonDoc, Field.Store.YES));
         Field fieldContent = new TextField("fieldContent", FileUtils.readFileToString(null, "UTF-8"), Field.Store.YES);
 
         //将doc添加到索引中
@@ -132,7 +135,6 @@ public class Indexer {
         long startTime = System.currentTimeMillis();
         //步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象
         Document document = new Document();
-//        document.add(new TextField("fieldContent", device_id, Field.Store.YES));
         document.add(new TextField("fieldContent", msg, Field.Store.YES));
         indexWriter.addDocument(document);
         //记录索引结束时间
@@ -144,7 +146,9 @@ public class Indexer {
         System.out.println("建立索引成功-----关闭资源");
     }
 
-    //系统的日志文件路径
+    /**
+     * 系统的日志文件路径
+     */
     @Value("${logging.file.path}")
     private String logUrl;
 
@@ -168,7 +172,6 @@ public class Indexer {
             String strLine = null;
             while (null != (strLine = bufferedReader.readLine())) {
                 Document document = new Document();
-//                document.add(new Field());
                 document.add(new TextField("fieldContent", strLine, Field.Store.YES));
                 indexWriter.addDocument(document);
             }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
index fb739ce..0e9fdb6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java
@@ -14,6 +14,14 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * <p>
+ *     、
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class LuceneIndexWriter {
     private static IndexWriter indexWriter;
 
@@ -52,9 +60,11 @@ public class LuceneIndexWriter {
     }
 
     public static String getDate(String timeString) throws ParseException {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");//时间格式
+        //时间格式
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
         Date date = sdf.parse(timeString);
-        timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");//格式化后的时间
+        //格式化后的时间
+        timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");
         return timeString;
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
index 086f4e1..ea0bb97 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
@@ -26,7 +26,12 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 /**
+ * <p>
  * lucene查询器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Slf4j
 public class Searcher {
@@ -40,13 +45,17 @@ public class Searcher {
         //标准分词器，会自动去掉空格啊，is a the等单词
         Analyzer analyzer = new IKAnalyzer(true);
 
-        //记录索引开始时间
-//        long startTime = System.currentTimeMillis();
-        // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数：
-        int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数
-        int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;// 当前页码
-        int start = pageNum * pageSize;// 当前页的起始条数
-        int end = start + pageSize;// 当前页的结束条数（不能包含）
+        /*
+         * 记录索引开始时间
+         */
+        // 每页条数
+        int pageSize = Integer.parseInt(whereJson.get("size").toString());
+        // 当前页码
+        int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;
+        // 当前页的起始条数
+        int start = pageNum * pageSize;
+        // 当前页的结束条数（不能包含）
+        int end = start + pageSize;
         // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序
         Sort sort = new Sort(new SortField(LogMessageConstant.SORT_NAME, SortField.Type.LONG,true));
 
@@ -91,9 +100,6 @@ public class Searcher {
         }
         docs = searcher.search(booleanQueryBuilder.build(), end,sort);
         //记录索引时间
-//        long endTime = System.currentTimeMillis();
-//        log.info("匹配{}共耗时{}毫秒",booleanQueryBuilder.build(),(endTime-startTime));
-//        log.info("查询到{}条日志文件", docs.totalHits.value);
         List<String> list = new ArrayList<>();
         ScoreDoc[] scoreDocs = docs.scoreDocs;
         if (end > docs.totalHits.value) end = (int) docs.totalHits.value;
@@ -112,7 +118,6 @@ public class Searcher {
                     LogMessageConstant.COLOR_MAGENTA + doc.get(LogMessageConstant.FIELD_CLASS_NAME) +
                     LogMessageConstant.COLOR_RESET + " - " +
                     LogMessageConstant.COLOR_BLACK + highlightKeyword(doc.get(LogMessageConstant.FIELD_MESSAGE), whereJson.getString("message"));
-//            System.out.println(logInfo);
             list.add(logInfo);
         }
         reader.close();
@@ -141,34 +146,6 @@ public class Searcher {
     }
 
     public static void main(String[] args) throws IOException, ParseException {
-//        String indexDir = "D:\\lucene\\index";
-//        //查询这个字符串
-//        JSONObject whereJson = new JSONObject();
-//        whereJson.put("size", "500");
-//        whereJson.put("page", "1");
-//        whereJson.put("message", "请求方法参数");
-////        whereJson.put(LogMessageConstant.FIELD_TRACEID, "13244183367577216");
-//
-//        try {
-//            search(indexDir, whereJson);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-        // 删除
-//        Directory directory = FSDirectory.open(Paths.get("D:\\lucene\\index"));
-//        IndexWriterConfig config = new IndexWriterConfig();
-//        IndexWriter writer = new IndexWriter(directory, config);
-//
-//        String timestampAsString = "2023-10-25 14:36:12";
-//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        Date date = dateFormat.parse(timestampAsString);
-//        long unixTimestamp = date.getTime(); // 获取Unix时间戳
-//
-//        Query query = LongPoint.newRangeQuery("time", 0L, unixTimestamp);
-//        writer.deleteDocuments(query);
-//
-//        writer.commit();
-//        writer.close();
         // 获取当前时间
         LocalDateTime now = LocalDateTime.now();
         // 减去七天
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
index c7958bb..0146ff4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
@@ -5,11 +5,18 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @deprecated 设置静态参数初始化
+ * <p>
+ * 设置静态参数初始化
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Configuration
 public class StaticConfig {
-    //日志索引目录
+    /**
+     * 日志索引目录
+     */
     @Value("${lucene.index.path}")
     private String luceneDir;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java
index dd7ce01..2ebb250 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java
@@ -1,5 +1,13 @@
 package org.nl.config.lucene;
 
+/**
+ * <p>
+ * url
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class UrlConfig {
     public static String luceneUrl;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
index b1a7a1e..ff70987 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
@@ -3,16 +3,24 @@ package org.nl.config.mybatis;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import org.nl.config.language.LangProcess;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Scanner;
 
+/**
+ * <p>
+ * 自动生成代码
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class CodeGenerator {
 
     /**
@@ -27,11 +35,11 @@ public class CodeGenerator {
         System.out.println(help.toString());
         if (scanner.hasNext()) {
             String ipt = scanner.next();
-            if (!StringUtils.isEmpty(ipt)) {
+            if (!StringUtils.isBlank(ipt)) {
                 return ipt;
             }
         }
-        throw new MybatisPlusException(LangProcess.msg("error_ParamError"));
+        throw new MybatisPlusException("请输入正确的" + tip + "！");
     }
 
 
@@ -49,28 +57,27 @@ public class CodeGenerator {
         gc.setOutputDir(projectPath + "/src/main/java/");
         gc.setAuthor("generator");
         gc.setOpen(false);
-//        gc.setSwagger2(true);
         gc.setEntityName("%s");
         gc.setServiceName("I%sService");
         gc.setServiceImplName("%sServiceImpl");
+        gc.setDateType(DateType.ONLY_DATE);
         mpg.setGlobalConfig(gc);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/stand_lms?setUnicode=true&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://localhost:3306/lanzhou_two?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("12356");
+        dsc.setPassword("root");
         mpg.setDataSource(dsc);
         // 包配置
         PackageConfig pc = new PackageConfig();
-//        pc.setModuleName("");
         pc.setParent("org.nl."+menusName);
         pc.setController("controller." + moduleName);
         pc.setMapper("service."+moduleName+".dao.mapper");
         pc.setService("service." + moduleName);
         pc.setServiceImpl("service." + moduleName + ".impl");
         pc.setEntity("service." + moduleName + ".dao");
-        pc.setXml("service." + moduleName + ".dao.mapper");
+        pc.setXml("service." + moduleName + ".dao.mapper.xml");
         mpg.setPackageInfo(pc);
 //        // 自定义配置
         InjectionConfig cfg = new InjectionConfig() {
@@ -82,19 +89,13 @@ public class CodeGenerator {
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-//        strategy.setSuperEntityClass("你自己的父类实体,没有就不用设置!");
+        strategy.setColumnNaming(NamingStrategy.no_change);
         strategy.setEntityLombokModel(true);
         strategy.setRestControllerStyle(true);
-        // 公共父类
-//        strategy.setSuperControllerClass("你自己的父类控制器,没有就不用设置!");
         // 写于父类中的公共字段
-//        strategy.setSuperEntityColumns("id");
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(false);
-//        strategy.setTablePrefix("sys_");
         mpg.setStrategy(strategy);
-//        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
         mpg.execute();
     }
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
index 6b57662..c854f10 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
@@ -8,6 +8,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+/**
+ * <p>
+ * MybatisPlus配置
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @EnableTransactionManagement
 @Configuration
 public class MybatisPlusConfig {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
index caea9b9..808005e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java
@@ -18,6 +18,13 @@ public interface RedisConvert {
 
     RedisConvert INSTANCE = Mappers.getMapper(RedisConvert.class);
 
+    /**
+     * 创建
+     * @param info
+     * @param dbSize
+     * @param commandStats
+     * @return RedisMonitorRespVO
+     */
     default RedisMonitorRespVO build(Properties info, Long dbSize, Properties commandStats) {
         RedisMonitorRespVO respVO = RedisMonitorRespVO.builder().info(info).dbSize(dbSize)
                 .commandStats(new ArrayList<>(commandStats.size())).build();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/LoginUserHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/LoginUserHandler.java
index 2d259a7..ac8193d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/LoginUserHandler.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/LoginUserHandler.java
@@ -6,7 +6,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.function.BiFunction;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/11/24 3:47 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java
index 8c8a046..fedff5f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java
@@ -8,7 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.ModelAndView;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/11/28 10:58 上午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java
index c98e6cc..e6cf273 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/start/Init.java
@@ -7,7 +7,12 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 /**
+ * <p>
  * 随项目启动模块
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Slf4j
 @Component
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
index 5126d87..bf93202 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
@@ -85,7 +85,6 @@ public class DeptController {
     @Log("新增部门")
     @ApiOperation("新增部门")
     @PostMapping
-//    @SaCheckPermission("dept:add")
     public ResponseEntity<Object> create(@Validated @RequestBody SysDept resources){
         deptService.createDept(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -94,7 +93,6 @@ public class DeptController {
     @Log("修改部门")
     @ApiOperation("修改部门")
     @PutMapping
-//    @SaCheckPermission("dept:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody SysDept dept){
         if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) {
             throw new BadRequestException(LangProcess.msg("login_childError"));
@@ -106,7 +104,6 @@ public class DeptController {
     @Log("删除部门")
     @ApiOperation("删除部门")
     @DeleteMapping
-//    @SaCheckPermission("dept:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> deptIds){
         if (CollectionUtils.isEmpty(deptIds)){
            return ResponseEntity.noContent().build();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java
index 66b7adb..819f9a9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java
@@ -37,14 +37,12 @@ public class SysDictController {
     @Log("查询字典")
     @GetMapping
     @ApiOperation("查询字典")
-//    @SaCheckPermission("dict:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery pageable){
         return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK);
     }
 
     @ApiOperation("查询所有字典信息")
     @GetMapping(value = "/all")
-//    @SaCheckPermission("dict:list")
     public ResponseEntity<Object> queryAll(){
         return new ResponseEntity<>(dictService.queryAll(),HttpStatus.OK);
     }
@@ -52,7 +50,6 @@ public class SysDictController {
     @Log("新增字典")
     @PostMapping
     @ApiOperation("新增字典")
-//    @SaCheckPermission("dict:add")
     public ResponseEntity<Object> create(@RequestBody Dict dict){
         dictService.create(dict);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -61,7 +58,6 @@ public class SysDictController {
     @PutMapping
     @Log("修改字典")
     @ApiOperation("修改字典")
-    //@SaCheckPermission("@el.check('dict:edit')")
     public ResponseEntity<Object> updateDict(@Validated @RequestBody Dict dto){
         dictService.updateDict(dto);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -70,7 +66,6 @@ public class SysDictController {
     @Log("删除字典")
     @ApiOperation("删除字典")
     @DeleteMapping
-//    @SaCheckPermission("dict:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
         dictService.deleteBatchByIds(ids);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -97,7 +92,6 @@ public class SysDictController {
     @Log("新增字典详情")
     @ApiOperation("新增字典详情")
     @PostMapping("/dictDetail")
-//    @SaCheckPermission("dict:add")
     public ResponseEntity<Object> createDetail(@RequestBody Dict resources){
         dictService.createDetail(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -106,7 +100,6 @@ public class SysDictController {
     @Log("修改字典详情")
     @ApiOperation("修改字典详情")
     @PutMapping("/dictDetail")
-//    @SaCheckPermission("dict:edit")
     public ResponseEntity<Object> updateDetail(@RequestBody Dict resources){
         dictService.updateDetail(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -115,7 +108,6 @@ public class SysDictController {
     @Log("删除字典详情")
     @ApiOperation("删除字典详情")
     @DeleteMapping(value = "/dictDetail/{id}")
-//    @SaCheckPermission("dict:del")
     public ResponseEntity<Object> deleteDetail(@PathVariable String id){
         dictService.deleteDetail(id);
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java
index 5323312..5c51d5a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java
@@ -31,14 +31,12 @@ public class SysLogController {
     private ISysLogService logService;
     @GetMapping
     @ApiOperation("日志查询")
-    //@SaCheckPermission("@el.check()")
     public ResponseEntity<Object> query(@RequestParam Map criteria, PageQuery pageable){
         criteria.put("log_type","INFO");
         return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK);
     }
 
     @GetMapping(value = "/user")
-    // @ApiOperation("用户日志查询")
     public ResponseEntity<Object> queryUserLog(@RequestParam Map criteria, PageQuery pageable){
         criteria.put("log_type","INFO");
         criteria.put("username", SecurityUtils.getCurrentUsername());
@@ -47,7 +45,6 @@ public class SysLogController {
 
     @GetMapping(value = "/error")
     @ApiOperation("错误日志查询")
-    // @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> queryErrorLog(@RequestParam Map criteria, PageQuery pageable){
         criteria.put("log_type","ERROR");
         return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK);
@@ -55,7 +52,6 @@ public class SysLogController {
 
     @GetMapping(value = "/error/{id}")
     @ApiOperation("日志异常详情查询")
-    // @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> queryErrorLogs(@PathVariable String id){
         return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
     }
@@ -63,7 +59,6 @@ public class SysLogController {
     @DeleteMapping(value = "/del/error")
     @Log("删除所有ERROR日志")
     @ApiOperation("删除所有ERROR日志")
-    // @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> delAllErrorLog(){
         logService.delAllByError();
         return new ResponseEntity<>(HttpStatus.OK);
@@ -72,7 +67,6 @@ public class SysLogController {
     @DeleteMapping(value = "/del/info")
     @Log("删除所有INFO日志")
     @ApiOperation("删除所有INFO日志")
-    //  @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> delAllInfoLog(){
         logService.delAllByInfo();
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java
index 65e23de..c46a0ea 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java
@@ -38,7 +38,6 @@ public class StageController {
     @GetMapping
     @Log("查询舞台")
     @ApiOperation("查询舞台")
-    //@SaCheckPermission("stage:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(stageService.queryAll(whereJson, page)), HttpStatus.OK);
     }
@@ -46,7 +45,6 @@ public class StageController {
     @PostMapping
     @Log("新增舞台")
     @ApiOperation("新增舞台")
-    //@SaCheckPermission("stage:add")
     public ResponseEntity<Object> create(@Validated @RequestBody Stage dto) {
         stageService.create(dto);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -55,7 +53,6 @@ public class StageController {
     @PutMapping
     @Log("修改舞台")
     @ApiOperation("修改舞台")
-    //@SaCheckPermission("stage:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody Stage dto) {
         stageService.update(dto);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -63,7 +60,6 @@ public class StageController {
 
     @Log("删除舞台")
     @ApiOperation("删除舞台")
-    //@SaCheckPermission("stage:del")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         stageService.deleteAll(ids);
@@ -73,7 +69,6 @@ public class StageController {
     @GetMapping("/selectList")
     @Log("下拉选舞台")
     @ApiOperation("下拉选舞台")
-    //@SaCheckPermission("routePlan:list")
     public ResponseEntity<Object> selectList() {
         return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java
index c8e5f2d..dbebc40 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java
@@ -37,7 +37,6 @@ public class StageImageController {
     @GetMapping
     @Log("查询舞台")
     @ApiOperation("查询舞台")
-    //@SaCheckPermission("stageImage:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(stageImageService.queryAll(whereJson, page)), HttpStatus.OK);
     }
@@ -45,7 +44,6 @@ public class StageImageController {
     @PostMapping
     @Log("新增舞台图片")
     @ApiOperation("新增舞台图片")
-    //@SaCheckPermission("stageImage:add")
     public ResponseEntity<Object> create(@Validated @RequestBody StageImage entity) {
         stageImageService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -54,7 +52,6 @@ public class StageImageController {
     @PutMapping
     @Log("修改舞台")
     @ApiOperation("修改舞台")
-    //@SaCheckPermission("stageImage:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody StageImage entity) {
         stageImageService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -62,7 +59,6 @@ public class StageImageController {
 
     @Log("删除舞台")
     @ApiOperation("删除舞台")
-    //@SaCheckPermission("stageImage:del")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         stageImageService.deleteAll(ids);
@@ -72,7 +68,6 @@ public class StageImageController {
     @GetMapping("/selectList")
     @Log("下拉选设备图标")
     @ApiOperation("下拉选设备图标")
-    //@SaCheckPermission("routePlan:list")
     public ResponseEntity<Object> selectList() {
         return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java
index f6f4782..2806cc2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java
@@ -14,6 +14,14 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
+/**
+ * <p>
+ * 日志检索
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "日志检索")
@@ -26,7 +34,6 @@ public class LuceneController {
     @PostMapping("/getAll")
     @Log("日志检索")
     @ApiOperation("日志检索")
-    //@PreAuthorize("@el.check('task:list')")
     public ResponseEntity<Object> get(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(luceneService.getAll(whereJson), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
index 5d63042..109f2e5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
@@ -33,7 +33,6 @@ public class SysNoticeController {
     @GetMapping
     @Log("查询消息通知")
     @ApiOperation("查询消息通知")
-    //@SaCheckPermission("@el.check('sysNotice:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -41,7 +40,6 @@ public class SysNoticeController {
     @PostMapping
     @Log("新增消息通知")
     @ApiOperation("新增消息通知")
-    //@SaCheckPermission("@el.check('sysNotice:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SysNotice entity){
         noticeService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -50,7 +48,6 @@ public class SysNoticeController {
     @PutMapping
     @Log("修改消息通知")
     @ApiOperation("修改消息通知")
-    //@SaCheckPermission("@el.check('sysNotice:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SysNotice entity){
         noticeService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -58,7 +55,6 @@ public class SysNoticeController {
 
     @Log("删除消息通知")
     @ApiOperation("删除消息通知")
-    //@SaCheckPermission("@el.check('sysNotice:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         noticeService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java
index b78ffb0..b4405bb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java
@@ -38,7 +38,6 @@ class SysParamController {
     @GetMapping
     @Log("查询系统参数")
     @ApiOperation("查询系统参数")
-    //@SaCheckPermission("param:list")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK);
     }
@@ -46,7 +45,6 @@ class SysParamController {
     @PostMapping
     @Log("新增系统参数")
     @ApiOperation("新增系统参数")
-    //@SaCheckPermission("param:add")
     public ResponseEntity<Object> create(@Validated @RequestBody Param param){
         paramService.create(param);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -55,7 +53,6 @@ class SysParamController {
     @PutMapping
     @Log("修改系统参数")
     @ApiOperation("修改系统参数")
-    //@SaCheckPermission("param:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody Param param){
         paramService.update(param);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -63,7 +60,6 @@ class SysParamController {
 
     @Log("删除系统参数")
     @ApiOperation("删除系统参数")
-    //@SaCheckPermission("param:del")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         List<String> Ids = Arrays.asList(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
index 4a94366..c092f8a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java
@@ -39,7 +39,6 @@ public class SysDataPermissionController {
     @GetMapping
     @Log("查询数据权限")
     @ApiOperation("查询数据权限")
-    //@SaCheckPermission("@el.check('dataPermission:list')")
     public ResponseEntity<Object> query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK);
     }
@@ -47,7 +46,6 @@ public class SysDataPermissionController {
     @PostMapping
     @Log("新增数据权限")
     @ApiOperation("新增数据权限")
-    //@SaCheckPermission("@el.check('dataPermission:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SysDataPermission permission) {
         dataPermissionService.create(permission);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -56,7 +54,6 @@ public class SysDataPermissionController {
     @PutMapping
     @Log("修改数据权限")
     @ApiOperation("修改数据权限")
-    //@SaCheckPermission("@el.check('dataPermission:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SysDataPermission permission) {
         dataPermissionService.update(permission);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -64,7 +61,6 @@ public class SysDataPermissionController {
 
     @Log("删除数据权限")
     @ApiOperation("删除数据权限")
-    //@SaCheckPermission("@el.check('dataPermission:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         dataPermissionService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
index 183a9f2..71289a5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java
@@ -85,7 +85,9 @@ public class AuthorizationController {
         String uuid = IdUtil.simpleUUID();
         //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型
         String captchaValue = captcha.text();
-        if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(".")) {
+
+        String d = ".";
+        if (captcha.getCharType() - 1 == LoginCodeEnum.arithmetic.ordinal() && captchaValue.contains(d)) {
             captchaValue = captchaValue.split("\\.")[0];
         }
         // 保存
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
index ba80c56..c88e7b8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
@@ -49,13 +49,15 @@ public class MobileAuthorizationController {
     @PostMapping(value = "/login")
     @SaIgnore
     public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+        String salt = "salt";
         // 密码解密 - 前端的加密规则: encrypt（根据实际更改）
         String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword());
         // 校验数据库
         // 根据用户名查询，在比对密码
+        // 拿到多个已经抛出异常
         SysUser userInfo = userService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUsername, authUser.getUsername())); // 拿到多个已经抛出异常
-        if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密
+                .eq(SysUser::getUsername, authUser.getUsername()));
+        if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, salt))) {
             throw new BadRequestException(LangProcess.msg("login_pwd"));
         }
         // 获取权限列表 - 登录查找权限
@@ -74,14 +76,17 @@ public class MobileAuthorizationController {
         user.setPermissions(permissionList);
 
         // SaLoginModel 配置登录相关参数
+        /*
+         * PE: 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
+         * loginInfo: Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
+         */
         StpUtil.login(userInfo.getUser_id(), new SaLoginModel()
-                .setDevice("PE")                // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
-                .setExtra("loginInfo", user)    // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
+                .setDevice("PE")
+                .setExtra("loginInfo", user)
         );
 
         // 返回 token 与 用户信息
         JSONObject jsonObject = new JSONObject();
-//        jsonObject.put("roles", permissionList);
         jsonObject.put("user", userInfo);
         JSONObject authInfo = new JSONObject(2) {{
             put("token", "Bearer " + StpUtil.getTokenValue());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
index 44862f6..019b69e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
@@ -40,7 +40,6 @@ public class ToolLocalStorageController {
 
     @ApiOperation("查询文件")
     @GetMapping
-//    @SaCheckPermission("storage:list")
     public ResponseEntity<Object> query(ToolLocalStorageQuery criteria, PageQuery pageable) {
         return new ResponseEntity<>(TableDataInfo.build(localStorageService.queryAll(criteria, pageable)), HttpStatus.OK);
     }
@@ -48,7 +47,6 @@ public class ToolLocalStorageController {
     @ApiOperation("上传文件")
     @PostMapping
     @SaIgnore
-//    @SaCheckPermission("storage:add")
     public ResponseEntity<Object> create(@RequestParam String name, @RequestParam("file") MultipartFile file) {
         return new ResponseEntity<>(localStorageService.create(name, file), HttpStatus.CREATED);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java
index f48db8f..4893924 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java
@@ -45,21 +45,18 @@ public class OnlineController {
 
     @ApiOperation("查询在线用户")
     @GetMapping
-   // @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> query(String filter, Pageable pageable){
         return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK);
     }
 
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
-   // @SaCheckPermission("@el.check()")
     public void download(HttpServletResponse response, String filter) throws IOException {
         onlineUserService.download(onlineUserService.getAll(filter), response);
     }
 
     @ApiOperation("踢出用户")
     @DeleteMapping
-   // @SaCheckPermission("@el.check()")
     public ResponseEntity<Object> delete(@RequestBody List<OnlineUserDto> keys) throws Exception {
         for (OnlineUserDto key : keys) {
             // 解密Key
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
index f5c4a6f..50a5989 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
@@ -67,7 +67,6 @@ public class UserController {
     @Log("新增用户")
     @ApiOperation("新增用户")
     @PostMapping
-//    @SaCheckPermission("user:add")
     public ResponseEntity<Object> create(@RequestBody Map user){
         userService.create(user);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -76,7 +75,6 @@ public class UserController {
     @Log("修改用户")
     @ApiOperation("修改用户")
     @PutMapping
-//    @SaCheckPermission("user:edit")
     public ResponseEntity<Object> update( @RequestBody Map resources) throws Exception {
         userService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -84,7 +82,6 @@ public class UserController {
 
     @Log("修改用户：个人中心")
     @ApiOperation("修改用户：个人中心")
-//    @PutMapping(value = "center")
     public ResponseEntity<Object> center(@RequestBody SysUser resources){
         if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){
             throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
@@ -96,7 +93,6 @@ public class UserController {
     @Log("删除用户")
     @ApiOperation("删除用户")
     @DeleteMapping
-//    @SaCheckPermission("user:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         userService.removeByIds(ids);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -139,9 +135,4 @@ public class UserController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    /**
-     * 如果当前用户的角色级别低于创建用户的角色级别，则抛出权限不足的错误
-     * @param resources /
-     */
-
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
index f595798..53e2061 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java
@@ -19,8 +19,18 @@ import java.util.Map;
  */
 public interface ISysCodeRuleDetailService extends IService<SysCodeRuleDetail> {
 
+    /**
+     * 分页查询
+     * @param form 查询条件
+     * @param pageable 工具列
+     * @return IPage<SysCodeRuleDetail>
+     */
     IPage<SysCodeRuleDetail> queryAll(CodeRuleDetailQuery form, PageQuery pageable);
 
+    /**
+     * 创建
+     * @param codeRuleDetail 实体类
+     */
     void create(SysCodeRuleDetail codeRuleDetail);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
index 938e712..3bad5e4 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
@@ -58,7 +58,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
     }
 
     @Override
-    @Transactional(propagation=Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class)
     public String codeDemo(Map form) {
         String code = (String) form.get("code");
         String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java
index 939d2ea..c36c6d0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/utils/CodeRuleTypeEnum.java
@@ -11,8 +11,11 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum CodeRuleTypeEnum {
+    // 固定
     FIXED("01", "固定"),
+    // 日期"
     DATE("02", "日期"),
+    // 顺序
     ORDER("03", "顺序");
 
     private final String type;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
index 8d159d8..2670a43 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java
@@ -49,6 +49,11 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param deptIds
      */
     void saveUserDeptRelation(String UserId, Collection<String> deptIds);
+
+    /**
+     * 删除
+     * @param user 标识
+     */
     void delUserDeptRelation(String user);
 
     /**
@@ -63,8 +68,17 @@ public interface ISysDeptService extends IService<SysDept> {
      */
     void delateDept(Set<String> deptIds);
 
+    /**
+     * 创建
+     * @param dept 实体类
+     */
     void createDept(SysDept dept);
 
+    /**
+     * 获取部门
+     * @param userId 标识
+     * @return List<SysDept> 部门集合
+     */
     List<SysDept> getUserDeptByUserId(String userId);
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
index 33ce82b..d6c01e1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java
@@ -24,14 +24,24 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      * @param deptId
      */
     void saveDeptRelation(@Param("user") String UserId,@Param("depts") Collection<String> deptId);
+
+    /**
+     * 删除
+     * @param UserId 标识
+     */
     void delDeptRelation(@Param("user") String UserId);
 
+    /**
+     * 获取部门
+     * @param deptIds
+     * @return List<Map>
+     */
     List<Map> getDeptRelation(@Param("deptIds") Collection<String> deptIds);
 
     /**
      * 跟新sub_count字段
      * @param deptId
-     * @return
+     * @return int 数字
      */
     int updateSubCount(String deptId);
 
@@ -42,5 +52,10 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
      */
     String findAllChild(String pid);
 
+    /**
+     * 根据id获取
+     * @param userId 标识
+     * @return List<SysDept> 实体类集合
+     */
     List<SysDept> getUserDeptByUserId(String userId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java
index 51854f0..dadd46e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java
@@ -8,7 +8,8 @@ import org.nl.system.service.dept.dao.SysDept;
 
 import java.util.List;
 
-/*
+/**
+ * 查询条件
  * @author ZZQ
  * @Date 2022/12/15 4:20 下午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java
index ee1fd9f..2b10b25 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java
@@ -26,7 +26,9 @@ public interface ICodeGeneratorService extends IService<CodeColumnConfig> {
 
     /**
      * 获得所有的表格信息
-     * @return
+     * @param name
+     * @param pageQuery
+     * @return IPage<TablesInfo>
      */
     IPage<TablesInfo> getTables(String name, PageQuery pageQuery);
 
@@ -52,6 +54,12 @@ public interface ICodeGeneratorService extends IService<CodeColumnConfig> {
     @Async
     void sync(IPage<CodeColumnConfig> columnInfos, List<CodeColumnConfig> columnInfoList);
 
+    /**
+     * 视图
+     * @param byTableName
+     * @param columns
+     * @return ResponseEntity<Object>
+     */
     ResponseEntity<Object> preview(CodeGenConfig byTableName, IPage<CodeColumnConfig> columns);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java
index fa9f5c5..b220616 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java
@@ -73,7 +73,12 @@ public class CodeColumnConfig implements Serializable {
     @ApiModelProperty(value = "日期注解")
     private String date_annotation;
 
-    // 创建默认的实体
+    /**
+     * 创建默认的实体
+     * @param tableName /
+     * @param config /
+     * @return CodeColumnConfig
+     */
     public static CodeColumnConfig createDefault(String tableName, ColumnInfo config) {
         CodeColumnConfig columnConfig = new CodeColumnConfig();
         columnConfig.setColumn_id(IdUtil.getSnowflake(1,1).nextIdStr());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
index c1306b6..ace02fd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java
@@ -19,17 +19,24 @@ public interface CodeColumnConfigMapper extends BaseMapper<CodeColumnConfig> {
 
     /**
      * 分页查找
-     * @param name
-     * @return
+     * @param name /
+     * @param pageSize /
+     * @param offset /
+     * @return List<TablesInfo>
      */
     List<TablesInfo> getTables(String name, int pageSize, int offset);
 
     /**
      * 分页查询的总数
      * @param name
-     * @return
+     * @return long
      */
     long getTablesTotal(String name);
 
+    /**
+     * 获取字段名称
+     * @param tableName
+     * @return List<ColumnInfo>
+     */
     List<ColumnInfo> getTablesByTableName(String tableName);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java
index cd2f571..e5c6837 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java
@@ -4,6 +4,14 @@ import org.nl.system.service.lucene.dto.LuceneLogDto;
 
 import java.io.IOException;
 
+/**
+ * <p>
+ * 日志检索服务
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public interface LuceneExecuteLogService {
     /**
      * 设备光电变化实时光电信号
@@ -23,8 +31,8 @@ public interface LuceneExecuteLogService {
 
     /**
      * 接口日志,会保留历史记录
-     *
-     * @param luceneLogDto  日志结果对象
+     * @param luceneLogDto 日志结果对象
+     * @throws IOException
      */
     void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java
index 4bb3565..ee4e0e8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java
@@ -1,12 +1,17 @@
 package org.nl.system.service.lucene;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.data.domain.Pageable;
 
 import java.util.Map;
 
-
+/**
+ * <p>
+ * 、
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public interface LuceneService {
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java
index 7cda043..c2534f1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java
@@ -5,71 +5,101 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * <p>
+ * 日志DTO
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class LuceneLogDto {
 
-    /* 日志标识 */
+    /**
+     * 日志标识
+     */
     private String log_uuid;
-    /*日志类型*/
+    /**
+     * 日志类型
+     */
     private String logType;
-    /*设备编号*/
+    /**
+     * 设备编号
+     */
     private String device_code;
-    /*内容详情*/
+    /**
+     * 内容详情
+     */
     private String content;
-
-    /* 任务编码 */
+    /**
+     * 任务编码
+     */
     private String task_code;
-
-    /* 指令编码 */
+    /**
+     * 指令编码
+     */
     private String instruct_code;
-
-    /* 任务标识 */
+    /**
+     * 任务标识
+     */
     private String task_id;
-
-    /* 载具号 */
+    /**
+     * 载具号
+     */
     private String vehicle_code;
-
-    /* 备注 */
+    /**
+     * 备注
+     */
     private String remark;
-
-    /* 日志类型 */
+    /**
+     * 日志类型
+     */
     private String log_type;
-
-    /* 方法 */
+    /**
+     * 方法
+     */
     private String method;
-
-    /* 请求参数 */
+    /**
+     * 请求参数
+     */
     private String requestparam;
-
-    /* 响应参数 */
+    /**
+     * 响应参数
+     */
     private String responseparam;
-
-    /* 请求地址 */
+    /**
+     * 请求地址
+     */
     private String requesturl;
-
-    /* 状态码 */
+    /**
+     * 状态码
+     */
     private String status_code;
-
-    /* 是否删除 1:是；0：否 */
+    /**
+     * 是否删除 1:是；0：否
+     */
     private String is_delete;
-
-    /* 创建者 */
+    /**
+     * 创建者
+     */
     private String create_by;
-
-    /* 创建时间  YYYY-MM-DD hh:mm:ss */
+    /**
+     * 创建时间  YYYY-MM-DD hh:mm:ss
+     */
     private String create_time;
-
-    /* 修改者 */
+    /**
+     * 修改者
+     */
     private String update_by;
-
-    /* 修改时间 */
+    /**
+     * 修改时间
+     */
     private String update_time;
 
-
-
     public LuceneLogDto (final String opc_server_code,final String opc_plc_code,
                          final String device_code,final String to_home,final int last_home,
                          final int home) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java
index 0f5deac..2c04946 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java
@@ -32,7 +32,9 @@ import java.io.IOException;
 @Slf4j
 public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
 
-    //日志目录
+    /**
+     * 日志目录
+     */
     @Value("${logging.file.path}")
     private  String logPath;
 
@@ -64,7 +66,6 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
             //向document对象中添加域。
             if (ObjectUtil.isNotEmpty(luceneLogDto.getDevice_code())) {
                 document.add(new StringField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES));
-//        document.add(new TextField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES));
             }
             if (ObjectUtil.isNotEmpty(luceneLogDto.getContent())) {
                 document.add(new StringField("fieldContent", luceneLogDto.getContent(), Field.Store.YES));
@@ -90,7 +91,6 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
             //实现日志文件按业务独立生成日志文件到指定路径
             DynamicLogger loggerBuilder =new DynamicLogger(logPath+"\\"+luceneLogDto.getLogType()+"\\");
             Logger logger = loggerBuilder.getLogger(luceneLogDto.getDevice_code());
-//      logger.info("设备{}建立索引共耗时{}毫秒",luceneLogDto.getDevice_code(),endTime-startTime);
             logger.info("{}",luceneLogDto.toString());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java
index 1cbace2..eb76d20 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java
@@ -1,7 +1,5 @@
 package org.nl.system.service.lucene.impl;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -10,18 +8,25 @@ import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.Searcher;
 import org.nl.system.service.lucene.LuceneService;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
-
-
+/**
+ * <p>
+ * 、
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class LuceneServiceImpl implements LuceneService {
 
-    //日志索引目录
+    /**
+     * 日志索引目录
+     */
     @Value("${lucene.index.path}")
     private  String luceneUrl;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
index b672ea4..122f786 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java
@@ -98,7 +98,11 @@ public interface ISysMenuService extends IService<SysMenu> {
      */
     void update(SysMenu menu);
 
-
+    /**
+     * 根据id查询
+     * @param userId 标识
+     * @return List<MenuDto> 菜单集合
+     */
     List<MenuDto> findByUser(String userId);
 
     /**
@@ -108,13 +112,24 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @return /
      */
     List<MenuVo> buildMenus(List<MenuDto> menuDtos);
+
+    /**
+     * 获取菜单父级
+     * @param menuDtos 、
+     * @param pid 父级id
+     * @return List<MenuVo> 菜单集合
+     */
     List<MenuVo> buildMenus(List<MenuDto> menuDtos,String pid);
 
+    /**
+     * 获取菜单
+     * @param systemType /
+     * @return List<MenuVo> 菜单集合
+     */
     List<MenuVo> buildMenus(String systemType);
 
     /**
      * 构建菜单树
-     *
      * @param menuDtos 原始数据
      * @return /
      */
@@ -122,18 +137,25 @@ public interface ISysMenuService extends IService<SysMenu> {
 
     /**
      * 懒加载菜单数据
-     *
      * @param pid /
      * @return /
      */
     List<SysMenu> getMenus(String pid);
 
     /**
+     * s
      * @param sysMenu
      * @return
      */
     MenuDto doToDto(SysMenu sysMenu);
 
+    /**
+     * 根据roleId获取
+     * @param roleId /
+     * @param systemType /
+     * @param category /
+     * @return List<Map> 集合
+     */
     List<Map> getMenusByRole(String roleId, String systemType, String category);
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
index 7964cb9..3d7cafc 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
@@ -18,9 +18,19 @@ import java.util.Map;
  * @since 2022-12-15
  */
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+    /**
+     * 查询菜单
+     * @return List<SysMenu>
+     */
     @Select("select * from sys_menu where (pid is null or pid = '' or pid = 0 )")
     List<SysMenu> findByPidIsNull();
 
+    /**
+     * 根据父级id查询
+     * @param pid 父级id
+     * @return List<SysMenu>
+     */
     @Select("select * from sys_menu  where pid = #{pid}")
     List<SysMenu> findByPid(@Param("pid") String pid);
 
@@ -56,7 +66,18 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
     @Delete(value = "delete from sys_roles_menus where menu_id = #{menuId}")
     void untiedMenu(String menuId);
 
+    /**
+     * 获取菜单路由
+     * @param systemType /
+     * @param category /
+     * @return List<Map>
+     */
     List<Map> getMenusByRole(@Param("systemType") String systemType, @Param("category")String category);
 
+    /**
+     * 获取父级id
+     * @param pid
+     * @return /
+     */
     String findAllChild(String pid);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
index 4a6c785..34e5d17 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
@@ -22,6 +22,14 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * <p>
+ * 菜单Dto
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Data
 public class MenuDto extends BaseDTO implements Serializable {
 
@@ -95,13 +103,17 @@ public class MenuDto extends BaseDTO implements Serializable {
     }
 
     public String getLocalTitle(String local){
-        if ("in".equals(local)){
+        String in = "in";
+        String en = "en";
+        String zh = "zh";
+
+        if (in.equals(local)){
             return in_title;
         }
-        if ("en".equals(local)){
+        if (en.equals(local)){
             return en_title;
         }
-        if ("zh".equals(local)){
+        if (zh.equals(local)){
             return zh_title;
         }
         return title;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
index e4b2bf6..b6a5223 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -193,7 +193,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public void update(SysMenu resources) {
         String menuId = resources.getMenu_id();
         SysMenu menu = baseMapper.selectById(menuId);
-        String allChild = baseMapper.findAllChild(menuId); // 获取当前菜单的所有子菜单
+        // 获取当前菜单的所有子菜单
+        String allChild = baseMapper.findAllChild(menuId);
         List<String> allChildIds = ObjectUtil.isNotEmpty(allChild)?Arrays.asList(allChild.split(",")):null;
         if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())){
             throw new BadRequestException(LangProcess.msg("login_childError"));
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java
index 0028e78..50ce767 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java
@@ -46,30 +46,31 @@ public interface ISysNoticeService extends IService<SysNotice> {
 
     /**
      * 获取未读的接收消息条数
+     * @return Integer 数字
      */
     Integer countByReceiveNotRead();
 
     /**
      * 获取不同类型的前三条信息
-     * @return
+     * @return LinkedList<List<SysNotice>>
      */
     LinkedList<List<SysNotice>> pageByReceive();
 
     /**
      * 标记已读
-     * @param id
+     * @param id 、
      */
     void read(String id);
 
     /**
      * 处理信息
-     * @param id
+     * @param id 、
      */
     void deal(String id);
 
     /**
      * 批量已读
-     * @param jsonObject
+     * @param jsonObject 、
      */
     void changeRead(JSONObject jsonObject);
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
index a2050c8..0f58aa0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
@@ -161,7 +161,6 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
 
     @Override
     public void createNotice(String msg, String title, String type) {
-//        log.info("创建消息通知-信息：{}, 标题：{}, 类型：{}", msg, title, type);
         // 获取标题相同的信息
         List<SysNotice> sysNotices = sysNoticeMapper.selectList(new LambdaQueryWrapper<SysNotice>()
                 .eq(SysNotice::getNotice_title, title)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
index 58bf417..cbe544a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java
@@ -33,34 +33,39 @@ public interface ISysDataPermissionService extends IService<SysDataPermission> {
 
     /**
      * 新增数据权限
-     * @param dto
+     * @param permission 实体类
      */
     void create(SysDataPermission permission);
 
     /**
      * 修改
-     * @param permission
+     * @param permission 实体类
      */
     void update(SysDataPermission permission);
 
     /**
      * 批量删除
-     * @param ids
+     * @param ids 唯一id
      */
     void deleteAll(Set<String> ids);
 
     /**
-     *
-     * @return
+     * 获取类型
+     * @return List<Dict>
      */
     List<Dict> getDataScopeType();
 
     /**
      * 获取数据权限下拉框
-     * @return
+     * @return List<SysDataPermission>
      */
     List<SysDataPermission> getDataPermissionOption();
 
+    /**
+     *  获取所有数据
+     * @param id 标识
+     * @return List<UserDataPermissionDto> 实体类集合
+     */
     List<UserDataPermissionDto> getDataShow(String id);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
index 0312e64..aa721d1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java
@@ -17,15 +17,45 @@ import java.util.List;
  */
 public interface SysDataPermissionMapper extends BaseMapper<SysDataPermission> {
 
+    /**
+     * 查询
+     * @param userId 、
+     * @param permissionScopeType 、
+     * @return List<String>
+     */
     List<String> findDataScopeUserIdBySelfUserIdAndScopeType(String userId, String permissionScopeType);
 
+    /**
+     * 查询
+     * @param userId 、
+     * @param permissionScopeType 、
+     * @return List<String>
+     */
     List<String> findDataScopeDeptIdBySelfUserIdAndScopeType(String userId, String permissionScopeType);
 
+    /**
+     * 删除
+     * @param userId 标识
+     */
     void deleteScopeBySelfUserId(String userId);
 
+    /**
+     * 插入
+     * @param dataScope 、
+     */
     void insertDataScope(@Param("dataScope") SysDataScope dataScope);
 
+    /**
+     * 插入
+     * @param dataScope 、
+     */
     void insertDataScopes(@Param("dataScope") SysDataScope dataScope);
 
+    /**
+     * 获取明细
+     * @param selfUserId 、
+     * @param permissionScopeType 、
+     * @return List<SysDataScope>
+     */
     List<SysDataScope> getDataDetail(String selfUserId, String permissionScopeType);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java
index 9cd2300..12c1521 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dto/DataScopeEnum.java
@@ -12,8 +12,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DataScopeEnum {
 
+    // 用户数据权限
     USER("user", "用户数据权限"),
+    // 部门数据权限
     DEPT("dept", "部门数据权限"),
+    // 自身数据权限
     SELF("self", "自身数据权限");
     private final String code;
     private final String name;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
index 336bddc..fa6cf1d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -142,7 +142,8 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
             // 保存用户数据权限
             userService.insertDataPermission(userDataPermissionDto);
             JSONArray users = scopeObj.getJSONArray("users");
-            if (ObjectUtil.isNotEmpty(users)) { // 如果是用户直接将用户的id绑定进去
+            // 如果是用户直接将用户的id绑定进去
+            if (ObjectUtil.isNotEmpty(users)) {
                 for (int j = 0; j < users.size(); j++) {
                     JSONObject user = users.getJSONObject(j);
                     String userId = user.getString("user_id");
@@ -154,7 +155,8 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
                 }
             }
             JSONArray depts = scopeObj.getJSONArray("depts");
-            if (ObjectUtil.isNotEmpty(depts)) { // 如果是部门，先根据部门id求出所有的用户id
+            // 如果是部门，先根据部门id求出所有的用户id
+            if (ObjectUtil.isNotEmpty(depts)) {
                 for (int j = 0; j < depts.size(); j++) {
                     JSONObject dept = depts.getJSONObject(j);
                     String dept_id = dept.getString("dept_id");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java
index 9914203..0f71295 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/ISysQuartzJobService.java
@@ -67,11 +67,16 @@ public interface ISysQuartzJobService extends IService<SysQuartzJob> {
      */
     void deleteJob(Set<String> ids);
 
+    /**
+     * 执行任务
+     * @param tasks 标识
+     * @throws InterruptedException
+     */
     void executionSubJob(String[] tasks) throws InterruptedException;
 
     /**
      * 查找已启动的任务
-     * @return
+     * @return List<SysQuartzJob>
      */
     List<SysQuartzJob> findByIsPauseIsFalse();
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
index a712005..8c3328d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
@@ -13,6 +13,14 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
+/**
+ * <p>
+ * 项目启动时重新激活启用的定时任务
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Component
 @RequiredArgsConstructor
 @Order(100)
@@ -28,9 +36,5 @@ public class JobRunner implements ApplicationRunner {
      */
     @Override
     public void run(ApplicationArguments applicationArguments) {
-        log.info("--------------------注入定时任务---------------------");
-//        List<SysQuartzJob> quartzJobs = quartzJobService.findByIsPauseIsFalse();
-//        quartzJobs.forEach(quartzManage::addJob);
-        log.info("--------------------定时任务注入完成---------------------");
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java
index 6d8b526..c4c49a5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearInteractionData.java
@@ -22,7 +22,6 @@ public class AutoClearInteractionData {
     public void run(){
         Param max_rows_to_keep = paramService.findByCode("max_rows_to_keep");
         Param max_rows_to_delete = paramService.findByCode("max_rows_to_delete");
-//        recordService.deleteByDay(interactionDay.getValue());
         recordService.deleteByRows(max_rows_to_keep, max_rows_to_delete);
         log.info("run 执行成功");
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java
index 65ce2b2..c4c0c43 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoClearLuceneData.java
@@ -37,7 +37,8 @@ public class AutoClearLuceneData {
         // 获取时间戳
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
         Date date = dateFormat.parse(String.valueOf(sevenDaysAgo));
-        long unixTimestamp = date.getTime(); // 获取Unix时间戳
+        // 获取Unix时间戳
+        long unixTimestamp = date.getTime();
         Query query = LongPoint.newRangeQuery("time", 0L, unixTimestamp);
         writer.deleteDocuments(query);
         writer.commit();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java
index 55f7fbb..5312027 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyDefine.java
@@ -18,7 +18,7 @@ public class RedisKeyDefine {
     @Getter
     @AllArgsConstructor
     public enum KeyTypeEnum {
-
+        //
         STRING("String"),
         LIST("List"),
         HASH("Hash"),
@@ -38,10 +38,12 @@ public class RedisKeyDefine {
     @Getter
     @AllArgsConstructor
     public enum TimeoutTypeEnum {
-
-        FOREVER(1), // 永不超时
-        DYNAMIC(2), // 动态超时
-        FIXED(3); // 固定超时
+        // 永不超时
+        FOREVER(1),
+        // 动态超时
+        DYNAMIC(2),
+        // 固定超时
+        FIXED(3);
 
         /**
          * 类型
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java
index 3b45c1d..38618a6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/dao/RedisKeyRegistry.java
@@ -12,17 +12,17 @@ public class RedisKeyRegistry {
     /**
      * Redis RedisKeyDefine 数组
      */
-    private static final List<RedisKeyDefine> defines = new ArrayList<>();
+    private static final List<RedisKeyDefine> DE_FINES = new ArrayList<>();
 
     public static void add(RedisKeyDefine define) {
-        defines.add(define);
+        DE_FINES.add(define);
     }
 
     public static List<RedisKeyDefine> list() {
-        return defines;
+        return DE_FINES;
     }
 
     public static int size() {
-        return defines.size();
+        return DE_FINES.size();
     }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
index 3f681ef..da31d72 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/impl/RedisServiceImpl.java
@@ -35,7 +35,8 @@ public class RedisServiceImpl implements RedisService {
         Long dbSize = stringRedisTemplate.execute(RedisServerCommands::dbSize);
         Properties commandStats = stringRedisTemplate.execute((
                 RedisCallback<Properties>) connection -> connection.info("commandstats"));
-        assert commandStats != null; // 断言，避免警告
+        // 断言，避免警告
+        assert commandStats != null;
         // 拼接结果返回
         // 转成实体
         JSONObject json = new JSONObject();
@@ -45,9 +46,7 @@ public class RedisServiceImpl implements RedisService {
 
     @Override
     public JSONObject getKeyDefineList() {
-//        List<RedisKeyDefine> keyDefines = RedisKeyRegistry.list();
         JSONObject json = new JSONObject();
-//        json.put("info", RedisConvert.INSTANCE.convertList(keyDefines));
         return json;
     }
 
@@ -60,9 +59,12 @@ public class RedisServiceImpl implements RedisService {
         while ( it.hasNext() ) {
             String key = it.next();
             JSONObject redis = new JSONObject();
-            DataType dataType = stringRedisTemplate.type(key); // 数据类型
-            String s = stringRedisTemplate.opsForValue().get(key); // 获取值
-            Long expire = stringRedisTemplate.getExpire(key); // 获取剩余时间
+            // 数据类型
+            DataType dataType = stringRedisTemplate.type(key);
+            // 获取值
+            String s = stringRedisTemplate.opsForValue().get(key);
+            // 获取剩余时间
+            Long expire = stringRedisTemplate.getExpire(key);
             redis.put("dataType", dataType);
             redis.put("key", key);
             redis.put("value", s);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
index 4570764..9ad24b9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/ISysRoleService.java
@@ -20,6 +20,12 @@ import java.util.Set;
  */
 public interface ISysRoleService extends IService<SysRole> {
 
+    /**
+     * 分页查询
+     * @param param 查询条件
+     * @param page 分页工具
+     * @return IPage<SysRole> 实体类集合
+     */
     IPage<SysRole> query(Map param, PageQuery page);
 
     /**
@@ -60,5 +66,10 @@ public interface ISysRoleService extends IService<SysRole> {
      * @param deptIds
      */
     void saveUserRoleRelation(String UserId, List<String> deptIds);
+
+    /**
+     * 删除
+     * @param UserId 标识
+     */
     void delUserRoleRelation(String UserId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java
index 0832339..dd106db 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/mapper/SysRoleMapper.java
@@ -17,11 +17,30 @@ import java.util.List;
  */
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
+    /**
+     * 保存路由
+     * @param UserId /
+     * @param roles /
+     */
     void saveRoleRelation(@Param("user") String UserId, @Param("roles") Collection<String> roles);
+
+    /**
+     * 删除路由
+     * @param UserId /
+     */
     void delRoleRelation(@Param("user") String UserId);
 
+    /**
+     * 删除菜单
+     * @param ids /
+     */
     void deleteRoleMenuBatchRoleIds(Collection<String> ids);
 
+    /**
+     * 查询菜单
+     * @param roleId /
+     * @return List<String>
+     */
     List<String> selectMenuIdsByRoles(String roleId);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
index 4ace7f6..e86d31c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
@@ -140,8 +140,8 @@ public class OnlineUserService {
         if (ObjectUtil.isNotEmpty(one)) {
             redisUtils.del("oline-" + one.getUsername());
         }
-        // 下线
-        StpUtil.logoutByTokenValue(key.getKey()); // 通过token强退
+        // 通过token强退
+        StpUtil.logoutByTokenValue(key.getKey());
     }
 
     /**
@@ -150,8 +150,8 @@ public class OnlineUserService {
      */
     public void kickOut(String key) {
         redisUtils.del(key);
-        // 下线
-        StpUtil.logoutByTokenValue(key); // 通过token强退
+        // 通过token强退
+        StpUtil.logoutByTokenValue(key);
     }
 
     /**
@@ -246,10 +246,15 @@ public class OnlineUserService {
         if (StrUtil.isEmpty(authUser.getCode()) || !authUser.getCode().equalsIgnoreCase(code)) {
             throw new BadRequestException(LangProcess.msg("login_CodeError"));
         }
-        // 校验数据库
-        // 根据用户名查询，在比对密码
+
+        /*
+         * 校验数据库
+         * username:根据用户名查询，在比对密码
+         * SaSecureUtil.md5BySalt(password, "salt"): 这里需要密码加密
+         */
+        String salt = "salt";
         SysUser userInfo = sysUserService.getOne(new QueryWrapper<SysUser>().eq("username",authUser.getUsername()));
-        if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密
+        if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, salt))) {
             throw new BadRequestException(LangProcess.msg("login_pwd"));
         }
 
@@ -269,10 +274,14 @@ public class OnlineUserService {
         user.setUser(userInfo);
         user.setPermissions(permissionList);
 
-        // SaLoginModel 配置登录相关参数
+        /*
+         * SaLoginModel 配置登录相关参数
+         * PC: 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
+         * loginInfo: Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
+         */
         StpUtil.login(userInfo.getUser_id(), new SaLoginModel()
-                .setDevice("PC")                // 此次登录的客户端设备类型, 用于[同端互斥登录]时指定此次登录的设备类型
-                .setExtra("loginInfo", user)    // Token挂载的扩展参数 （此方法只有在集成jwt插件时才会生效）
+                .setDevice("PC")
+                .setExtra("loginInfo", user)
         );
 
         // 返回 token 与 用户信息
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java
index 200b222..2c428a3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java
@@ -20,6 +20,12 @@ import java.util.Set;
  */
 public interface IToolLocalStorageService extends IService<ToolLocalStorage> {
 
+    /**
+     * 分页查询
+     * @param criteria 查询条件
+     * @param pageable 分页工具
+     * @return IPage<ToolLocalStorage>
+     */
     IPage<ToolLocalStorage> queryAll(ToolLocalStorageQuery criteria, PageQuery pageable);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
index 26ebead..3c76802 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/ISysUserService.java
@@ -21,20 +21,63 @@ import java.util.Map;
  */
 public interface ISysUserService extends IService<SysUser> {
 
+    /**
+     * 是否启用
+     * @param avatar 、
+     * @return Map<String, String>
+     */
     Map<String, String> updateAvatar(MultipartFile avatar);
 
+    /**
+     * 分页查询
+     * @param query 查询条件
+     * @param pageQuery 分页工具
+     * @return List<SysUserDetail> 实体类集合
+     */
     List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
 
+    /**
+     * 创建
+     * @param userDetail 实体类
+     */
     void create(Map userDetail);
 
+    /**
+     * 修改
+     * @param userDetail 实体类
+     */
     void update(Map userDetail);
 
+    /**
+     * 根据permissionId查询
+     * @param permissionId 查询条件
+     * @return  List<UserDataPermissionDto> 实体类集合
+     */
     List<UserDataPermissionDto> getUserDataPermissionByPermissionId(String permissionId);
+
+    /**
+     * 根据userId 查找
+     * @param userId 条件
+     * @return List<UserDataPermissionDto> 实体类集合
+     */
     List<UserDataPermissionDto> getUserDataPermissionByUserId(String userId);
 
+    /**
+     * 根据id删除
+     * @param userId 条件
+     */
     void deleteDataPermissionById(String userId);
 
+    /**
+     * 创建
+     * @param userDataPermissionDto 实体类
+     */
     void insertDataPermission(UserDataPermissionDto userDataPermissionDto);
 
+    /**
+     * 根据deptId获取
+     * @param deptId 部门id
+     * @return List<String>
+     */
     List<String> getUserIdByDeptId(String deptId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
index 032de9e..2effc52 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
@@ -22,17 +22,52 @@ import java.util.Map;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    /**
+     * 分页查询
+     * @param query 查询条件
+     * @param page 分页工具
+     * @return List<SysUserDetail> 实体类集合
+     */
     List<SysUserDetail> getUserDetail(@Param("query") UserQuery query, @Param("page")PageQuery page);
 
+    /**
+     * 分页查询
+     * @param query 查询条件
+     * @param page 分页工具
+     * @return List<Map<String,Object>>
+     */
     List<Map<String,Object>> getDetailForMap(@Param("query") UserQuery query, @Param("page")PageQuery page);
 
+    /**
+     * 根据permissionId查询
+     * @param permissionId 、
+     * @return List<UserDataPermissionDto> 实体类集合
+     */
     List<UserDataPermissionDto> getUserDataPermissionByPermissionId(String permissionId);
 
+    /**
+     * 根据userId查询
+     * @param userId /
+     * @return List<UserDataPermissionDto> 实体类集合
+     */
     List<UserDataPermissionDto> getUserDataPermissionByUserId(String userId);
 
+    /**
+     * 根据id删除
+     * @param userId /
+     */
     void deleteDataPermissionById(String userId);
 
+    /**
+     * 插入
+     * @param dataPermission 实体类
+     */
     void insertDataPermission(@Param("dataPermission") UserDataPermissionDto dataPermission);
 
+    /**
+     * 根据部门id查询
+     * @param deptId 部门id
+     * @return List<String>
+     */
     List<String> getUserIdByDeptId(String deptId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
index fe219e3..5ec1c0b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
@@ -1,6 +1,5 @@
 package org.nl.system.service.user.dto;
 
-import cn.hutool.core.util.IdUtil;
 import lombok.Data;
 import org.nl.system.service.dept.dao.SysDept;
 import org.nl.system.service.role.dao.SysRole;
@@ -8,7 +7,8 @@ import org.nl.system.service.user.dao.SysUser;
 
 import java.util.List;
 
-/*
+/**
+ * s
  * @author ZZQ
  * @Date 2022/12/16 10:02 上午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
index b344dfd..1d5dbc0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
@@ -6,7 +6,8 @@ import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
 import org.nl.system.service.user.dao.SysUser;
 
-/*
+/**
+ * 条件
  * @author ZZQ
  * @Date 2022/12/15 9:53 上午
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
index 35bf732..9f025f6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java
@@ -97,7 +97,7 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void update(Map userDetail) {
         if(CollectionUtils.isEmpty(userDetail) || ObjectUtil.isEmpty(userDetail.get("user_id"))){
             return;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/LanguageTest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/LanguageTest.java
deleted file mode 100644
index 64ea24e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/LanguageTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.nl.wms;
-
-/*
- * @author ZZQ
- * @Date 2023/11/13 10:10
- */
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import org.nl.config.language.LangProcess;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/langest")
-public class LanguageTest {
-
-    @GetMapping("/code")
-    @SaIgnore
-    public String language(String code){
-        return LangProcess.msg(code,"");
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
index 9b8acf9..aa98321 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
@@ -34,7 +34,6 @@ public class MdBaseClassstandardController {
     @GetMapping
     @Log("查询基础分类")
     @ApiOperation("查询基础分类")
-    //@SaCheckPermission("@el.check('mdBaseClassstandard:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -42,7 +41,6 @@ public class MdBaseClassstandardController {
     @PostMapping
     @Log("新增基础分类")
     @ApiOperation("新增基础分类")
-    //@SaCheckPermission("@el.check('mdBaseClassstandard:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody MdBaseClassstandard entity){
         mdBaseClassstandardService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -51,7 +49,6 @@ public class MdBaseClassstandardController {
     @PutMapping
     @Log("修改基础分类")
     @ApiOperation("修改基础分类")
-    //@SaCheckPermission("@el.check('mdBaseClassstandard:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody MdBaseClassstandard entity){
         mdBaseClassstandardService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -59,7 +56,6 @@ public class MdBaseClassstandardController {
 
     @Log("删除基础分类")
     @ApiOperation("删除基础分类")
-    //@SaCheckPermission("@el.check('mdBaseClassstandard:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody List<String> ids) {
         mdBaseClassstandardService.deleteAll(ids);
@@ -76,14 +72,12 @@ public class MdBaseClassstandardController {
     @GetMapping("/loadClass")
     @Log("查询基础类型")
     @ApiOperation("查询基础类型")
-    //@PreAuthorize("@el.check('materialtype:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson) {
         return new ResponseEntity<>(mdBaseClassstandardService.loadClass(whereJson), HttpStatus.OK);
     }
 
     @ApiOperation("查询类别:根据ID获取同级与上级数据")
     @PostMapping("/superior")
-    //@PreAuthorize("@el.check('user:list','dept:list')")
     public ResponseEntity<Object> getSuperior(@RequestBody String id) {
         MdBaseClassstandard classstandard = mdBaseClassstandardService.getById(id);
         ArrayList<MdBaseClassstandard> list = mdBaseClassstandardService.getSuperior(classstandard, new ArrayList<>());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
index 7081151..5779f4c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
@@ -56,7 +56,7 @@ public interface IMdBaseClassstandardService extends IService<MdBaseClassstandar
     List<MdBaseClassstandard> loadClass(Map whereJson);
 
     /**
-     *
+     * 获取父级树
      * @param classstandard
      * @param objects
      * @return
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
index 6480312..49f05d7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
@@ -16,6 +16,7 @@ import org.nl.wms.database.classification.service.IMdBaseClassstandardService;
 import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
 import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper;
 import org.nl.wms.database.classification.service.dto.MdBaseClassstandardTrees;
+import org.nl.wms.storage_manage.ios.enums.IOSEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,14 +52,14 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
         IPage<MdBaseClassstandard> pages = new Page<>(page.getPage() + 1, page.getSize());
         mdBaseClassstandardMapper.selectPage(pages, lam);
         pages.getRecords().forEach(classstandard -> {
-            classstandard.setIs_leaf(!(classstandard.getSub_count() > 0));
+            classstandard.setIs_leaf((classstandard.getSub_count() <= 0));
             classstandard.setHasChildren(classstandard.getSub_count() > 0);
         });
         return pages;
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void create(MdBaseClassstandard entity) {
         // 判断是否存在
         MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
@@ -85,7 +86,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
         entity.setSub_count(0);
         mdBaseClassstandardMapper.insert(entity);
         // 更新节点
-        if (ObjectUtil.isNotEmpty(entity.getParent_class_id()) && !entity.getParent_class_id().equals("0")) {
+        if (ObjectUtil.isNotEmpty(entity.getParent_class_id()) && !entity.getParent_class_id().equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             updateSubCnt(entity.getParent_class_id());
         }
     }
@@ -103,8 +104,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
 
     @Override
     public void update(MdBaseClassstandard entity) {
+        String errorSystemAuthError = "error_SystemAuthError";
         MdBaseClassstandard dto = mdBaseClassstandardMapper.selectById(entity.getClass_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
+        if (dto == null) throw new BadRequestException(LangProcess.msg(errorSystemAuthError));
         // 判断是否存在
         MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
                 .selectOne(new LambdaQueryWrapper<MdBaseClassstandard>()
@@ -174,7 +176,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
         List<MdBaseClassstandard> classstandardList = mdBaseClassstandardMapper.selectList(lam);
         classstandardList.forEach(classstandard -> {
             classstandard.setHasChildren(classstandard.getSub_count() > 0);
-            classstandard.setLeaf(!(classstandard.getSub_count() > 0));
+            classstandard.setLeaf((classstandard.getSub_count() <= 0));
             classstandard.setId(classstandard.getClass_id());
             classstandard.setLabel(classstandard.getClass_name());
         });
@@ -190,7 +192,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
      */
     @Override
     public ArrayList<MdBaseClassstandard> getSuperior(MdBaseClassstandard classstandard, ArrayList<MdBaseClassstandard> res) {
-        if (ObjectUtil.isEmpty(classstandard.getParent_class_id()) || classstandard.getParent_class_id().equals("0")) {
+        if (ObjectUtil.isEmpty(classstandard.getParent_class_id()) || classstandard.getParent_class_id().equals(IOSEnum.IS_NOTANDYES.code("否"))) {
             // 父类id为空或者是0就是顶级类别
             List<MdBaseClassstandard> classstandardList = mdBaseClassstandardMapper
                     .selectList(new LambdaQueryWrapper<MdBaseClassstandard>()
@@ -215,10 +217,11 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
         list.forEach(classstandard -> {
             classstandard.setId(classstandard.getClass_id());
             classstandard.setLabel(classstandard.getClass_name());
-            classstandard.setLeaf(!(classstandard.getSub_count() > 0));
+            classstandard.setLeaf((classstandard.getSub_count() <= 0));
             classstandard.setHasChildren(classstandard.getSub_count() > 0);
         });
-        List<MdBaseClassstandard> trees = new ArrayList<>(); // 待返回数据
+        // 待返回数据
+        List<MdBaseClassstandard> trees = new ArrayList<>();
         for (MdBaseClassstandard mdBaseClassstandard : list) {
             // 筛选父类的值
             if (ObjectUtil.isEmpty(mdBaseClassstandard.getParent_class_id())
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
index 39695a0..a0c7e42 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
@@ -36,7 +36,6 @@ public class MdBaseMaterialController {
     @GetMapping
     @Log("查询物料基础信息")
     @ApiOperation("查询物料基础信息")
-    //@SaCheckPermission("@el.check('mdBaseMaterial:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(mdBaseMaterialService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -44,7 +43,6 @@ public class MdBaseMaterialController {
     @PostMapping
     @Log("新增物料基础信息")
     @ApiOperation("新增物料基础信息")
-    //@SaCheckPermission("@el.check('mdBaseMaterial:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody MdBaseMaterial entity){
         mdBaseMaterialService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -53,7 +51,6 @@ public class MdBaseMaterialController {
     @PutMapping
     @Log("修改物料基础信息")
     @ApiOperation("修改物料基础信息")
-    //@SaCheckPermission("@el.check('mdBaseMaterial:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody MdBaseMaterial entity){
         mdBaseMaterialService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -61,7 +58,6 @@ public class MdBaseMaterialController {
 
     @Log("删除物料基础信息")
     @ApiOperation("删除物料基础信息")
-    //@SaCheckPermission("@el.check('mdBaseMaterial:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         mdBaseMaterialService.deleteAll(ids);
@@ -72,7 +68,6 @@ public class MdBaseMaterialController {
     @Log("物料同步")
     @ApiOperation("物料同步")
     @Limit(period = 1, count = 1)
-    //@SaCheckPermission("materialtype:list")
     public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
index 35eac06..f142f66 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
@@ -43,6 +43,11 @@ public interface IMdBaseMaterialService extends IService<MdBaseMaterial> {
     */
     void deleteAll(Set<String> ids);
 
+    /**
+     * 根据code查找
+     * @param materialCode
+     * @return MdBaseMaterial
+     */
     MdBaseMaterial findByCode(String materialCode);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
index 71fb2e2..40b14f7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
@@ -3,7 +3,6 @@ package org.nl.wms.database.material.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,15 +17,12 @@ import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.database.material.service.dao.MdBaseMaterial;
 import org.nl.wms.database.material.service.dao.mapper.MdBaseMaterialMapper;
 import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery;
-import org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 
 
 /**
@@ -40,8 +36,6 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
 
     @Autowired
     private MdBaseMaterialMapper mdBaseMaterialMapper;
-    @Autowired
-    private MesRequestMapper mesRequestMapper;
 
     @Override
     public IPage<MdBaseMaterial> queryAll(Map whereJson, PageQuery page){
@@ -85,8 +79,9 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
 
     @Override
     public void update(MdBaseMaterial entity) {
+        String errorSystemAuthError = "error_SystemAuthError";
         MdBaseMaterial dto = mdBaseMaterialMapper.selectById(entity.getMaterial_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
+        if (dto == null) throw new BadRequestException(LangProcess.msg(errorSystemAuthError));
 
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java
index 64271da..8198202 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java
@@ -32,7 +32,6 @@ public class MdBaseVehicleController {
     @GetMapping
     @Log("查询载具维护")
     @ApiOperation("查询载具维护")
-    //@SaCheckPermission("@el.check('mdBaseVehicle:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class MdBaseVehicleController {
     @PostMapping
     @Log("新增载具维护")
     @ApiOperation("新增载具维护")
-    //@SaCheckPermission("@el.check('mdBaseVehicle:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody MdBaseVehicle entity){
         mdBaseVehicleService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class MdBaseVehicleController {
     @PutMapping
     @Log("修改载具维护")
     @ApiOperation("修改载具维护")
-    //@SaCheckPermission("@el.check('mdBaseVehicle:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody MdBaseVehicle entity){
         mdBaseVehicleService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class MdBaseVehicleController {
 
     @Log("删除载具维护")
     @ApiOperation("删除载具维护")
-    //@SaCheckPermission("@el.check('mdBaseVehicle:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         mdBaseVehicleService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
index 221287c..2839a55 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
@@ -64,8 +64,9 @@ public class MdBaseVehicleServiceImpl extends ServiceImpl<MdBaseVehicleMapper, M
 
     @Override
     public void update(MdBaseVehicle entity) {
+        String errorSystemAuthError = "error_SystemAuthError";
         MdBaseVehicle dto = mdBaseVehicleMapper.selectById(entity.getVehicle_code());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
+        if (dto == null) throw new BadRequestException(LangProcess.msg(errorSystemAuthError));
 
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
index 1c63c37..d5e4eb2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
@@ -32,7 +32,6 @@ public class MdBaseWorkshopController {
     @GetMapping
     @Log("查询车间基础信息")
     @ApiOperation("查询车间基础信息")
-    //@SaCheckPermission("@el.check('mdBaseWorkshop:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(mdBaseWorkshopService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class MdBaseWorkshopController {
     @PostMapping
     @Log("新增车间基础信息")
     @ApiOperation("新增车间基础信息")
-    //@SaCheckPermission("@el.check('mdBaseWorkshop:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody MdBaseWorkshop entity){
         mdBaseWorkshopService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class MdBaseWorkshopController {
     @PutMapping
     @Log("修改车间基础信息")
     @ApiOperation("修改车间基础信息")
-    //@SaCheckPermission("@el.check('mdBaseWorkshop:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody MdBaseWorkshop entity){
         mdBaseWorkshopService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class MdBaseWorkshopController {
 
     @Log("删除车间基础信息")
     @ApiOperation("删除车间基础信息")
-    //@SaCheckPermission("@el.check('mdBaseWorkshop:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         mdBaseWorkshopService.deleteAll(ids);
@@ -67,7 +63,6 @@ public class MdBaseWorkshopController {
     @GetMapping("/getWorkShopList")
     @Log("获取车间下拉框")
     @ApiOperation("获取车间下拉框")
-    //@SaCheckPermission("@el.check('mdBaseWorkshop:list')")
     public ResponseEntity<Object> getWorkShopList(){
         return new ResponseEntity<>(mdBaseWorkshopService.getWorkShopList(),HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index a15ead9..298a9da 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -10,10 +10,24 @@ import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest;
  * @Date: 2023/6/26
  */
 public interface AcsToWmsService {
-    /** ACS请求接口 */
+    /**
+     * ACS请求接口
+     * @param param
+     * @return BaseResponse
+     */
     BaseResponse acsApply(JSONObject param);
-    /** 任务反馈 */
+
+    /**
+     * 任务反馈
+     * @param param
+     * @return BaseResponse
+     */
     BaseResponse feedbackTaskStatus(JSONObject param);
-    /** 实时修改点位状态 */
+
+    /**
+     * 实时修改点位状态
+     * @param param
+     * @return BaseResponse
+     */
     BaseResponse realTimeSetPoint(JSONObject param);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java
index ee50697..5988882 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java
@@ -8,7 +8,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+ * <p>
  * ACS请求基础实体
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Data
 public class BaseRequest {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java
index ff85990..9c0826c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java
@@ -11,6 +11,14 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * <p>
+ * 返回参数
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java
index 8098ee7..dba6e00 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java
@@ -4,7 +4,12 @@ import lombok.Data;
 import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
 
 /**
+ * <p>
  * ACS 任务申请请求实体
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Data
 public class ApplyTaskRequest extends BaseRequest {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java
index bf737e5..3d77437 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java
@@ -4,7 +4,12 @@ import lombok.Data;
 import org.nl.wms.ext.acs.service.dto.to.BaseRequest;
 
 /**
+ * <p>
  * ACS任务反馈请求实体
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Data
 public class FeedBackTaskStatusRequest extends BaseRequest {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index da34641..bb48fd3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1,7 +1,5 @@
 package org.nl.wms.ext.acs.service.impl;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
@@ -11,21 +9,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
 import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackTaskStatusRequest;
-import org.nl.wms.ext.mes.service.WmsToMesService;
 import org.nl.wms.ext.record.service.ISysInteractRecordService;
-import org.nl.wms.pdm.consumption.service.IPdmBdMudConsumptionService;
-import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 import org.nl.wms.sch.task_manage.AbstractTask;
@@ -33,8 +20,6 @@ import org.nl.wms.sch.task_manage.GeneralDefinition;
 import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
 import org.nl.wms.sch.task_manage.task.TaskFactory;
 import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,41 +39,23 @@ import java.util.concurrent.ConcurrentHashMap;
 @Service
 public class AcsToWmsServiceImpl implements AcsToWmsService {
 
-    // 反射类方法的缓存
+    /**
+     * 将解析的整数与结果相乘
+     */
     private Map<String, Method> methodCache = new ConcurrentHashMap<>();
 
     @Autowired
     private ISchBaseTaskService taskService;
     @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private IPdmBdRequestMaterialRecordService requestMaterialRecordService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
     private TaskFactory taskFactory;
     @Autowired
     private ISysNoticeService noticeService;
     @Autowired
     private ISysInteractRecordService interactRecordService;
-    @Autowired
-    private IMdBaseMaterialService materialService;
-    @Autowired
-    private IPdmBdProductionProcessTrackingService processTrackingService;
-    @Autowired
-    private RedissonClient redissonClient;
-    @Autowired
-    private IPdmBdMaterialResidueService materialResidueService;
-    @Autowired
-    private IPdmBdVehicleBindingService vehicleBindingService;
-    @Autowired
-    private IPdmBdMudConsumptionService mudConsumptionService;
-    @Autowired
-    private WmsToMesService wmsToMesService;
-    @Autowired
-    private FJMapper fjMapper;
 
-    // 初始化反射方法
+    /**
+     * 初始化反射方法
+     */
     @PostConstruct
     public void initCacheMethod() {
         for (Method method : this.getClass().getMethods()) {
@@ -104,7 +71,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         String requestMethodName = param.getString("request_medthod_name");
         BaseResponse result = BaseResponse.build(requestNo);
         try {
-            String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名
+            // 获取请求方法名
+            String requestMethodCode = param.getString("request_medthod_code");
             Method method = methodCache.get(StrUtil.toCamelCase(requestMethodCode));
             if (method == null) {
                 throw new BadRequestException(LangProcess.msg("error_isNull",requestMethodCode));
@@ -127,16 +95,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return result;
     }
 
-    // todo: 特殊处理
-    protected int specialHandling(String regionCode, JSONObject param) {
-        int torus = 0; // 无业务：0，分拣剩余0托：1
-        if (regionCode.equals("FJ")) { // 判断是否够码满
-            // 分拣需要在这设置特殊值
-            // 校验是否够码满一托
-        }
-        return torus;
-    }
-
     /**
      * 提前要料
      *
@@ -145,24 +103,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      */
     @Deprecated
     @Transactional(rollbackFor = Exception.class)
-    public BaseResponse pressRequestMaterial2(JSONObject param) { // （公共接口进来）只是给我一个下料位（中间位置）
-        String requestNo = param.getString("requestNo");
-        // 压机、原材料物料（混碾）、压机工单、叫料时间
-        String deviceCode = param.getString("device_code");// 几号压机下料位
-        SchBasePoint basePoint = pointService.getById(deviceCode);
-        if (ObjectUtil.isEmpty(basePoint)) {
-            return BaseResponse.responseError(requestNo, "设备号[" + deviceCode + "]不正确！");
-        }
-        String parentPointCode = basePoint.getParent_point_code();
-        // 获取原材料物料
-        PdmBdRequestMaterialRecord requestMaterialRecord = new PdmBdRequestMaterialRecord();
-        requestMaterialRecord.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-//        requestMaterialRecord.setMaterial_id(workOrder.getRaw_material_id());
-        requestMaterialRecord.setDevice_code(parentPointCode);
-        requestMaterialRecord.setCreate_time(DateUtil.now());
-        requestMaterialRecord.setIs_finish(false);
-        requestMaterialRecordService.save(requestMaterialRecord);
-        return BaseResponse.responseOk(requestNo);
+    public BaseResponse pressRequestMaterial2(JSONObject param) {
+        return null;
     }
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
deleted file mode 100644
index 7b10202..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.nl.wms.ext.mes.service.dao.mapper;
-
-/**
- * @Author: lyd
- * @Description: mes
- * @Date: 2023/9/6
- */
-public interface MesRequestMapper {
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
deleted file mode 100644
index a0dab1f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper">
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java
deleted file mode 100644
index 75ccbb9..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/CusterVo.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 客户信息
- * @Date: 2023/10/23
- */
-@Data
-public class CusterVo {
-    private String CUSTER_NO;
-    private String CUSTER_NAME;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoDto.java
deleted file mode 100644
index f62f4e7..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoDto.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 窑内信息
- * @Date: 2023/9/19
- */
-@Data
-public class MesGdyInfoDto {
-    private String MSGID;
-    private String SEND_TM;
-    private String TRAY_NO;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String PRO_NUM;
-    private String PRO_UNIT;
-    private String PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String FCONVERTRATE;
-    private String STOCK;
-    private String DEVICE;
-    private String DEVICEUNITPOST;
-    private String IN_DATE;
-    private String PREOUT_DATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoWaitDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoWaitDto.java
deleted file mode 100644
index a0f67a0..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyInfoWaitDto.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 带入窑实体
- * @Date: 2023/9/22
- * 二维码
- * 发送时间
- * 托盘编号
- * 物料编码
- * 物料名称
- * 规格
- * 型号
- * 批次号
- * 压机号
- * 重量
- * 重量单位
- * 数量
- * 数量单位
- * 单位转换率
- * 写入时间
- * 读取标志,0未读取，1已读取
- * 读取时间
- */
-@Data
-public class MesGdyInfoWaitDto {
-    private String MSGID;
-    private String SEND_TM;
-    private String TRAY_NO;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String PRO_NUM;
-    private String PRO_UNIT;
-    private String PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String FCONVERTRATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialInDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialInDto.java
deleted file mode 100644
index ca7e27e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialInDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 入窑记录数据
- * @Date: 2023/9/14
- */
-@Data
-public class MesGdyMaterialInDto {
-    private String MSGID;
-    private String TRAY_NO;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODE;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String PRO_NUM;
-    private String PRO_UNIT;
-    private String PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String FCONVERTRATE;
-    private String STOCK;
-    private String DEVICE;
-    private String DEVICEUNITPOST;
-    private String IN_DATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialOutDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialOutDto.java
deleted file mode 100644
index c4db25c..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesGdyMaterialOutDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 出窑记录
- * @Date: 2023/9/14
- */
-@Data
-public class MesGdyMaterialOutDto {
-    private String MSGID;
-    private String TRAY_NO;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String PRO_NUM;
-    private String PRO_UNIT;
-    private String PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String FCONVERTRATE;
-    private String STOCK;
-    private String DEVICE;
-    private String DEVICEUNITPOST;
-    private String OUT_DATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java
deleted file mode 100644
index 0ba0c69..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: 泥料消耗记录
- * @Date: 2023/9/11
- */
-@Data
-public class MesMudConsumptionDto implements Serializable {
-    // 唯一标识
-    private String MSGID;
-    /** 压机作业计划号 */
-    private String PWORKSCHE_ID;
-    /**  */
-    private String FWORKSCHE_ID;
-    private String FPROBATCH;
-    private String FBAGCODE;
-    /** 泥料仓库编号 */
-    private String LOGT;
-    /** 出库数量 */
-    private BigDecimal OUT_NUMBER;
-    /** 出库重量 */
-    private BigDecimal OUT_FINNUM;
-    /** 出库理论重量 */
-    private BigDecimal OUT_THEONUM;
-    private String PRESSUNIT;
-    private String SENDTIM;
-    private String SENDER;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java
deleted file mode 100644
index c0028cc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesOrderInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: mes的订单信息DTO
- * @Date: 2023/10/23
- */
-@Data
-public class MesOrderInfo {
-    /**
-     * 订单号
-     */
-    private String FORDER_NO;
-    private String FPLANSTART_DATE;
-    private String FPLANFINISH_DATE;
-    private String FMATERIAL_ID;
-    private String FMATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String FSALE_NO;
-    private int FORDER_SUBNUM;
-    private String BC;
-    private String BZ;
-    private int GUADANSUM;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java
deleted file mode 100644
index a4f8d31..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: 压机产出数据
- * @Date: 2023/9/12
- */
-@Data
-public class MesProductDataDto implements Serializable {
-    private String MSGID;
-    private String FORDER_NO;
-    private String PWORKSCHE_ID;
-    private String FSCHEDULE_ID;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String FTEAM;
-    private String TRAY_NO;
-    /** 重量 */
-    private BigDecimal PRO_NUM;
-    /** 重量单位 */
-    private String PRO_UNIT;
-    /** 数量 */
-    private BigDecimal PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private BigDecimal FP_SUBUNIT;
-    private String FP_REASON;
-    private String FP_JJFLAG;
-    private String FP_JJMATERIAL_ID;
-    private BigDecimal LDLNUM;
-    private String CHECKERIN;
-    private String CHECKERIN_TIM;
-    private String PRODATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesQSPressMonitorData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesQSPressMonitorData.java
deleted file mode 100644
index 6023b7f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesQSPressMonitorData.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 压机检测数据
- * @Date: 2023/10/11
- * 唯一标识
- * 当前抓取工位
- * 当前放置工位
- * 是否合格
- * 激光标刻码
- * 重量
- * 高度1
- * 高度2
- * 高度3
- * 高度4
- * 宽度1
- * 宽度2
- * 长度
- * 体积
- * 平面度
- * 缺陷个数
- * 工单标识
- * 写入时间
- * 读取标志,0未读取，1已读取
- * 读取时间
- */
-@Data
-public class MesQSPressMonitorData {
-    private String BRICK_ID;
-    private String GET_STATION;
-    private String PUT_STATION;
-    private Boolean IS_QUALIFIED;
-    private String LASER_MARKING_CODE;
-    private String WEIGHT;
-    private String HEIGHT1;
-    private String HEIGHT2;
-    private String HEIGHT3;
-    private String HEIGHT4;
-    private String WIDTH1;
-    private String WIDTH2;
-    private String LEN;
-    private String VOLUME;
-    private String FLATNESS;
-    private String UNQUALIFIED_QTY;
-    private String WORKORDER_CODE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-    private String MATERIAL_ID;
-    private String MATERIAL_NAME;
-    private String MATERIAL_SPEC;
-    private String MATERIAL_MODEL;
-    private String MACHINE_WET;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfo.java
deleted file mode 100644
index 13d4325..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 滚筒线内
- * @Date: 2023/9/19
- */
-@Data
-public class MesSemiProductionInfo {
-    private String MSGID;
-    private String SEND_TM;
-    private String BATCHNO;
-    private String ORDER_NO;
-    private String STOCK_NUM;
-    private String STOCK_UNIT;
-    private String STOCK_SUBNUM;
-    private String STOCK_SUBUNIT;
-    private String MATERIAL_ID;
-    private String MATERIAL_NAME;
-    private String PROSPEC;
-    private String PROMODEL;
-    private String PRODATE;
-    private String STOCK;
-    private String STOCK_NAME;
-    private String PRESSUNIT;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoInDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoInDto.java
deleted file mode 100644
index 06bcbd5..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoInDto.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: PMS接收半成品入库信息 - 入滚筒线
- * @Date: 2023/9/13
- */
-@Data
-public class MesSemiProductionInfoInDto {
-    private String MSGID;
-    private String FORDER_NO;
-    private String PWORKSCHE_ID;
-    private String FSCHEDULE_ID;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String FTEAM;
-    private String TRAY_NO;
-    private BigDecimal PRO_NUM;
-    private String PRO_UNIT;
-    private BigDecimal PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String STOCK;
-    private String STOCK_NAME;
-    private String CHECKERIN;
-    private String CHECKERIN_TIM;
-    private String PRODATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoOutDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoOutDto.java
deleted file mode 100644
index 9086e41..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesSemiProductionInfoOutDto.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: PMS接收半成品出库信息
- * @Date: 2023/9/13
- */
-@Data
-public class MesSemiProductionInfoOutDto {
-    private String MSGID;
-    private String SEMIPRODUCT_BATCHNO;
-    private String PRODUCT_BATCHNO;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private BigDecimal PRO_NUM;
-    private String PRO_UNIT;
-    private BigDecimal PRO_SUBNUM;
-    private String PRO_SUBUNIT;
-    private String STOCK;
-    private String STOCK_NAME;
-    private String CHECKEROUT;
-    private String CHECKEROUT_TIM;
-    private String OUTTYPE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesShelfInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesShelfInfo.java
deleted file mode 100644
index e9ccdcb..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesShelfInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: 三层货架信息
- * @Date: 2023/10/11
- * 唯一ID - 新生成
- * 发送时间 - 新生成
- * 仓库号 - 不录入
- * 组盘标识
- * 载具类型
- * 载具编码
- * 物料标识
- * 物料名称
- * 规格
- * 型号
- * 来源载具编码/载具的来源点位(压机)
- * 货位号
- * 点位名称
- * 是否已烧制
- * 是否满托
- * 批次
- * 入库时间
- * 静置时间(分钟)
- * 物料数量
- * 物料重量
- * 搬运工单编码
- * 组盘次数
- * 组盘绑定物料状态
- * 位置跟踪
- * 备注
- * 修改时间
- * 出窑时间
- * 入窑时间
- * 写入时间
- * 读取标识
- * 读取时间
- */
-@Data
-public class MesShelfInfo {
-    private String MSGID;
-    private String SEND_TM;
-    private String LOGT;
-    private String GROUP_ID;
-    private String VEHICLE_TYPE;
-    private String VEHICLE_CODE;
-    private String MATERIAL_ID;
-    private String MATERIAL_NAME;
-    private String MATSPEC;
-    private String MATMODEL;
-    private String SOURCE_VEHICLE_CODE;
-    private String POINT_CODE;
-    private String POINT_NAME;
-    private Boolean IS_FIRING;
-    private Boolean IS_FULL;
-    private String PCSN;
-    private String INSTORAGE_TIME;
-    private String STANDING_TIME;
-    private int MATERIAL_QTY;
-    private BigDecimal MATERIAL_WEIGHT;
-    private String WORKORDER_CODE;
-    private String GROUP_NUMBER;
-    private String GROUP_BIND_MATERIAL_STATUS;
-    private String MOVE_WAY;
-    private String REMARK;
-    private String UPDATE_TIME;
-    private String OUT_KILN_TIME;
-    private String INTO_KILN_TIME;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesUnusedDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesUnusedDto.java
deleted file mode 100644
index fdd2830..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesUnusedDto.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 机口判废
- * @Date: 2023/9/20
- * 唯一标识
- * 订单号
- * 压机计划号
- * 日计划号
- * 物料编码
- * 物料名称
- * 规格
- * 型号
- * 批次号
- * 压机号
- * 班组
- * 废品重量
- * 重量单位
- * 废品数量
- * 数量单位
- * 判废人
- * 判废日期
- * 生产日期
- * 写入时间
- * 读取标志,0未读取，1已读取
- * 读取时间
- */
-@Data
-public class MesUnusedDto {
-    private String MSGID;
-    private String FORDER_NO;
-    private String PWORKSCHE_ID;
-    private String FSCHEDULE_ID;
-    private String FPRODUCT_MATERIAL_ID;
-    private String FPRODUCT_MATERIAL_NAME;
-    private String FMATSPEC;
-    private String FMATMODEL;
-    private String BATCHNO;
-    private String PRESSUNIT;
-    private String FTEAM;
-    private String FP_NUM;
-    private String FP_UNIT;
-    private String FPSUBNUM;
-    private String FP_SUBUNIT;
-    private String CHECKERIN;
-    private String CHECKERIN_TIM;
-    private String PRODATE;
-    private String CREATE_TM;
-    private String OP_FLAG;
-    private String OP_TM;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java
deleted file mode 100644
index d6cc680..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.nl.wms.ext.mes.service.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Author: lyd
- * @Description: mes工单实体
- * @Date: 2023/9/9
- */
-@Data
-public class MesWorkOrderDto {
-    /** 唯一标识 */
-    private String MSGID;
-    /** 压机计划号 */
-    private String PWORKSCHE_ID;
-    /** 日计划号 */
-    private String FSCHEDULE_ID;
-    /** 生产订单号 */
-    private String FORDER_NO;
-    /** 生产日期 */
-    private String FPRODUCT_DATE;
-    /** 批次号 */
-    private String BATCHNO;
-    /** 压机号 */
-    private String PRESSUNIT;
-    /** 配料批次号 */
-    private String FPROBATCH;
-    /** 物料编码 */
-    private String FPRODUCT_MATERIAL_ID;
-    /** 物料名称 */
-    private String FPRODUCT_MATERIAL_NAME;
-    /** 规格 */
-    private String FMATSPEC;
-    /** 型号 */
-    private String FMATMODEL;
-    /** 辅数量 */
-    private BigDecimal FPRODUCT_SUBNUM;
-    /** 辅单位 */
-    private String FPRODUCT_SUBUNIT;
-    /** 数量 */
-    private String FPRODUCT_NUM;
-    /** 单位 */
-    private String FPRODUCT_UNIT;
-    /** 重量 */
-    private String FCONVERTRATE;
-    /** 班组 */
-    private String FTEAM;
-    /** 开始时间 */
-    private String BEGINTIME;
-    /** 结束时间 */
-    private String ENDTIME;
-    /** 写入时间 */
-    private String CREATE_TM;
-    /** 读取标志 */
-    private String OP_FLAG;
-    /** 结果 */
-    private String OP_REPLAY;
-    /** 读取时间 */
-    private String OP_TM;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java
index c1e0931..39bf47c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java
@@ -32,7 +32,6 @@ public class SysInteractRecordController {
     @GetMapping
     @Log("查询外部系统接口记录")
     @ApiOperation("查询外部系统接口记录")
-    //@SaCheckPermission("@el.check('sysInteractRecord:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class SysInteractRecordController {
     @PostMapping
     @Log("新增外部系统接口记录")
     @ApiOperation("新增外部系统接口记录")
-    //@SaCheckPermission("@el.check('sysInteractRecord:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SysInteractRecord entity){
         sysInteractRecordService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class SysInteractRecordController {
     @PutMapping
     @Log("修改外部系统接口记录")
     @ApiOperation("修改外部系统接口记录")
-    //@SaCheckPermission("@el.check('sysInteractRecord:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SysInteractRecord entity){
         sysInteractRecordService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class SysInteractRecordController {
 
     @Log("删除外部系统接口记录")
     @ApiOperation("删除外部系统接口记录")
-    //@SaCheckPermission("@el.check('sysInteractRecord:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         sysInteractRecordService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
index a556691..3c89f0d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
@@ -45,18 +45,25 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
 
     /**
      * 创建记录
+     * @param request 、
+     * @param response 、
+     * @param direction 、
      */
     void saveRecord(Object request, BaseResponse response, String direction);
 
     /**
-     *
-     * @param name
-     * @param request
-     * @param response
-     * @param direction
+     * 保存记录
+     * @param name 、
+     * @param request 、
+     * @param response 、
+     * @param direction 、
      */
     <K, V> void saveRecord(String name, K request, V response, String direction);
 
+    /**
+     * 删除
+     * @param day 、
+     */
     void deleteByDay(String day);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java
index a2655a4..a12a176 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java
@@ -9,7 +9,16 @@ import org.nl.wms.ext.record.service.dao.SysInteractRecord;
 **/
 public interface SysInteractRecordMapper extends BaseMapper<SysInteractRecord> {
 
+    /**
+     * 删除
+     * @param day /
+     */
     void deleteByDay(String day);
 
+    /**
+     * 删除一行
+     * @param maxRowsToKeep /
+     * @param maxRowsToDelete /
+     */
     void deleteByRows(String maxRowsToKeep, String maxRowsToDelete);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
index 0444a73..df2fc8a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
@@ -103,25 +103,29 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
         entity.setDirection(direction);
         entity.setRequest_param(JSONObject.toJSONString(request));
         entity.setResponse_param(JSONObject.toJSONString(response));
-        if (response instanceof BaseResponse) { // acs请求wms的返回数据
+        // acs请求wms的返回数据
+        if (response instanceof BaseResponse) {
             BaseResponse re = (BaseResponse) response;
             entity.setCode(re.getCode());
             entity.setMessage(re.getMessage());
             entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
         }
-        if (response instanceof ResultForAcs) { // wms请求acs的返回数据
+        // wms请求acs的返回数据
+        if (response instanceof ResultForAcs) {
             ResultForAcs re = (ResultForAcs) response;
             entity.setCode(re.getStatus());
             entity.setMessage(re.getMessage());
             entity.setIs_success(re.getStatus() == HttpStatus.HTTP_OK);
         }
-        if (response instanceof AcsResponse) { // wms请求acs的返回数据
+        // wms请求acs的返回数据
+        if (response instanceof AcsResponse) {
             AcsResponse re = (AcsResponse) response;
             entity.setCode(re.getCode());
             entity.setMessage(re.getMessage());
             entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
         }
-        if (response instanceof ResultForMes) { // wms请求mes的返回数据
+        // wms请求mes的返回数据
+        if (response instanceof ResultForMes) {
             ResultForMes re = (ResultForMes) response;
             entity.setCode(re.getStatus());
             entity.setMessage(re.getMessage());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java
deleted file mode 100644
index 53e9fbc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nl.wms.pdm.consumption.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pdm.consumption.service.IPdmBdMudConsumptionService;
-import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-/**
-* @author lyd
-* @date 2023-08-11
-**/
-@Slf4j
-@RestController
-@Api(tags = "泥料消耗记录管理")
-@RequestMapping("/api/pdmBdMudConsumption")
-public class PdmBdMudConsumptionController {
-
-    @Autowired
-    private IPdmBdMudConsumptionService pdmBdMudConsumptionService;
-
-    @GetMapping
-    @Log("查询泥料消耗记录")
-    @ApiOperation("查询泥料消耗记录")
-    //@SaCheckPermission("@el.check('pdmBdMudConsumption:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(pdmBdMudConsumptionService.queryAll(whereJson,page)),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增泥料消耗记录")
-    @ApiOperation("新增泥料消耗记录")
-    //@SaCheckPermission("@el.check('pdmBdMudConsumption:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PdmBdMudConsumption entity){
-        pdmBdMudConsumptionService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改泥料消耗记录")
-    @ApiOperation("修改泥料消耗记录")
-    //@SaCheckPermission("@el.check('pdmBdMudConsumption:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PdmBdMudConsumption entity){
-        pdmBdMudConsumptionService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除泥料消耗记录")
-    @ApiOperation("删除泥料消耗记录")
-    //@SaCheckPermission("@el.check('pdmBdMudConsumption:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        pdmBdMudConsumptionService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java
deleted file mode 100644
index 6fa916b..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.nl.wms.pdm.consumption.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务接口
-* @author lyd
-* @date 2023-08-11
-**/
-public interface IPdmBdMudConsumptionService extends IService<PdmBdMudConsumption> {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param pageable 分页参数
-    * @return IPage<PdmBdMudConsumption>
-    */
-    IPage<PdmBdMudConsumption> queryAll(Map whereJson, PageQuery pageable);
-
-    /**
-    * 创建
-    * @param entity /
-    */
-    String create(PdmBdMudConsumption entity);
-
-    /**
-    * 编辑
-    * @param entity /
-    */
-    void update(PdmBdMudConsumption entity);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Set<String> ids);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java
deleted file mode 100644
index 4c10c3b..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.nl.wms.pdm.consumption.service.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-08-11
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("pdm_bd_mud_consumption")
-public class PdmBdMudConsumption implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "record_id", type = IdType.NONE)
-    @ApiModelProperty(value = "记录标识")
-    private String record_id;
-
-    @ApiModelProperty(value = "泥料编码")
-    private String raw_material_code;
-
-    @ApiModelProperty(value = "设备编码")
-    private String device_code;
-
-    @ApiModelProperty(value = "泥料重量")
-    private BigDecimal weight;
-
-    @ApiModelProperty(value = "工单号")
-    private String workorder_code;
-
-    @ApiModelProperty(value = "物料id")
-    private String material_id;
-
-    @ApiModelProperty(value = "记录时间")
-    private String record_time;
-
-    @ApiModelProperty(value = "组盘标识")
-    private String group_id;
-
-    @ApiModelProperty(value = "下料位编码")
-    private String current_point;
-
-    @ApiModelProperty(value = "是否读取")
-    private Boolean is_read;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java
deleted file mode 100644
index 4e6c41e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.consumption.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
-
-/**
-* @author lyd
-* @date 2023-08-11
-**/
-public interface PdmBdMudConsumptionMapper extends BaseMapper<PdmBdMudConsumption> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.xml
deleted file mode 100644
index 7ef7304..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pdm.consumption.service.dao.mapper.PdmBdMudConsumptionMapper">
-
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java
deleted file mode 100644
index 57cc820..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.nl.wms.pdm.consumption.service.dto;
-
-import java.math.BigDecimal;
-import lombok.Data;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-08-11
-**/
-@Data
-public class PdmBdMudConsumptionDto implements Serializable {
-
-    /** 记录标识 */
-    private String record_id;
-
-    /** 泥料编码 */
-    private String raw_material_code;
-
-    /** 设备编码 */
-    private String device_code;
-
-    /** 泥料重量 */
-    private BigDecimal weight;
-
-    /** 工单号 */
-    private String workorder_code;
-
-    /** 物料id */
-    private String material_id;
-
-    /** 记录时间 */
-    private String record_time;
-
-    /** 组盘标识 */
-    private String group_id;
-
-    /** 下料位编码 */
-    private String current_point;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java
deleted file mode 100644
index 4ae6a5a..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.consumption.service.dto;
-
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
-
-/**
-* @author lyd
-* @date 2023-08-11
-**/
-public class PdmBdMudConsumptionQuery extends BaseQuery<PdmBdMudConsumption> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java
deleted file mode 100644
index ccb61b2..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.nl.wms.pdm.consumption.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.pdm.consumption.service.IPdmBdMudConsumptionService;
-import org.nl.wms.pdm.consumption.service.dao.mapper.PdmBdMudConsumptionMapper;
-import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务实现
-* @author lyd
-* @date 2023-08-11
-**/
-@Slf4j
-@Service
-public class PdmBdMudConsumptionServiceImpl extends ServiceImpl<PdmBdMudConsumptionMapper, PdmBdMudConsumption> implements IPdmBdMudConsumptionService {
-
-    @Autowired
-    private PdmBdMudConsumptionMapper pdmBdMudConsumptionMapper;
-
-    @Override
-    public IPage<PdmBdMudConsumption> queryAll(Map whereJson, PageQuery page){
-        LambdaQueryWrapper<PdmBdMudConsumption> lam = new LambdaQueryWrapper<>();
-        IPage<PdmBdMudConsumption> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pdmBdMudConsumptionMapper.selectPage(pages, lam);
-        return pages;
-    }
-
-    @Override
-    public String create(PdmBdMudConsumption entity) {
-        String now = DateUtil.now();
-
-        entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setRecord_time(now);
-        pdmBdMudConsumptionMapper.insert(entity);
-        return entity.getRecord_id();
-    }
-
-    @Override
-    public void update(PdmBdMudConsumption entity) {
-        PdmBdMudConsumption dto = pdmBdMudConsumptionMapper.selectById(entity.getRecord_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
-        String now = DateUtil.now();
-        entity.setRecord_time(now);
-
-        pdmBdMudConsumptionMapper.updateById(entity);
-    }
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        pdmBdMudConsumptionMapper.deleteBatchIds(ids);
-    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java
deleted file mode 100644
index ca2c04f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nl.wms.pdm.record.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-/**
-* @author lyd
-* @date 2023-07-05
-**/
-@Slf4j
-@RestController
-@Api(tags = "压机提前要料管理")
-@RequestMapping("/api/pdmBdRequestMaterialRecord")
-public class PdmBdRequestMaterialRecordController {
-
-    @Autowired
-    private IPdmBdRequestMaterialRecordService pdmBdRequestMaterialRecordService;
-
-    @GetMapping
-    @Log("查询压机提前要料")
-    @ApiOperation("查询压机提前要料")
-    //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(pdmBdRequestMaterialRecordService.queryAll(whereJson,page)),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增压机提前要料")
-    @ApiOperation("新增压机提前要料")
-    //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PdmBdRequestMaterialRecord entity){
-        pdmBdRequestMaterialRecordService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改压机提前要料")
-    @ApiOperation("修改压机提前要料")
-    //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PdmBdRequestMaterialRecord entity){
-        pdmBdRequestMaterialRecordService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除压机提前要料")
-    @ApiOperation("删除压机提前要料")
-    //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        pdmBdRequestMaterialRecordService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java
deleted file mode 100644
index c326b40..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.nl.wms.pdm.record.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务接口
-* @author lyd
-* @date 2023-07-05
-**/
-public interface IPdmBdRequestMaterialRecordService extends IService<PdmBdRequestMaterialRecord> {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param pageable 分页参数
-    * @return IPage<PdmBdRequestMaterialRecord>
-    */
-    IPage<PdmBdRequestMaterialRecord> queryAll(Map whereJson, PageQuery pageable);
-
-    /**
-    * 创建
-    * @param entity /
-    */
-    void create(PdmBdRequestMaterialRecord entity);
-
-    /**
-    * 编辑
-    * @param entity /
-    */
-    void update(PdmBdRequestMaterialRecord entity);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Set<String> ids);
-
-    /**
-     * 叫料完成
-     * @param recordId
-     */
-    void callMaterialFinish(String recordId);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/PdmBdRequestMaterialRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/PdmBdRequestMaterialRecord.java
deleted file mode 100644
index 71cec91..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/PdmBdRequestMaterialRecord.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.nl.wms.pdm.record.service.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-05
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("pdm_bd_request_material_record")
-public class PdmBdRequestMaterialRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "record_id", type = IdType.NONE)
-    @ApiModelProperty(value = "要料记录标识")
-    private String record_id;
-
-    @ApiModelProperty(value = "压机编号")
-    private String device_code;
-
-    @ApiModelProperty(value = "物料")
-    private String material_id;
-
-    @ApiModelProperty(value = "工单")
-    private String workorder_id;
-
-    @ApiModelProperty(value = "叫料时间")
-    private String create_time;
-    @ApiModelProperty(value = "是否上料成功")
-    private Boolean is_finish;
-    @ApiModelProperty(value = "上料时间")
-    private String update_time;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.java
deleted file mode 100644
index c60826d..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.record.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-
-/**
-* @author lyd
-* @date 2023-07-05
-**/
-public interface PdmBdRequestMaterialRecordMapper extends BaseMapper<PdmBdRequestMaterialRecord> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml
deleted file mode 100644
index 95bc6cf..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pdm.record.service.dao.mapper.PdmBdRequestMaterialRecordMapper">
-
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java
deleted file mode 100644
index 726d221..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.nl.wms.pdm.record.service.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-05
-**/
-@Data
-public class PdmBdRequestMaterialRecordDto implements Serializable {
-
-    /** 要料记录标识 */
-    private String record_id;
-
-    /** 压机编号 */
-    private String device_code;
-
-    /** 物料 */
-    private String material_id;
-
-    /** 工单 */
-    private String workorder_id;
-
-    /** 叫料时间 */
-    private String create_time;
-
-    /** 是否上料成功 */
-    private Boolean is_finish;
-
-    /** 上料时间 */
-    private String update_time;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java
deleted file mode 100644
index a18c96d..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.record.service.dto;
-
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-
-/**
-* @author lyd
-* @date 2023-07-05
-**/
-public class PdmBdRequestMaterialRecordQuery extends BaseQuery<PdmBdRequestMaterialRecord> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java
deleted file mode 100644
index ea5421f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.nl.wms.pdm.record.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService;
-import org.nl.wms.pdm.record.service.dao.mapper.PdmBdRequestMaterialRecordMapper;
-import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务实现
-* @author lyd
-* @date 2023-07-05
-**/
-@Slf4j
-@Service
-public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl<PdmBdRequestMaterialRecordMapper, PdmBdRequestMaterialRecord> implements IPdmBdRequestMaterialRecordService {
-
-    @Autowired
-    private PdmBdRequestMaterialRecordMapper pdmBdRequestMaterialRecordMapper;
-
-    @Override
-    public IPage<PdmBdRequestMaterialRecord> queryAll(Map whereJson, PageQuery page){
-        LambdaQueryWrapper<PdmBdRequestMaterialRecord> lam = new LambdaQueryWrapper<>();
-        IPage<PdmBdRequestMaterialRecord> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pdmBdRequestMaterialRecordMapper.selectPage(pages, lam);
-        return pages;
-    }
-
-    @Override
-    public void create(PdmBdRequestMaterialRecord entity) {
-        String now = DateUtil.now();
-
-        entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setCreate_time(now);
-        pdmBdRequestMaterialRecordMapper.insert(entity);
-    }
-
-    @Override
-    public void update(PdmBdRequestMaterialRecord entity) {
-        PdmBdRequestMaterialRecord dto = pdmBdRequestMaterialRecordMapper.selectById(entity.getRecord_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
-        pdmBdRequestMaterialRecordMapper.updateById(entity);
-    }
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        pdmBdRequestMaterialRecordMapper.deleteBatchIds(ids);
-    }
-
-    @Override
-    public void callMaterialFinish(String recordId) {
-        PdmBdRequestMaterialRecord requestMaterialRecord = pdmBdRequestMaterialRecordMapper.selectById(recordId);
-        requestMaterialRecord.setIs_finish(true);
-        requestMaterialRecord.setUpdate_time(DateUtil.now());
-        pdmBdRequestMaterialRecordMapper.updateById(requestMaterialRecord);
-    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java
deleted file mode 100644
index 3df312a..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nl.wms.pdm.residue.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService;
-import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-/**
-* @author lyd
-* @date 2023-07-28
-**/
-@Slf4j
-@RestController
-@Api(tags = "压机泥料剩余记录管理")
-@RequestMapping("/api/pdmBdMaterialResidue")
-public class PdmBdMaterialResidueController {
-
-    @Autowired
-    private IPdmBdMaterialResidueService pdmBdMaterialResidueService;
-
-    @GetMapping
-    @Log("查询压机泥料剩余记录")
-    @ApiOperation("查询压机泥料剩余记录")
-    //@SaCheckPermission("@el.check('pdmBdMaterialResidue:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(pdmBdMaterialResidueService.queryAll(whereJson,page)),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增压机泥料剩余记录")
-    @ApiOperation("新增压机泥料剩余记录")
-    //@SaCheckPermission("@el.check('pdmBdMaterialResidue:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PdmBdMaterialResidue entity){
-        pdmBdMaterialResidueService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改压机泥料剩余记录")
-    @ApiOperation("修改压机泥料剩余记录")
-    //@SaCheckPermission("@el.check('pdmBdMaterialResidue:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PdmBdMaterialResidue entity){
-        pdmBdMaterialResidueService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除压机泥料剩余记录")
-    @ApiOperation("删除压机泥料剩余记录")
-    //@SaCheckPermission("@el.check('pdmBdMaterialResidue:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        pdmBdMaterialResidueService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java
deleted file mode 100644
index dfec403..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.nl.wms.pdm.residue.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest;
-import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务接口
-* @author lyd
-* @date 2023-07-28
-**/
-public interface IPdmBdMaterialResidueService extends IService<PdmBdMaterialResidue> {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param pageable 分页参数
-    * @return IPage<PdmBdMaterialResidue>
-    */
-    IPage<PdmBdMaterialResidue> queryAll(Map whereJson, PageQuery pageable);
-
-    /**
-    * 创建
-    * @param entity /
-    */
-    void create(PdmBdMaterialResidue entity);
-
-    /**
-    * 编辑
-    * @param entity /
-    */
-    void update(PdmBdMaterialResidue entity);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Set<String> ids);
-
-    /**
-     * 添加数据
-     */
-    void addByApplyTaskRequest(ApplyTaskRequest applyTaskRequest);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java
deleted file mode 100644
index 980ddbc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.nl.wms.pdm.residue.service.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-28
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("pdm_bd_material_residue")
-public class PdmBdMaterialResidue implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "record_id", type = IdType.NONE)
-    @ApiModelProperty(value = "记录标识")
-    private String record_id;
-
-    @ApiModelProperty(value = "泥料编码")
-    private String raw_material_code;
-
-    @ApiModelProperty(value = "设备编码")
-    private String device_code;
-
-    @ApiModelProperty(value = "泥料编码")
-    private String weight;
-
-    @ApiModelProperty(value = "工单号")
-    private String workorder_code;
-
-    @ApiModelProperty(value = "物料id")
-    private String material_id;
-
-    @ApiModelProperty(value = "记录时间")
-    private String record_time;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java
deleted file mode 100644
index da60465..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.residue.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue;
-
-/**
-* @author lyd
-* @date 2023-07-28
-**/
-public interface PdmBdMaterialResidueMapper extends BaseMapper<PdmBdMaterialResidue> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.xml
deleted file mode 100644
index 2110a28..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pdm.residue.service.dao.mapper.PdmBdMaterialResidueMapper">
-
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java
deleted file mode 100644
index dd40ff7..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.nl.wms.pdm.residue.service.dto;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-28
-**/
-@Data
-public class PdmBdMaterialResidueDto implements Serializable {
-
-    /** 记录标识 */
-    private String record_id;
-
-    /** 泥料编码 */
-    private String raw_material_code;
-
-    /** 设备编码 */
-    private String device_code;
-
-    /** 泥料编码 */
-    private String weight;
-
-    /** 工单号 */
-    private String workorder_code;
-
-    /** 物料id */
-    private String material_id;
-
-    /** 记录时间 */
-    private String record_time;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java
deleted file mode 100644
index 90fff91..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.residue.service.dto;
-
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue;
-
-/**
-* @author lyd
-* @date 2023-07-28
-**/
-public class PdmBdMaterialResidueQuery extends BaseQuery<PdmBdMaterialResidue> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java
deleted file mode 100644
index 30cde5e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.nl.wms.pdm.residue.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest;
-import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService;
-import org.nl.wms.pdm.residue.service.dao.mapper.PdmBdMaterialResidueMapper;
-import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务实现
-* @author lyd
-* @date 2023-07-28
-**/
-@Slf4j
-@Service
-public class PdmBdMaterialResidueServiceImpl extends ServiceImpl<PdmBdMaterialResidueMapper, PdmBdMaterialResidue> implements IPdmBdMaterialResidueService {
-
-    @Autowired
-    private PdmBdMaterialResidueMapper pdmBdMaterialResidueMapper;
-
-    @Override
-    public IPage<PdmBdMaterialResidue> queryAll(Map whereJson, PageQuery page){
-        LambdaQueryWrapper<PdmBdMaterialResidue> lam = new LambdaQueryWrapper<>();
-        IPage<PdmBdMaterialResidue> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pdmBdMaterialResidueMapper.selectPage(pages, lam);
-        return pages;
-    }
-
-    @Override
-    public void create(PdmBdMaterialResidue entity) {
-        entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setRecord_time(DateUtil.now());
-        pdmBdMaterialResidueMapper.insert(entity);
-    }
-
-    @Override
-    public void update(PdmBdMaterialResidue entity) {
-        PdmBdMaterialResidue dto = pdmBdMaterialResidueMapper.selectById(entity.getRecord_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
-        String now = DateUtil.now();
-        entity.setRecord_time(now);
-
-        pdmBdMaterialResidueMapper.updateById(entity);
-    }
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        pdmBdMaterialResidueMapper.deleteBatchIds(ids);
-    }
-
-    @Override
-    public void addByApplyTaskRequest(ApplyTaskRequest applyTaskRequest) {
-
-    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java
index 8cdde2c..703da4b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java
@@ -16,6 +16,7 @@ import org.nl.wms.pdm.subpackage.service.dto.SubPackageQuery;
 public interface IPdmBiSubpackagerelationService extends IService<PdmBiSubpackagerelation> {
 
     /**
+     * 分页查询
      * @param query /
      * @param page /
      * @return /
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java
index 099d0aa..51880c8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java
@@ -20,6 +20,12 @@ import java.util.Map;
  */
 public interface PdmBiSubpackagerelationMapper extends BaseMapper<PdmBiSubpackagerelation> {
 
+    /**
+     * 分页查询
+     * @param query 查询条件
+     * @param pageQuery 分页工具
+     * @return List<Map>
+     */
     List<Map> getPageQuery(@Param("query") SubPackageQuery query, @Param("pageQuery") PageQuery pageQuery);
 
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java
index 5c2fa0a..7ebdea6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java
@@ -8,7 +8,8 @@ import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation;
 
 import java.util.List;
 
-/*
+/**
+ * 查询条件
  * @author LXY
  * @Date 2023/11/10 14:49
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/controller/PdmBdProductionProcessTrackingController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/controller/PdmBdProductionProcessTrackingController.java
deleted file mode 100644
index 60393eb..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/controller/PdmBdProductionProcessTrackingController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.nl.wms.pdm.track.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-/**
-* @author lyd
-* @date 2023-07-21
-**/
-@Slf4j
-@RestController
-@Api(tags = "生产过程跟踪表管理")
-@RequestMapping("/api/pdmBdProductionProcessTracking")
-public class PdmBdProductionProcessTrackingController {
-
-    @Autowired
-    private IPdmBdProductionProcessTrackingService pdmBdProductionProcessTrackingService;
-
-    @GetMapping
-    @Log("查询生产过程跟踪表")
-    @ApiOperation("查询生产过程跟踪表")
-    //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:list')")
-    public ResponseEntity<Object> query(PdmBdProductionProcessTrackingQuery query, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(pdmBdProductionProcessTrackingService
-                .queryAll(query,page)),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增生产过程跟踪表")
-    @ApiOperation("新增生产过程跟踪表")
-    //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PdmBdProductionProcessTracking entity){
-        pdmBdProductionProcessTrackingService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改生产过程跟踪表")
-    @ApiOperation("修改生产过程跟踪表")
-    //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PdmBdProductionProcessTracking entity){
-        pdmBdProductionProcessTrackingService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除生产过程跟踪表")
-    @ApiOperation("删除生产过程跟踪表")
-    //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        pdmBdProductionProcessTrackingService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java
deleted file mode 100644
index 7e23c06..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.nl.wms.pdm.track.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务接口
-* @author lyd
-* @date 2023-07-21
-**/
-public interface IPdmBdProductionProcessTrackingService extends IService<PdmBdProductionProcessTracking> {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param pageable 分页参数
-    * @return IPage<PdmBdProductionProcessTracking>
-    */
-    IPage<PdmBdProductionProcessTracking> queryAll(PdmBdProductionProcessTrackingQuery whereJson, PageQuery pageable);
-
-    /**
-    * 创建
-    * @param entity /
-    */
-    void create(PdmBdProductionProcessTracking entity);
-
-    /**
-    * 编辑
-    * @param entity /
-    */
-    void update(PdmBdProductionProcessTracking entity);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Set<String> ids);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java
deleted file mode 100644
index efa1b22..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.nl.wms.pdm.track.service.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-21
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("pdm_bd_production_process_tracking")
-public class PdmBdProductionProcessTracking implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "process_id", type = IdType.NONE)
-    @ApiModelProperty(value = "跟踪标识")
-    private String process_id;
-
-    @ApiModelProperty(value = "记录时间")
-    private String record_time;
-
-    @ApiModelProperty(value = "动作")
-    private String process_action;
-
-    @ApiModelProperty(value = "地点")
-    private String process_location;
-
-    @ApiModelProperty(value = "链路id")
-    private String buss_move_id;
-    @TableField(exist = false)
-    private String vehicle_code;
-    @TableField(exist = false)
-    private String point_name;
-    @TableField(exist = false)
-    private String device_code;
-    @TableField(exist = false)
-    private String material_code;
-    @TableField(exist = false)
-    private String material_name;
-    @TableField(exist = false)
-    private String pcsn;
-    @TableField(exist = false)
-    private String half_material_code;
-    @TableField(exist = false)
-    private String raw_material_code;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java
deleted file mode 100644
index ece735f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.pdm.track.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery;
-
-/**
-* @author lyd
-* @date 2023-07-21
-**/
-public interface PdmBdProductionProcessTrackingMapper extends BaseMapper<PdmBdProductionProcessTracking> {
-
-    IPage<PdmBdProductionProcessTracking> selectPageLeftJoin(IPage<PdmBdProductionProcessTracking> pages,
-                                                             PdmBdProductionProcessTrackingQuery query);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml
deleted file mode 100644
index 676f341..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pdm.track.service.dao.mapper.PdmBdProductionProcessTrackingMapper">
-
-    <select id="selectPageLeftJoin" resultType="org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking">
-        SELECT
-            pt.*,
-            vg.vehicle_code,
-            p.point_name,
-            vg.pcsn,
-            w.point_code AS device_code,
-            m.material_code,
-            m.material_name,
-            m.half_material_code,
-            m.raw_material_code
-        FROM
-            `pdm_bd_production_process_tracking` pt
-                LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.buss_move_id = pt.buss_move_id
-                LEFT JOIN sch_base_point p ON p.point_code = pt.process_location
-                LEFT JOIN pdm_bd_workorder w ON w.workorder_code = vg.workorder_code
-                LEFT JOIN md_base_material m ON m.material_id = vg.material_id
-        <where>
-            <if test="query.buss_move_id != null">
-                AND pt.buss_move_id = #{query.buss_move_id}
-            </if>
-            <if test="query.end_time != null">
-                AND pt.record_time <![CDATA[<=]]> #{query.end_time}
-            </if>
-            <if test="query.begin_time != null">
-                AND pt.record_time <![CDATA[>=]]> #{query.begin_time}
-            </if>
-        </where>
-        ORDER BY pt.buss_move_id, pt.record_time
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingDto.java
deleted file mode 100644
index 9d246c5..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingDto.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.nl.wms.pdm.track.service.dto;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-21
-**/
-@Data
-public class PdmBdProductionProcessTrackingDto implements Serializable {
-
-    /** 跟踪标识 */
-    private String process_id;
-
-    /** 记录时间 */
-    private String record_time;
-
-    /** 动作 */
-    private String process_action;
-
-    /** 地点 */
-    private String process_location;
-
-    /** 链路id */
-    private String buss_move_id;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingQuery.java
deleted file mode 100644
index 25e68fa..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dto/PdmBdProductionProcessTrackingQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.pdm.track.service.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-* @author lyd
-* @date 2023-07-21
-**/
-@Data
-public class PdmBdProductionProcessTrackingQuery implements Serializable {
-    private String buss_move_id;
-    private String begin_time;
-    private String end_time;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/impl/PdmBdProductionProcessTrackingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/impl/PdmBdProductionProcessTrackingServiceImpl.java
deleted file mode 100644
index 1f109fd..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/impl/PdmBdProductionProcessTrackingServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.nl.wms.pdm.track.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.track.service.dao.mapper.PdmBdProductionProcessTrackingMapper;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务实现
-* @author lyd
-* @date 2023-07-21
-**/
-@Slf4j
-@Service
-public class PdmBdProductionProcessTrackingServiceImpl extends ServiceImpl<PdmBdProductionProcessTrackingMapper, PdmBdProductionProcessTracking> implements IPdmBdProductionProcessTrackingService {
-
-    @Autowired
-    private PdmBdProductionProcessTrackingMapper pdmBdProductionProcessTrackingMapper;
-
-    @Override
-    public IPage<PdmBdProductionProcessTracking> queryAll(PdmBdProductionProcessTrackingQuery query, PageQuery page){
-        IPage<PdmBdProductionProcessTracking> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = pdmBdProductionProcessTrackingMapper.selectPageLeftJoin(pages, query);
-        return pages;
-    }
-
-    @Override
-    public void create(PdmBdProductionProcessTracking entity) {
-        entity.setProcess_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        pdmBdProductionProcessTrackingMapper.insert(entity);
-    }
-
-    @Override
-    public void update(PdmBdProductionProcessTracking entity) {
-        PdmBdProductionProcessTracking dto = pdmBdProductionProcessTrackingMapper.selectById(entity.getProcess_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
-
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
-        String now = DateUtil.now();
-
-        pdmBdProductionProcessTrackingMapper.updateById(entity);
-    }
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        pdmBdProductionProcessTrackingMapper.deleteBatchIds(ids);
-    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java
deleted file mode 100644
index faefb0e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/controller/PdmBdVehicleBindingController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService;
-import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-import java.util.Set;
-/**
-* @author lyd
-* @date 2023-07-31
-**/
-@Slf4j
-@RestController
-@Api(tags = "分拣载具关联记录管理")
-@RequestMapping("/api/pdmBdVehicleBinding")
-public class PdmBdVehicleBindingController {
-
-    @Autowired
-    private IPdmBdVehicleBindingService pdmBdVehicleBindingService;
-
-    @GetMapping
-    @Log("查询分拣载具关联记录")
-    @ApiOperation("查询分拣载具关联记录")
-    //@SaCheckPermission("@el.check('pdmBdVehicleBinding:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(pdmBdVehicleBindingService.queryAll(whereJson,page)),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增分拣载具关联记录")
-    @ApiOperation("新增分拣载具关联记录")
-    //@SaCheckPermission("@el.check('pdmBdVehicleBinding:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody PdmBdVehicleBinding entity){
-        pdmBdVehicleBindingService.create(entity);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改分拣载具关联记录")
-    @ApiOperation("修改分拣载具关联记录")
-    //@SaCheckPermission("@el.check('pdmBdVehicleBinding:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody PdmBdVehicleBinding entity){
-        pdmBdVehicleBindingService.update(entity);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除分拣载具关联记录")
-    @ApiOperation("删除分拣载具关联记录")
-    //@SaCheckPermission("@el.check('pdmBdVehicleBinding:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
-        pdmBdVehicleBindingService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java
deleted file mode 100644
index 5b93bf1..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/IPdmBdVehicleBindingService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务接口
-* @author lyd
-* @date 2023-07-31
-**/
-public interface IPdmBdVehicleBindingService extends IService<PdmBdVehicleBinding> {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param pageable 分页参数
-    * @return IPage<PdmBdVehicleBinding>
-    */
-    IPage<PdmBdVehicleBinding> queryAll(Map whereJson, PageQuery pageable);
-
-    /**
-    * 创建
-    * @param entity /
-    */
-    void create(PdmBdVehicleBinding entity);
-
-    /**
-    * 编辑
-    * @param entity /
-    */
-    void update(PdmBdVehicleBinding entity);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Set<String> ids);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java
deleted file mode 100644
index d95462d..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/PdmBdVehicleBinding.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-31
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("pdm_bd_vehicle_binding")
-public class PdmBdVehicleBinding implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "associate_id", type = IdType.NONE)
-    @ApiModelProperty(value = "对应标识")
-    private String associate_id;
-
-    @ApiModelProperty(value = "源载具编码")
-    private String origin_vehicle_code;
-
-    @ApiModelProperty(value = "源载具类型")
-    private String origin_vehicle_type;
-
-    @ApiModelProperty(value = "目标载具编码")
-    private String target_vehicle_code;
-
-    @ApiModelProperty(value = "目标载具类型")
-    private String target_vehicle_type;
-
-    @ApiModelProperty(value = "源当前物料数量")
-    private String origin_qty;
-
-    @ApiModelProperty(value = "目标当前物料数量")
-    private String target_qty;
-
-    @ApiModelProperty(value = "取货点")
-    private String get_station;
-
-    @ApiModelProperty(value = "放货点")
-    private String put_station;
-
-    @ApiModelProperty(value = "工单号")
-    private String order_code;
-
-    @ApiModelProperty(value = "记录时间")
-    private String record_time;
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java
deleted file mode 100644
index b3d37a9..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
-
-/**
-* @author lyd
-* @date 2023-07-31
-**/
-public interface PdmBdVehicleBindingMapper extends BaseMapper<PdmBdVehicleBinding> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml
deleted file mode 100644
index bc73a08..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dao/mapper/PdmBdVehicleBindingMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.pdm.vehiclebiding.service.dao.mapper.PdmBdVehicleBindingMapper">
-
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java
deleted file mode 100644
index a0808ab..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service.dto;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
-* @description /
-* @author lyd
-* @date 2023-07-31
-**/
-@Data
-public class PdmBdVehicleBindingDto implements Serializable {
-
-    /** 对应标识 */
-    private String associate_id;
-
-    /** 源载具编码 */
-    private String origin_vehicle_code;
-
-    /** 源载具类型 */
-    private String origin_vehicle_type;
-
-    /** 目标载具编码 */
-    private String target_vehicle_code;
-
-    /** 目标载具类型 */
-    private String target_vehicle_type;
-
-    /** 源当前物料数量 */
-    private String origin_qty;
-
-    /** 目标当前物料数量 */
-    private String target_qty;
-
-    /** 取货点 */
-    private String get_station;
-
-    /** 放货点 */
-    private String put_station;
-
-    /** 工单号 */
-    private String order_code;
-
-    /** 记录时间 */
-    private String record_time;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java
deleted file mode 100644
index e2b5584..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/dto/PdmBdVehicleBindingQuery.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service.dto;
-
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
-
-/**
-* @author lyd
-* @date 2023-07-31
-**/
-public class PdmBdVehicleBindingQuery extends BaseQuery<PdmBdVehicleBinding> {
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java
deleted file mode 100644
index 5942ca8..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.nl.wms.pdm.vehiclebiding.service.impl;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.exception.BadRequestException;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.pdm.vehiclebiding.service.IPdmBdVehicleBindingService;
-import org.nl.wms.pdm.vehiclebiding.service.dao.mapper.PdmBdVehicleBindingMapper;
-import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
-* @description 服务实现
-* @author lyd
-* @date 2023-07-31
-**/
-@Slf4j
-@Service
-public class PdmBdVehicleBindingServiceImpl extends ServiceImpl<PdmBdVehicleBindingMapper, PdmBdVehicleBinding> implements IPdmBdVehicleBindingService {
-
-    @Autowired
-    private PdmBdVehicleBindingMapper pdmBdVehicleBindingMapper;
-
-    @Override
-    public IPage<PdmBdVehicleBinding> queryAll(Map whereJson, PageQuery page){
-        LambdaQueryWrapper<PdmBdVehicleBinding> lam = new LambdaQueryWrapper<>();
-        IPage<PdmBdVehicleBinding> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pdmBdVehicleBindingMapper.selectPage(pages, lam);
-        return pages;
-    }
-
-    @Override
-    public void create(PdmBdVehicleBinding entity) {
-        String now = DateUtil.now();
-        entity.setAssociate_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        entity.setRecord_time(now);
-        pdmBdVehicleBindingMapper.insert(entity);
-    }
-
-    @Override
-    public void update(PdmBdVehicleBinding entity) {
-        PdmBdVehicleBinding dto = pdmBdVehicleBindingMapper.selectById(entity.getAssociate_id());
-        if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
-        String now = DateUtil.now();
-        entity.setRecord_time(now);
-
-        pdmBdVehicleBindingMapper.updateById(entity);
-    }
-
-    @Override
-    public void deleteAll(Set<String> ids) {
-        // 真删除
-        pdmBdVehicleBindingMapper.deleteBatchIds(ids);
-    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
deleted file mode 100644
index f956540..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.nl.wms.report.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.base.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.logging.annotation.Log;
-import org.nl.wms.report.service.ReportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 报表管理
- * @Date: 2023/7/21
- */
-@Slf4j
-@RestController
-@Api(tags = "报表管理")
-@RequestMapping("/api/report")
-public class ReportController {
-
-    @Autowired
-    private ReportService reportService;
-
-    @GetMapping("/mudTransfer")
-    @Log("泥料转运记录表")
-    @ApiOperation("泥料转运记录表")
-    public ResponseEntity<Object> mudTransfer(JSONObject json, PageQuery page){
-//        return new ResponseEntity<>(TableDataInfo.build(reportService.mudTransfer(json,page)), HttpStatus.OK);
-        return null;
-    }
-
-    @GetMapping("/inventoryAlert")
-    @Log("库存物料提示记录表")
-    @ApiOperation("库存物料提示记录表")
-    public ResponseEntity<Object> inventoryAlert(JSONObject json, PageQuery page){
-//        return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryAlert(json,page)), HttpStatus.OK);
-        return null;
-    }
-
-    @GetMapping("/intoKilnReport")
-    @Log("入窑记录报表")
-    @ApiOperation("入窑记录报表")
-    public ResponseEntity<Object> intoKilnReport(Map json, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(reportService.intoKilnReport(json,page)), HttpStatus.OK);
-    }
-    @GetMapping("/outKilnReport")
-    @Log("出窑窑记录报表")
-    @ApiOperation("出窑窑记录报表")
-    public ResponseEntity<Object> outKilnReport(Map json, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json,page)), HttpStatus.OK);
-    }
-    @GetMapping("/inKilnReport")
-    @Log("窑内物料实时报表")
-    @ApiOperation("窑内物料实时报表")
-    public ResponseEntity<Object> inKilnReport(Map json, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(reportService.inKilnReport(json,page)), HttpStatus.OK);
-    }
-
-    @GetMapping("/inventoryMaterialTimeoutWarning")
-    @Log("库存物料超时提示")
-    @ApiOperation("库存物料超时提示")
-    public ResponseEntity<Object> inventoryMaterialTimeoutWarning(Map json, PageQuery page){
-        return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryMaterialTimeoutWarning(json,page)), HttpStatus.OK);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java
deleted file mode 100644
index 24d2201..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.nl.wms.report.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.report.service.dao.vo.IOKilnReportVo;
-import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2023/7/21
- */
-public interface ReportService {
-    IPage<IOKilnReportVo> intoKilnReport(Map json, PageQuery page);
-
-    IPage<IOKilnReportVo> outKilnReport(Map json, PageQuery page);
-
-    IPage<IOKilnReportVo> inKilnReport(Map json, PageQuery page);
-
-    /**
-     * 物料警告
-     * @param json
-     * @param page
-     * @return
-     */
-    IPage<MaterialTimeoutVo> inventoryMaterialTimeoutWarning(Map json, PageQuery page);
-
-//    IPage<> mudTransfer(JSONObject json, PageQuery page);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java
deleted file mode 100644
index ed0fae3..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.report.service.dao.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.nl.wms.report.service.dao.vo.IOKilnReportVo;
-import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo;
-
-/**
- * @Author: lyd
- * @Description: 报表mapper
- * @Date: 2023/7/21
- */
-public interface ReportMapper {
-    IPage<IOKilnReportVo> intoKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject query);
-
-    IPage<IOKilnReportVo> outKilnReportByPage(IPage<IOKilnReportVo> pages, JSONObject object);
-
-    IPage<IOKilnReportVo> inKilnReport(IPage<IOKilnReportVo> pages, JSONObject object);
-
-    IPage<MaterialTimeoutVo> inventoryMaterialTimeoutWarning(IPage<MaterialTimeoutVo> pages, JSONObject object);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml
deleted file mode 100644
index dd80b74..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.report.service.dao.mapper.ReportMapper">
-    <select id="intoKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
-        SELECT
-            vg.into_kiln_time,
-            vg.out_kiln_time,
-            vg.vehicle_code,
-            vg.pcsn,
-            vg.material_qty,
-            m.material_code,
-            m.material_name
-        FROM
-            `sch_base_vehiclematerialgroup` vg
-                LEFT JOIN md_base_material m ON m.material_id = vg.material_id
-        WHERE vg.into_kiln_time IS NOT NULL
-    </select>
-    <select id="outKilnReportByPage" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
-        SELECT
-            vg.into_kiln_time,
-            vg.out_kiln_time,
-            vg.vehicle_code,
-            vg.pcsn,
-            vg.material_qty,
-            m.material_code,
-            m.material_name
-        FROM
-            `sch_base_vehiclematerialgroup` vg
-                LEFT JOIN md_base_material m ON m.material_id = vg.material_id
-        WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NOT NULL
-    </select>
-    <select id="inKilnReport" resultType="org.nl.wms.report.service.dao.vo.IOKilnReportVo">
-        SELECT
-            vg.into_kiln_time,
-            vg.vehicle_code,
-            vg.pcsn,
-            vg.material_qty,
-            m.material_code,
-            m.material_name
-        FROM
-            `sch_base_vehiclematerialgroup` vg
-                LEFT JOIN md_base_material m ON m.material_id = vg.material_id
-        WHERE vg.into_kiln_time IS NOT NULL AND vg.out_kiln_time IS NULL
-    </select>
-    <select id="inventoryMaterialTimeoutWarning"
-            resultType="org.nl.wms.report.service.dao.vo.MaterialTimeoutVo">
-        SELECT
-        p.point_code,
-        p.point_name,
-        p.region_name,
-        ma.material_code,
-        ma.material_name,
-        vg.instorage_time
-        FROM
-        `sch_base_point` p
-        LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.vehicle_code = p.vehicle_code
-        AND vg.vehicle_type = p.vehicle_type AND vg.group_bind_material_status = '2'
-        LEFT JOIN md_base_material ma ON ma.material_id = vg.material_id
-        WHERE p.region_code = 'GTPHC'
-        AND p.point_type = '2'
-        AND p.point_status = '3'
-        AND vg.instorage_time <![CDATA[<=]]> DATE_SUB(NOW(), INTERVAL 30 DAY)
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java
deleted file mode 100644
index 5674fc1..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nl.wms.report.service.dao.vo;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 出入窑记录报表
- * @Date: 2023/8/1
- */
-@Data
-public class IOKilnReportVo {
-    private String into_kiln_time;
-    private String out_kiln_time;
-    private String vehicle_code;
-    private String pcsn;
-    private String material_qty;
-    private String material_code;
-    private String material_name;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/MaterialTimeoutVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/MaterialTimeoutVo.java
deleted file mode 100644
index dc513f3..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/MaterialTimeoutVo.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.nl.wms.report.service.dao.vo;
-
-import lombok.Data;
-
-/**
- * @Author: lyd
- * @Description: 入库物料过久没动提示VO
- * @Date: 2023/8/9
- */
-@Data
-public class MaterialTimeoutVo {
-    private String point_code;
-    private String point_name;
-    private String region_name;
-    private String material_code;
-    private String material_name;
-    private String instorage_time;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java
deleted file mode 100644
index 3ebbfda..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.nl.wms.report.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.report.service.ReportService;
-import org.nl.wms.report.service.dao.mapper.ReportMapper;
-import org.nl.wms.report.service.dao.vo.IOKilnReportVo;
-import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @Author: lyd
- * @Description: 报表实现类
- * @Date: 2023/7/21
- */
-@Slf4j
-@Service
-public class ReportServiceImpl implements ReportService {
-    @Autowired
-    private ReportMapper reportMapper;
-    @Override
-    public IPage<IOKilnReportVo> intoKilnReport(Map query, PageQuery page) {
-        IPage<IOKilnReportVo> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = reportMapper.intoKilnReportByPage(pages, new JSONObject(query));
-        return pages;
-    }
-
-    @Override
-    public IPage<IOKilnReportVo> outKilnReport(Map query, PageQuery page) {
-        IPage<IOKilnReportVo> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = reportMapper.outKilnReportByPage(pages, new JSONObject(query));
-        return pages;
-    }
-
-    @Override
-    public IPage<IOKilnReportVo> inKilnReport(Map query, PageQuery page) {
-        IPage<IOKilnReportVo> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = reportMapper.inKilnReport(pages, new JSONObject(query));
-        return pages;
-    }
-
-    @Override
-    public IPage<MaterialTimeoutVo> inventoryMaterialTimeoutWarning(Map query, PageQuery page) {
-        IPage<MaterialTimeoutVo> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = reportMapper.inventoryMaterialTimeoutWarning(pages, new JSONObject(query));
-        return pages;
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
index 9b03915..0d83fb5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java
@@ -34,7 +34,6 @@ public class SchBaseVehiclematerialgroupController {
     @GetMapping
     @Log("查询组盘信息管理")
     @ApiOperation("查询组盘信息管理")
-    //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:list')")
     public ResponseEntity<Object> query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService
                 .queryAll(whereJson,page)),HttpStatus.OK);
@@ -43,7 +42,6 @@ public class SchBaseVehiclematerialgroupController {
     @PostMapping
     @Log("新增组盘信息管理")
     @ApiOperation("新增组盘信息管理")
-    //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseVehiclematerialgroup entity){
         schBaseVehiclematerialgroupService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -52,7 +50,6 @@ public class SchBaseVehiclematerialgroupController {
     @PutMapping
     @Log("修改组盘信息管理")
     @ApiOperation("修改组盘信息管理")
-    //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseVehiclematerialgroup entity){
         schBaseVehiclematerialgroupService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -60,7 +57,6 @@ public class SchBaseVehiclematerialgroupController {
 
     @Log("删除组盘信息管理")
     @ApiOperation("删除组盘信息管理")
-    //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         schBaseVehiclematerialgroupService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
index f1d1122..9579533 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.java
@@ -12,9 +12,25 @@ import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
 **/
 public interface SchBaseVehiclematerialgroupMapper extends BaseMapper<SchBaseVehiclematerialgroup> {
 
+    /**
+     * 分页查询
+     * @param pages 、
+     * @param query 查询条件
+     * @return IPage<SchBaseVehiclematerialgroup>
+     */
     IPage<SchBaseVehiclematerialgroup> selectPageLeftJoin(IPage<SchBaseVehiclematerialgroup> pages, SchBaseVehiclematerialgroupQuery query);
 
+    /**
+     * 获取组盘信息
+     * @param entity 、
+     * @return SchBaseVehiclematerialgroup 实体类
+     */
     SchBaseVehiclematerialgroup getGroup(JSONObject entity);
 
+    /**
+     * 获取物料嘻嘻
+     * @param materialId 物料id
+     * @return int 数字
+     */
     int getInventoryQtyByMaterialId(String materialId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java
index 1e3fa7b..2bd2919 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java
@@ -32,7 +32,6 @@ public class SchBaseAcsandlmsinteractivelogController {
     @GetMapping
     @Log("查询ACS和LMS交互日志表")
     @ApiOperation("查询ACS和LMS交互日志表")
-    //@SaCheckPermission("@el.check('schBaseAcsandlmsinteractivelog:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBaseAcsandlmsinteractivelogService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class SchBaseAcsandlmsinteractivelogController {
     @PostMapping
     @Log("新增ACS和LMS交互日志表")
     @ApiOperation("新增ACS和LMS交互日志表")
-    //@SaCheckPermission("@el.check('schBaseAcsandlmsinteractivelog:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseAcsandlmsinteractivelog entity){
         schBaseAcsandlmsinteractivelogService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class SchBaseAcsandlmsinteractivelogController {
     @PutMapping
     @Log("修改ACS和LMS交互日志表")
     @ApiOperation("修改ACS和LMS交互日志表")
-    //@SaCheckPermission("@el.check('schBaseAcsandlmsinteractivelog:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseAcsandlmsinteractivelog entity){
         schBaseAcsandlmsinteractivelogService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class SchBaseAcsandlmsinteractivelogController {
 
     @Log("删除ACS和LMS交互日志表")
     @ApiOperation("删除ACS和LMS交互日志表")
-    //@SaCheckPermission("@el.check('schBaseAcsandlmsinteractivelog:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         schBaseAcsandlmsinteractivelogService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
index 7816527..8df449b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
@@ -35,7 +35,6 @@ public class SchBasePointController {
     @GetMapping
     @Log("查询点位管理")
     @ApiOperation("查询点位管理")
-    //@SaCheckPermission("@el.check('schBasePoint:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBasePointService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -43,7 +42,6 @@ public class SchBasePointController {
     @PostMapping
     @Log("新增点位管理")
     @ApiOperation("新增点位管理")
-    //@SaCheckPermission("@el.check('schBasePoint:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBasePoint entity){
         schBasePointService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -52,7 +50,6 @@ public class SchBasePointController {
     @PutMapping
     @Log("修改点位管理")
     @ApiOperation("修改点位管理")
-    //@SaCheckPermission("@el.check('schBasePoint:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBasePoint entity){
         schBasePointService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -60,7 +57,6 @@ public class SchBasePointController {
 
     @Log("删除点位管理")
     @ApiOperation("删除点位管理")
-    //@SaCheckPermission("@el.check('schBasePoint:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         schBasePointService.deleteAll(ids);
@@ -78,7 +74,6 @@ public class SchBasePointController {
     @PostMapping("/getPointList")
     @Log("获取区域下拉框")
     @ApiOperation("获取区域下拉框")
-    //@SaCheckPermission("@el.check('schBaseRegion:list')")
     public ResponseEntity<Object> getPointList(@RequestBody(required = false) SchBasePoint region){
         return new ResponseEntity<>(schBasePointService.getPointList(region),HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
index 16356a3..6f92559 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
@@ -137,7 +137,9 @@ public class SchBasePoint implements Serializable {
     @TableField(exist = false)
     private String point_status_name;
 
-    // 组盘标识
+    /**
+     * 组盘标识
+     */
     @TableField(exist = false)
     private String group_id;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index 182b4cb..973f7f7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -206,7 +206,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void lockPoint(List<SchBasePoint> list, String lock_ype) {
         list.forEach(row -> {
             row.setPoint_status(lock_ype);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java
index c9f7d90..9ca3089 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java
@@ -32,7 +32,6 @@ public class SchBaseRegionController {
     @GetMapping
     @Log("查询区域管理")
     @ApiOperation("查询区域管理")
-    //@SaCheckPermission("@el.check('schBaseRegion:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(regionService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class SchBaseRegionController {
     @PostMapping
     @Log("新增区域管理")
     @ApiOperation("新增区域管理")
-    //@SaCheckPermission("@el.check('schBaseRegion:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseRegion entity){
         regionService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class SchBaseRegionController {
     @PutMapping
     @Log("修改区域管理")
     @ApiOperation("修改区域管理")
-    //@SaCheckPermission("@el.check('schBaseRegion:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseRegion entity){
         regionService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class SchBaseRegionController {
 
     @Log("删除区域管理")
     @ApiOperation("删除区域管理")
-    //@SaCheckPermission("@el.check('schBaseRegion:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         regionService.deleteAll(ids);
@@ -67,7 +63,6 @@ public class SchBaseRegionController {
     @PostMapping("/getRegionList")
     @Log("获取区域下拉框")
     @ApiOperation("获取区域下拉框")
-    //@SaCheckPermission("@el.check('schBaseRegion:list')")
     public ResponseEntity<Object> getRegionList(@RequestBody(required = false) SchBaseRegion region){
         return new ResponseEntity<>(regionService.getRegionList(region),HttpStatus.OK);
     }
@@ -75,7 +70,6 @@ public class SchBaseRegionController {
     @PostMapping("/getPointStatusSelectById")
     @Log("获取点位状态下拉框")
     @ApiOperation("获取点位状态下拉框")
-    //@SaCheckPermission("region:add")
     public ResponseEntity<Object> getPointStatusSelectById(@RequestBody String region_id) {
         return new ResponseEntity<>(regionService.getPointStatusSelectById(region_id), HttpStatus.OK);
     }
@@ -83,7 +77,6 @@ public class SchBaseRegionController {
     @PostMapping("/getPointTypeSelectById")
     @Log("获取点位类型下拉框")
     @ApiOperation("获取点位类型下拉框")
-    //@SaCheckPermission("region:add")
     public ResponseEntity<Object> getPointTypeSelectById(@RequestBody String region_id) {
         return new ResponseEntity<>(regionService.getPointTypeSelectById(region_id), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
index 325c516..0a091cf 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java
@@ -44,12 +44,23 @@ public interface ISchBaseRegionService extends IService<SchBaseRegion> {
     void deleteAll(Set<String> ids);
 
     /**
-     * 区域下拉框
-     * @return
+     * 获取区域下拉框
+     * @param region
+     * @return List<SchBaseRegion>
      */
     List<SchBaseRegion> getRegionList(SchBaseRegion region);
 
+    /**
+     * 获取点位状态
+     * @param regionId
+     * @return JSONArray
+     */
     JSONArray getPointStatusSelectById(String regionId);
 
+    /**
+     * 获取点位类型
+     * @param regionId
+     * @return JSONArray
+     */
     JSONArray getPointTypeSelectById(String regionId);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
index 542094f..f678ae7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
@@ -36,7 +36,6 @@ public class SchBaseTaskController {
     @GetMapping
     @Log("查询任务管理")
     @ApiOperation("查询任务管理")
-    //@SaCheckPermission("@el.check('schBaseTask:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -44,7 +43,6 @@ public class SchBaseTaskController {
     @PostMapping
     @Log("新增任务管理")
     @ApiOperation("新增任务管理")
-    //@SaCheckPermission("@el.check('schBaseTask:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseTask entity){
         schBaseTaskService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -53,7 +51,6 @@ public class SchBaseTaskController {
     @PutMapping
     @Log("修改任务管理")
     @ApiOperation("修改任务管理")
-    //@SaCheckPermission("@el.check('schBaseTask:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTask entity){
         schBaseTaskService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -61,7 +58,6 @@ public class SchBaseTaskController {
 
     @Log("删除任务管理")
     @ApiOperation("删除任务管理")
-    //@SaCheckPermission("@el.check('schBaseTask:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         schBaseTaskService.deleteAll(ids);
@@ -72,7 +68,6 @@ public class SchBaseTaskController {
     @Log("任务状态下拉框")
     @ApiOperation("任务状态下拉框")
     @SaIgnore
-    //@SaCheckPermission("@el.check('schBaseTask:list')")
     public ResponseEntity<Object> getTaskStatusList(){
         return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.getTaskStatusList()),HttpStatus.OK);
     }
@@ -80,7 +75,6 @@ public class SchBaseTaskController {
     @PutMapping("/operation")
     @Log("任务操作")
     @ApiOperation("任务操作")
-    //@SaCheckPermission("task:edit")
     public ResponseEntity<Object> update(@RequestBody Map<String, Object> map) {
         schBaseTaskService.operation(map);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java
index 86f6b7c..2a3a319 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java
@@ -32,7 +32,6 @@ public class SchBaseTaskconfigController {
     @GetMapping
     @Log("查询任务配置")
     @ApiOperation("查询任务配置")
-    //@SaCheckPermission("@el.check('schBaseTaskconfig:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(schBaseTaskconfigService.queryAll(whereJson,page)),HttpStatus.OK);
     }
@@ -40,7 +39,6 @@ public class SchBaseTaskconfigController {
     @PostMapping
     @Log("新增任务配置")
     @ApiOperation("新增任务配置")
-    //@SaCheckPermission("@el.check('schBaseTaskconfig:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody SchBaseTaskconfig entity){
         schBaseTaskconfigService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -49,7 +47,6 @@ public class SchBaseTaskconfigController {
     @PutMapping
     @Log("修改任务配置")
     @ApiOperation("修改任务配置")
-    //@SaCheckPermission("@el.check('schBaseTaskconfig:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTaskconfig entity){
         schBaseTaskconfigService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -57,7 +54,6 @@ public class SchBaseTaskconfigController {
 
     @Log("删除任务配置")
     @ApiOperation("删除任务配置")
-    //@SaCheckPermission("@el.check('schBaseTaskconfig:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         schBaseTaskconfigService.deleteAll(ids);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
index 74daf38..61ded4d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java
@@ -71,14 +71,19 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
 
     /**
      * 根据任务配置查询同台设备未完成的任务列表
-     *
      * @param config_code 任务配置
      * @param device_code 设备
-     * @return
+     * @param direction
+     * @return List<SchBaseTask>
      */
     List<SchBaseTask> findUnFinishTasksByTaskConfig(String config_code, String device_code, String direction);
 
-
+    /**
+     * 根据状态查找
+     * @param config_code
+     * @param status
+     * @return List<SchBaseTask>
+     */
     List<SchBaseTask> findTasksByTaskStatus(String config_code, TaskStatus status);
 
     /**
@@ -101,5 +106,10 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
      */
     void operation(Map<String, Object> param);
 
+    /**
+     * 根据code查找
+     * @param taskCode 任务编码
+     * @return SchBaseTask
+     */
     SchBaseTask getByCode(String taskCode);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index 4b3cf40..6621a18 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
@@ -125,7 +125,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
         lam.eq(SchBaseTask::getConfig_code, config_code)
                 .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
-                .ne(SchBaseTask::getTask_code, task_code) // 不是当前任务
+                .ne(SchBaseTask::getTask_code, task_code)
                 .eq(SchBaseTask::getIs_delete, false);
         List<SchBaseTask> schBaseTasks = schBaseTaskMapper.selectList(lam);
         return schBaseTasks;
@@ -224,9 +224,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         JSONObject result;
         switch (method_name) {
             case "immediateNotifyAcs":
-                //
                 break;
-            case "forceFinish": // 强制完成
+            case "forceFinish":
                 abstractTask.forceFinish(task_code);
                 break;
             case "cancel":
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 34331dc..8f36c8f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -47,13 +47,14 @@ public abstract class AbstractTask {
     /**
      * 任务创建
      * 根据配置生成任务，如并发控制等
+     * @throws BadRequestException /
      */
     protected abstract void create() throws BadRequestException;
 
     /**
      * 任务创建
      * 只会创建完整的任务，创建失败则抛出异常
-     * @param task
+     * @param task /
      */
     protected void createCompletion(SchBaseTask task){}
 
@@ -114,7 +115,7 @@ public abstract class AbstractTask {
             resultForAcs.setMessage(e.getMessage());
         }
         // 如果下发完毕，就修改状态
-        if (resultForAcs.getCode() == 200) {
+        if (resultForAcs.getCode() == HttpStatus.HTTP_OK) {
             // 解析
             JSONArray errArr = resultForAcs.getErrArr();
             for (SchBaseTask schBaseTask : taskList) {
@@ -176,7 +177,12 @@ public abstract class AbstractTask {
 
     }
 
-    // 以下改为public会出现自动注入类出现问题
+    /**
+     * 修改状态
+     * 以下改为public会出现自动注入类出现问题
+     * @param task_code /
+     * @param status /
+     */
     protected abstract void updateStatus(String task_code, TaskStatus status);
 
 
@@ -207,6 +213,7 @@ public abstract class AbstractTask {
     }
 
     /**
+     *  强制结束完成任务
      * @param task_code 任务标识
      * @return
      * @discription 强制结束完成任务
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java
index a26b506..490873e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java
@@ -4,6 +4,14 @@ import lombok.Data;
 
 import java.util.Map;
 
+/**
+ * <p>
+ * 任务dto
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Data
 public class AcsTaskDto {
     /**
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
index 5ab35cc..34103d5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AutoCreateTask.java
@@ -15,6 +15,14 @@ import java.util.Map;
 import java.util.Set;
 
 
+/**
+ * <p>
+ * 自动创建任务
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 @Slf4j
 @Component
 @Order(value = 1)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
index 1e0c579..9643b50 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
@@ -11,11 +11,17 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum GroupStatusEnum {
+    // 系统外
     OUT_SYSTEM("1", "系统外"),
+    // 存储中
     IN_STORAGE("2", "存储中"),
+    // 处理中
     IN_PROCESS("3", "处理中"),
+    // 搬运中
     IN_CARRY("4", "搬运中"),
+    // 可放料
     DISCHARGE_MATERIAL("5", "可放料"),
+    // 可取料
     CABLE_RETRIEVABLE_MATERIAL("6", "可取料");
 
     private final String type;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/NoticeTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/NoticeTypeEnum.java
index 66756b0..1ea9009 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/NoticeTypeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/NoticeTypeEnum.java
@@ -12,8 +12,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum NoticeTypeEnum {
 
+    // 异常
     EXCEPTION("1", "异常"),
+    // 警告
     WARN("2", "警告"),
+    // 通知
     NOTIFICATION("3", "通知");
 
     private final String code;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointStatusEnum.java
index e92e1ef..e07927d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/PointStatusEnum.java
@@ -12,8 +12,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PointStatusEnum {
 
+    // 空位/无货
     EMPTY_POINT("1", "空位/无货"),
+    // 有料
     FULL_POINT("3", "有料"),
+    // 空载具/有货
     EMPTY_VEHICLE("2", "空载具/有货");
 
     private final String code;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/TaskFinishedTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/TaskFinishedTypeEnum.java
index d39dc1d..d732e39 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/TaskFinishedTypeEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/TaskFinishedTypeEnum.java
@@ -12,8 +12,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum TaskFinishedTypeEnum {
 
+    // ACS自动完成
     AUTO_ACS("1", "ACS自动完成"),
+    // PC手动完成
     MANUAL_PC("2", "PC手动完成"),
+    // PDA手持
     MANUAL_PDA("3", "PDA手持");
 
     private final String code;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderStatusEnum.java
index 035a895..0ffa420 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/WorkOrderStatusEnum.java
@@ -11,11 +11,18 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum WorkOrderStatusEnum {
+
+    // 未生产
     UNPRODUCED("1", "未生产"),
+    // 已下发
     ISSUED("2", "已下发"),
+    // 生产中
     PRODUCING("3", "生产中"),
+    // 暂停
     STOP("4", "暂停"),
+    // 完成
     COMPLETE("5", "完成");
+
     private final String code;
     private final String name;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java
index 8d79b4c..a3427f7 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java
@@ -16,7 +16,12 @@ import org.nl.wms.sch.task_manage.GeneralDefinition;
 import java.util.List;
 
 /**
+ * <p>
  * ACS连接工具类: 不允许直接操作结果，将其封装到ResultForAcs，由实现类操作
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 @Slf4j
 public class AcsUtil {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java
deleted file mode 100644
index 88856c7..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.nl.wms.sch.task_manage.task;
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java
deleted file mode 100644
index 6cb1295..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.nl.wms.sch.task_manage.task;
-
-import cn.hutool.core.lang.Assert;
-import com.alibaba.fastjson.JSONObject;
-import org.nl.common.exception.BadRequestException;
-
-/**
- * @author ldjun
- * @version 1.0
- * @date 2023年05月08日 13:59
- * @desc desc
- */
-public class TaskServiceImpl {
-    String create(JSONObject param) throws BadRequestException {
-
-
-        return null;
-    }
-
-    public void beforeToCreate(JSONObject param) throws BadRequestException {
-        String point_code = param.getString("point_code");
-        Assert.notEmpty(point_code, "点位编码为空!");
-        //1、查找点位
-        //2、校验点位是否启用
-        //3、校验点位是否自动
-        //4、任务类型
-
-
-    }
-
-    public void createAfter(JSONObject param) throws BadRequestException {
-
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java
deleted file mode 100644
index ee9e476..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.nl.wms.sch.task_manage.task.core;
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java
index 82a4a9e..0a009e1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java
@@ -8,9 +8,13 @@ package org.nl.wms.sch.task_manage.task.core;
  */
 
 public enum TaskApplyType {
+    // 送料
     SEND_MATERIAL(1, "送料", "送料"),
+    // 送空载具
     SEND_EMPTY(2, "送空载具", "送空载具"),
+    // 叫料
     CALL_MATERIAL(3, "叫料", "叫料"),
+    // 叫空载具
     CALL_EMPTY(4, "叫空载具", "叫空载具");
 
     TaskApplyType(int code, String name, String desc) {
@@ -19,10 +23,16 @@ public enum TaskApplyType {
         this.desc = desc;
     }
 
-    // 操作设备类型编码
+    /**
+     * 操作设备类型编码
+     */
     private int code;
-    // 操作设备类型名字
+    /**
+     * 操作设备类型名字
+     */
     private String name;
-    //操作设备类型类型
+    /**
+     * 操作设备类型类型
+     */
     private String desc;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java
deleted file mode 100644
index d9683df..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.nl.wms.sch.task_manage.task.core;
-
-/**
- * @author ldjun
- * @version 1.0
- * @date 2023年05月08日 13:41
- * @desc desc
- */
-public class TaskDto {
-    private String task_code;
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java
index ba2f756..044207e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java
@@ -1,13 +1,23 @@
 package org.nl.wms.sch.task_manage.task.core;
 
 /**
+ * <p>
  * 任务操作终端类型
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
  */
 public enum TaskOperateType {
+    // ACS
     ACS("1", "ACS", "ACS"),
+    // 创建完成
     PC("2", "PC", "创建完成"),
+    // 手持
     MOBILE("3", "手持", "手持"),
+    // 定时任务
     QUARTZ("4", "定时任务", "定时任务"),
+    // 其它"
     OTHER("5", "其它", "其它");
 
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java
index 02ef58d..eb3ad52 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java
@@ -1,14 +1,29 @@
 package org.nl.wms.sch.task_manage.task.core;
 
+/**
+ * <p>
+ * 任务状态枚举
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public enum TaskStatus {
-    APPLY("1", "申请", "申请"),
-    CREATED("2", "创建完成", "创建完成"),
-    ISSUED("3", "下发", "下发"),
-    EXECUTING("4", "执行中", "执行中"),
-    FINISHED("5", "完成", "完成"),
-    CANCELED("6", "已取消", "已取消"),
-    UNFINISHED("7", "未完成", "未完成");
 
+    // 申请
+    APPLY("1", "申请", "申请"),
+    // 创建完成
+    CREATED("2", "创建完成", "创建完成"),
+    // 下发
+    ISSUED("3", "下发", "下发"),
+    // 执行中
+    EXECUTING("4", "执行中", "执行中"),
+    // 完成
+    FINISHED("5", "完成", "完成"),
+    // 已取消
+    CANCELED("6", "已取消", "已取消"),
+    // 未完成
+    UNFINISHED("7", "未完成", "未完成");
 
     TaskStatus(String code, String name, String desc) {
         this.code = code;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
deleted file mode 100644
index 9a3e419..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
+++ /dev/null
@@ -1,164 +0,0 @@
-//package org.nl.wms.sch.task_manage.task.tasks.auto;
-//
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import org.nl.common.exception.BadRequestException;
-//import org.nl.system.service.param.ISysParamService;
-//import org.nl.system.service.param.dao.Param;
-//import org.nl.wms.pdm.service.IPdmBdWorkorderService;
-//import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-//import org.nl.wms.sch.point.service.ISchBasePointService;
-//import org.nl.wms.sch.point.service.dao.SchBasePoint;
-//import org.nl.wms.sch.task.service.ISchBaseTaskService;
-//import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-//import org.nl.wms.sch.task.service.dao.SchBaseTask;
-//import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-//import org.nl.wms.sch.task_manage.AbstractTask;
-//import org.nl.wms.sch.task_manage.GeneralDefinition;
-//import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-//import org.nl.wms.sch.task_manage.task.TaskType;
-//import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-//import org.nl.wms.util.PointUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Author: lyd
-// * @Description: 入窑口叫料
-// * @Date: 2023/6/19
-// */
-//@Component
-//@TaskType("RYKQLTask")
-//public class RYKQLTask extends AbstractTask {
-//    private static String TASK_CONFIG_CODE = "RYKQLTask";
-//    @Autowired
-//    private ISchBasePointService pointService;
-//    @Autowired
-//    private ISchBaseTaskService taskService;
-//    @Autowired
-//    private ISchBaseTaskconfigService taskConfigService;
-//    @Autowired
-//    private ISysParamService paramService;
-//    @Override
-//    protected void create() throws BadRequestException {
-//
-//    }
-//
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    protected void autoCreate() {
-//        // 自动创建任务
-//        Param autoKilnCall = paramService.findByCode(GeneralDefinition.AUTO_KILN_CALL);
-//        if (autoKilnCall.getValue().equals(GeneralDefinition.NO)) {
-//            return;
-//        }
-//        // 判断当前点位有没有任务执行
-//        List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(TASK_CONFIG_CODE);
-//        if (unFinishTasksByTaskConfig.size() > 0) {
-//            // 有任务在执行就不创建
-//            return;
-//        }
-//        // 获取任务配置
-//        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-//                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-//        // 创建任务
-//        SchBaseTask task = new SchBaseTask(); // 任务实体
-//        // 2、创建申请任务
-//        task.setConfig_code(TASK_CONFIG_CODE);
-//        task.setCreate_mode(GeneralDefinition.AUTO_CREATION);
-//        task.setTask_status(TaskStatus.APPLY.getCode());
-//        task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
-//        // 设置起/终点
-//        this.setTaskPoint(taskConfig, task, "RYK");
-//        // 找起点
-//        List<String> startRegionStr = Arrays
-//                .stream(taskConfig.getStart_region_str().split(","))
-//                .collect(Collectors.toList());
-//        SchBasePoint point = findStartPoint(startRegionStr);
-//        if (ObjectUtil.isEmpty(point)) {
-//            task.setRemark("未找到所需点位!");
-//            taskService.create(task);
-//            // 消息通知
-//            return;
-//        }
-//        // 设置终点并修改创建成功状态
-//        task.setPoint_code1(point.getPoint_code());
-//        task.setRemark("");
-//        task.setTask_status(TaskStatus.CREATED.getCode());
-//        taskService.create(task);
-//        point.setIng_task_code(task.getTask_code());
-//        pointService.update(point);
-//        //下发
-////            this.renotifyAcs(task);
-//    }
-//
-//    private SchBasePoint findStartPoint(List<String> startRegionStr) {
-//        // 无需工单
-//        // 默认认为缓存线有东西
-//        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-//        lam.in(SchBasePoint::getRegion_code, startRegionStr)
-//                .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) // 点位类型是缓存输送线出口
-//                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-//                        .or()
-//                        .eq(SchBasePoint::getIng_task_code, ""))
-//                .eq(SchBasePoint::getIs_used, true);
-//        List<SchBasePoint> schBasePoints = pointService.list(lam);
-//        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-//    }
-//
-//    @Override
-//    protected void updateStatus(String task_code, TaskStatus status) {
-//        // 校验任务
-//        SchBaseTask taskObj = taskService.getByCode(task_code);
-//        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        // 获取参数
-//        String startPoint = taskObj.getPoint_code1(); // 获取起点
-//        SchBasePoint startPointObj = pointService.getById(startPoint);
-//        // 根据传来的类型去对任务进行操作
-//        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-//            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-//            taskObj.setRemark("执行中");
-//        }
-//        if (status.equals(TaskStatus.FINISHED)) { // 完成
-//            // 起点解锁
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                startPointObj.setIng_task_code("");
-//                pointService.update(startPointObj);
-//            }
-//            // 任务完成
-//            taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-//            taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-//        }
-//        if (status.equals(TaskStatus.CANCELED)) { // 取消
-//            // 起点解锁
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                startPointObj.setIng_task_code("");
-//                pointService.update(startPointObj);
-//            }
-//            taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-//            taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-//        }
-//        taskService.update(taskObj);
-//    }
-//
-//    @Override
-//    public void forceFinish(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.FINISHED);
-//    }
-//
-//    @Override
-//    public void cancel(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.CANCELED);
-//    }
-//}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
deleted file mode 100644
index 6f82ee7..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.dtk;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.dtk.mapper.DTKMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 拆盘机呼叫空托
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("DTKQKTask")
-public class CTQKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "DTKQKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private DTKMapper dtkMapper;
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找起点
-            SchBasePoint point = findStartPoint(startRegionStr);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("暂无托盘！");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getPoint_code2(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
-            task.setRemark("");
-            task.setVehicle_qty(point.getVehicle_qty());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            taskService.updateById(task);
-            // 点位信息更新
-            point.setIng_task_code(task.getTask_code());
-            pointService.update(point);
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找起点
-        SchBasePoint point = findStartPoint(startRegionStr);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("拆盘机暂无托盘！", TASK_CONFIG_CODE + task.getPoint_code2(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置终点并修改创建成功状态
-        task.setPoint_code1(point.getPoint_code());
-        task.setRemark("");
-        task.setVehicle_qty(point.getVehicle_qty());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        taskService.save(task);
-        // 点位更新
-        point.setIng_task_code(task.getTask_code());
-        pointService.update(point);
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    /**
-     * 从区域中获取一推钢托盘
-     * @param startRegionStr
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr) {
-        // 钢托盘缓存区域的空盘是1 状态不同
-        List<SchBasePoint> points = dtkMapper.findPointForCTQK(startRegionStr);
-        return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
-        SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
-        // 起点清空
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            PointUtils.clearPoint(startPointObj);
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            endPointObj.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            endPointObj.setVehicle_qty(taskObj.getVehicle_qty());
-            endPointObj.setUpdate_time(DateUtil.now());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
-        // 起点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            pointService.updateById(startPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
deleted file mode 100644
index c39844e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.dtk;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.dtk.mapper.DTKMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 叠托送空盘任务：-> 货架
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("DTKSKTask")
-public class DTSKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "DTKSKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private DTKMapper dtkMapper;
-
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找终点
-            SchBasePoint point = findNextPoint(nextRegionStr);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getPoint_code1(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找终点
-        SchBasePoint point = findNextPoint(nextRegionStr);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("货架暂无货位存放空托盘！", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-
-    }
-
-    private SchBasePoint findNextPoint(List<String> nextRegionStr) {
-        List<SchBasePoint> points = dtkMapper.findPointForDTSK(nextRegionStr);
-        return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        String vehicleType = ObjectUtil.isNotEmpty(taskObj.getVehicle_type()) ? taskObj.getVehicle_type() : "";
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 设置载具类型、点位状态、释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            endPointObj.setVehicle_type(vehicleType);
-            endPointObj.setVehicle_qty(taskObj.getVehicle_qty()); // 设置载具数量
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-            // 起点清空
-            PointUtils.clearPoint(startPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.java
deleted file mode 100644
index 470304c..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.dtk.mapper;
-
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description: 叠托库mapper
- * @Date: 2023/6/21
- */
-public interface DTKMapper {
-    List<SchBasePoint> findPointForDTSK(List<String> regionCode);
-
-    /**
-     * 拆盘机找空盘
-     * @param regionCode
-     * @return
-     */
-    List<SchBasePoint> findPointForCTQK(List<String> regionCode);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml
deleted file mode 100644
index 6c68cdf..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.sch.task_manage.task.tasks.dtk.mapper.DTKMapper">
-    <select id="findPointForDTSK" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*
-        FROM
-            `sch_base_point` p
-        WHERE p.point_type = '1'
-          AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-          AND p.point_status = '1'
-          AND p.region_code IN
-          <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-              #{code}
-          </foreach>
-        ORDER BY
-            p.in_empty_seq ASC
-    </select>
-    <select id="findPointForCTQK" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT p.*
-        FROM `sch_base_point` p
-        WHERE (
-                (p.point_type = '1' AND p.region_code = #{regionCode[0]})
-            )
-          AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-          AND p.point_status = '2'
-          AND p.is_used = 1
-          AND p.region_code IN
-          <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-              #{code}
-          </foreach>
-        ORDER BY
-            p.out_empty_seq ASC
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
deleted file mode 100644
index 3a8bdfc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 分拣满空任务 - 4点
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("FJMLTask")
-public class FJMKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJMLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private FJMapper fjMapper;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private WmsToAcsService wmsToAcsService;
-
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            String requestParam = task.getRequest_param();// 任务的其他数据
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            String workOrderCode = jsonObject.getString("workorder_code"); // 工单
-            String startPoint = task.getPoint_code1();
-            // 获取起点 回写载具编码
-            SchBasePoint startPointObj = pointService.getById(startPoint);
-            task.setVehicle_code(startPointObj.getVehicle_code()); // 起点的木托盘编码
-            // 找终点
-            /** 包装位 */
-            SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(packagePoint)) {
-                task.setRemark("包装线不可用!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            task.setPoint_code2(packagePoint.getPoint_code()); // 包装线
-            // 大于等于2就可以码
-            if (jsonObject.getInteger("special_param") == 0) {
-                /** 覆膜机木托盘位 */
-                SchBasePoint LaminatePoint = findStartPoint(startRegionStr, jsonObject);
-                if (ObjectUtil.isEmpty(LaminatePoint)) {
-                    noticeService.createNotice("覆膜区不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                            NoticeTypeEnum.WARN.getCode());
-                    // 消息通知
-                    throw new BadRequestException("覆膜区不可用!");
-                }
-                // 把这个设备位放到任务中
-                JSONObject response = new JSONObject();
-                String responseParam = task.getResponse_param();
-                if (ObjectUtil.isNotEmpty(responseParam)) {
-                    response = JSON.parseObject(responseParam);
-                }
-                response.put("fmj_device", LaminatePoint.getPoint_code());
-                // 设置终点并修改创建成功状态
-                task.setPoint_code3(LaminatePoint.getParent_point_code());
-                task.setPoint_code4(startPoint);
-                task.setResponse_param(response.toJSONString());
-                // 覆膜机对接位上锁
-                SchBasePoint basePoint = pointService.getById(LaminatePoint.getParent_point_code());
-                basePoint.setIng_task_code(task.getTask_code());
-                PointUtils.setUpdateByAcs(basePoint);
-                pointService.updateById(basePoint);
-            }
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            taskService.save(task);
-            // 包装线上锁
-            packagePoint.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(packagePoint);
-            pointService.updateById(packagePoint);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param());
-        String startPoint = task.getPoint_code1();
-        // 找终点
-        /** 包装位 */
-        SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(packagePoint)) {
-            // 消息通知
-            noticeService.createNotice("包装线不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("包装线不可用!");
-        }
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        task.setPoint_code2(packagePoint.getPoint_code());
-        // 大于等于2就可以码
-        if (jsonObject.getInteger("special_param") == 0) {
-            /** 覆膜机木托盘位 */
-            SchBasePoint LaminatePoint = findStartPoint(startRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(LaminatePoint)) {
-                noticeService.createNotice("覆膜区不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                        NoticeTypeEnum.WARN.getCode());
-                // 消息通知
-                throw new BadRequestException("覆膜区不可用!");
-            }
-            // 把这个设备位放到任务中
-            JSONObject response = new JSONObject();
-            String responseParam = task.getResponse_param();
-            if (ObjectUtil.isNotEmpty(responseParam)) {
-                response = JSON.parseObject(responseParam);
-            }
-            response.put("fmj_device", LaminatePoint.getPoint_code());
-            // 设置终点并修改创建成功状态
-            task.setPoint_code3(LaminatePoint.getParent_point_code());
-            task.setPoint_code4(startPoint);
-            task.setResponse_param(response.toJSONString());
-            // 覆膜机对接位上锁
-            SchBasePoint basePoint = pointService.getById(LaminatePoint.getParent_point_code());
-            basePoint.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(basePoint);
-            pointService.updateById(basePoint);
-        }
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        taskService.save(task);
-        // 包装线上锁
-        packagePoint.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(packagePoint);
-        pointService.updateById(packagePoint);
-
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        return null;
-    }
-
-    /**
-     * 从覆膜区找个空木托盘
-     *
-     * @param startRegionStr
-     * @param extData
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extData) {
-        return null;
-    }
-
-    /**
-     * 从包装线找个位置放货
-     *
-     * @param nextRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject requestParam) {
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT)
-                .orderByAsc(SchBasePoint::getIn_order_seq)
-                .orderByAsc(SchBasePoint::getPoint_code);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    @Transactional
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 任务完成需要组盘,包装线解锁,覆膜对接位清空,分拣拆垛对接位设置空盘
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String bzxPoint = taskObj.getPoint_code2(); // 获取终点1
-        String fmPoint = taskObj.getPoint_code3(); // 获取起点2
-        SchBasePoint bzxPointObj = pointService.getById(bzxPoint);
-        SchBasePoint fmPointObj = pointService.getById(fmPoint);
-        if (ObjectUtil.isNotEmpty(bzxPointObj)) {
-            // 释放点位
-            bzxPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(bzxPointObj, taskFinishedType);
-            pointService.updateById(bzxPointObj);
-        }
-        if (ObjectUtil.isNotEmpty(fmPointObj)) {
-            fmPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(fmPointObj, taskFinishedType);
-            pointService.updateById(fmPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
deleted file mode 100644
index e10c837..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 分拣呼叫空木托盘任务 - 2点
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("FJQKTask")
-public class FJQKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJQKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private WmsToAcsService wmsToAcsService;
-    @Autowired
-    private FJMapper fjMapper;
-    @Override
-    @Transactional
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找起点
-            String requestParam = task.getRequest_param();
-            JSONObject extGroupData = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("覆膜机不可用!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getPoint_code2(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 将覆膜机设备放到任务中
-            String responseParam = task.getResponse_param();
-            JSONObject param = new JSONObject();
-            if (ObjectUtil.isNotEmpty(responseParam)) {
-                param = JSON.parseObject(responseParam);
-            }
-            // 把这个设备位放到任务中
-            param.put("fmj_device", point.getPoint_code());
-            // 设置起点并修改创建成功状态
-            task.setPoint_code1(point.getParent_point_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            // todo: 未确认是否放在1还是2，目前规定四点任务空盘的载具编码是2
-            task.setRemark("");
-            task.setGroup_id(point.getGroup_id());
-            task.setResponse_param(param.toJSONString());
-            taskService.updateById(task);
-
-            // 父点位锁住
-            SchBasePoint basePoint = pointService.getById(point.getParent_point_code());
-            basePoint.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(basePoint);
-            pointService.updateById(basePoint);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找起点
-        String requestParam = task.getRequest_param();
-        JSONObject extGroupData = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("覆膜机不可用!", TASK_CONFIG_CODE + task.getTask_code(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("覆膜机不可用!");
-        }
-        // 将覆膜机设备放到任务中
-        String responseParam = task.getResponse_param();
-        JSONObject param = new JSONObject();
-        if (ObjectUtil.isNotEmpty(responseParam)) {
-            param = JSON.parseObject(responseParam);
-        }
-        // 把这个设备位放到任务中
-        param.put("fmj_device", point.getPoint_code());
-        // 设置起点并修改创建成功状态
-        task.setPoint_code1(point.getParent_point_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setResponse_param(param.toJSONString());
-        // todo: 未确认是否放在1还是2，目前规定四点任务空盘的载具编码是2
-        task.setRemark("");
-        task.setGroup_id(point.getGroup_id());
-        taskService.save(task);
-
-        // 父点位锁住
-        SchBasePoint basePoint = pointService.getById(point.getParent_point_code());
-        basePoint.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(basePoint);
-        pointService.updateById(basePoint);
-    }
-
-    /**
-     * 找到的是覆膜机设备位置,父位才是对接位
-     * @param startRegionStr
-     * @param extGroupData
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-    }
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 载具编码：前面需要根据任务判断，没有载具不能生成任务
-        String startPoint = taskObj.getPoint_code1(); // 获取终点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            pointService.updateById(startPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
deleted file mode 100644
index dbe8d0e..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 分拣缺料任务
- * @Date: 2023/6/20
- */
-@Component
-@TaskType("FJQLTask")
-public class FJQLTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJQLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private FJMapper fjMapper;
-
-    @Autowired
-    private IPdmBdProductionProcessTrackingService processTrackingService;
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            // 钢托盘
-            task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找起点
-            String requestParam = task.getRequest_param();
-            JSONObject extGroupData = JSONObject.parseObject(requestParam);
-            extGroupData.put("vehicle_type", task.getVehicle_type());
-            SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("钢托盘缓存货架没有所需物料!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置起点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setVehicle_code(point.getVehicle_code());
-            task.setGroup_id(point.getGroup_id());
-            task.setRemark("");
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        // 钢托盘
-        task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找起点
-        String requestParam = task.getRequest_param();
-        JSONObject extGroupData = JSONObject.parseObject(requestParam);
-        extGroupData.put("vehicle_type", task.getVehicle_type());
-        SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("钢托盘缓存货架没有所需物料!", TASK_CONFIG_CODE + task.getPoint_code2(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置起点并修改创建成功状态
-        task.setPoint_code1(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setVehicle_code(point.getVehicle_code());
-        task.setGroup_id(point.getGroup_id());
-        task.setRemark("");
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    /**
-     * 找起点：到钢托盘缓存找一个物料与分拣工单的物料相同的物料
-     * 还需要判断是否烧制，选择已经烧制的物料
-     * @param startRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject requestParam) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        String endPoint = taskObj.getPoint_code2(); // 获取起点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 除了解锁需要将组盘表中的物料绑定载具设置为已解绑
-        // 起点设置空位
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            PointUtils.clearPoint(startPointObj);
-            SchBaseVehiclematerialgroup vehicleMaterialGroupObj =
-            vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            // 等到变成空盘才能解除
-//            vehicleMaterialGroupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
-            vehicleMaterialGroupObj.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            vehicleMaterialGroupObj.setPoint_name(endPointObj.getPoint_name());
-            vehicleMaterialGroupObj.setTask_code(taskObj.getTask_code());
-            vehicleMaterialGroupObj.setMove_way(vehicleMaterialGroupObj.getMove_way() + " -> " + endPointObj.getPoint_code());
-            TaskUtils.setGroupUpdateByType(vehicleMaterialGroupObj, taskFinishedType);
-            vehiclematerialgroupService.updateById(vehicleMaterialGroupObj);
-            // 插入生产过程跟踪表
-            PdmBdProductionProcessTracking processTracking = new PdmBdProductionProcessTracking();
-            processTracking.setBuss_move_id(vehicleMaterialGroupObj.getBuss_move_id());
-            processTracking.setProcess_action("钢托盘缓存位到分拣");
-            processTracking.setProcess_location(endPoint);
-            processTracking.setRecord_time(DateUtil.now());
-            processTrackingService.create(processTracking);
-            // 终点设置对应的参数
-            endPointObj.setVehicle_code(vehicleMaterialGroupObj.getVehicle_code());
-            endPointObj.setVehicle_type(vehicleMaterialGroupObj.getVehicle_type());
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String startPoint = taskObj.getPoint_code1(); // 获取终点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            pointService.updateById(startPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
deleted file mode 100644
index 94f2975..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.*;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: rgv - 分拣强制入库任务 - 2点
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("FJQZRKTask")
-public class FJQZRKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJQZRKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Override
-    protected void create() throws BadRequestException {
-        // 最后一坨不需要呼叫空盘
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-            // 找终点
-            SchBasePoint point = findNextPoint(nextRegionStr);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-        // 找终点
-        SchBasePoint point = findNextPoint(nextRegionStr);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("找不到可用的包装位！", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    /**
-     * 到对应的区域中获取放置点
-     * @param nextRegionStr
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr) {
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT)
-                .eq(SchBasePoint::getIs_used, true);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        String startPoint = taskObj.getPoint_code1(); // 获取终点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 设置载具类型、点位状态、释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-
-            // 组盘设置已经解绑
-            SchBaseVehiclematerialgroup vehicleMaterialGroupObj =
-                    vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            vehicleMaterialGroupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
-            vehicleMaterialGroupObj.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            vehicleMaterialGroupObj.setPoint_name(endPointObj.getPoint_name());
-            vehicleMaterialGroupObj.setMove_way(vehicleMaterialGroupObj.getMove_way() + " -> " + endPointObj.getPoint_code());
-            TaskUtils.setGroupUpdateByType(vehicleMaterialGroupObj, taskFinishedType);
-            vehiclematerialgroupService.updateById(vehicleMaterialGroupObj);
-        }
-        PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-        PointUtils.clearPoint(startPointObj);
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
deleted file mode 100644
index 35e2223..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: rgv - 分拣强制入库任务 - 2点 改：不需要强制入库，改为人工分拣入库的方法
- * @Date: 2023/6/21
- */
-@Component
-@TaskType("RGFJRKTask")
-public class FJRKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "RGFJRKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private FJMapper fjMapper;
-    @Override
-    protected void create() throws BadRequestException {
-        // 最后一坨不需要呼叫空盘
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-            // 找终点
-            SchBasePoint point = findNextPoint(nextRegionStr);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        String requestParam = task.getRequest_param();// 任务的其他数据
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        TaskUtils.setUpdateByAcs(task);
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")).collect(Collectors.toList());
-        // 找终点
-        SchBasePoint packagePoint = findNextPoint(nextRegionStr);
-        if (ObjectUtil.isEmpty(packagePoint)) {
-            // 消息通知
-            noticeService.createNotice("找不到可用的包装位！", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("找不到可用的包装位！");
-        }
-        task.setPoint_code2(packagePoint.getPoint_code());
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        taskService.save(task);
-        // 包装线上锁
-        packagePoint.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(packagePoint);
-        pointService.updateById(packagePoint);
-    }
-
-    /**
-     * 到对应的区域中获取放置点
-     * @param nextRegionStr
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr) {
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT)
-                .eq(SchBasePoint::getIs_used, true);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String requestParam = taskObj.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        String workorderCode = jsonObject.getString("workorder_code");
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        String fjcPoint = taskObj.getPoint_code4(); // 获取起点
-        String fmPoint = taskObj.getPoint_code3(); // 获取覆膜机
-        SchBasePoint fjcPointObj = pointService.getById(fjcPoint);
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        SchBasePoint fmPointObj = pointService.getById(fmPoint);
-        // 设置载具类型、点位状态、释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-            // 组盘设置已经解绑
-            SchBaseVehiclematerialgroup vehicleMaterialGroupObj =
-                    vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            vehicleMaterialGroupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
-            vehicleMaterialGroupObj.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            vehicleMaterialGroupObj.setPoint_name(endPointObj.getPoint_name());
-            vehicleMaterialGroupObj.setMove_way(vehicleMaterialGroupObj.getMove_way() + " -> " + endPointObj.getPoint_code());
-            TaskUtils.setGroupUpdateByType(vehicleMaterialGroupObj, taskFinishedType);
-            vehiclematerialgroupService.updateById(vehicleMaterialGroupObj);
-        }
-        if (ObjectUtil.isNotEmpty(fmPointObj)) {
-            // 覆膜位: 解锁 . 清空
-            PointUtils.setUpdateByType(fmPointObj, taskFinishedType);
-            PointUtils.clearPoint(fmPointObj);
-            // 工单的真实数+1
-        }
-        // 分拣机械手: 清空
-        if (ObjectUtil.isNotEmpty(fjcPointObj)) {
-            // 机械手对接位: 赋值
-            fjcPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            fjcPointObj.setVehicle_qty(1);
-            fjcPointObj.setVehicle_type(taskObj.getVehicle_type());
-            fjcPointObj.setVehicle_code(taskObj.getVehicle_code2()); // 拿过来的载具编码
-            PointUtils.setUpdateByType(fjcPointObj, taskFinishedType);
-            pointService.updateById(fjcPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
deleted file mode 100644
index c3113fc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.mes.service.WmsToMesService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 分拣送空托 -> 叠托位
- * @Date: 2023/6/20
- */
-@Component
-@TaskType("FJSKTask")
-public class FJSKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJSKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private FJMapper fjMapper;
-    @Autowired
-    private WmsToMesService wmsToMesService;
-
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task);
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-            // 找终点
-            SchBasePoint point = findNextPoint(nextRegionStr);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("叠盘架位置不可用!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task);
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-        // 找终点
-        SchBasePoint point = findNextPoint(nextRegionStr);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("叠盘架位置不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("叠盘架位置不可用!");
-        }
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    /**
-     * 找叠托位，无锁的位置即可
-     * @param nextRegionStr
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr) {
-        List<SchBasePoint> points = fjMapper.findPointForFJSK(nextRegionStr);
-        return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        // 查找组盘表信息，不做修改
-        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
-        String vehicleType = param.getString("vehicle_type");
-        if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
-            vehicleType = GeneralDefinition.STEEL_TRAY;
-        }
-        SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroupInfo(vehicleCode,
-                vehicleType, GroupBindMaterialStatusEnum.BOUND.getValue());
-        return ObjectUtil.isNotEmpty(one) ? one.getGroup_id() : "";
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        String vehicleType = ObjectUtil.isNotEmpty(taskObj.getVehicle_type()) ? taskObj.getVehicle_type() : "";
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 设置载具类型、点位状态、释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            endPointObj.setVehicle_type(vehicleType);
-            endPointObj.setVehicle_qty(endPointObj.getVehicle_qty() + 1); // 设置载具数量
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-            // 组盘状态改变
-            SchBaseVehiclematerialgroup vehicleMaterialGroupObj =
-                    vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            vehicleMaterialGroupObj.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
-            TaskUtils.setGroupUpdateByType(vehicleMaterialGroupObj, taskFinishedType);
-            vehiclematerialgroupService.updateById(vehicleMaterialGroupObj);
-        }
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.update(endPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
deleted file mode 100644
index 20c350b..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 分拣回收剩料
- * @Date: 2023/7/20
- */
-@Component
-@TaskType("FJSLHSTask")
-public class FJSLTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "FJSLHSTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找终点
-            String requestParam = task.getRequest_param();
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("分拣机械手[" + task.getPoint_code1() + "]未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            TaskUtils.setUpdateByAcs(task);
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找终点
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("分拣机械手[" + task.getPoint_code1() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        TaskUtils.setUpdateByAcs(task);
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject jsonObject) {
-        LambdaQueryWrapper<SchBasePoint> lam = new QueryWrapper<SchBasePoint>().lambda();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getIs_used, true)
-                .orderByAsc(SchBasePoint::getIn_order_seq)
-                .orderByAsc(SchBasePoint::getPoint_code);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        // 组盘，返回组盘标识，设置待绑定，搬运结束就设置已绑定
-        // 查找
-        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
-        if (vehicleCode == null) {
-            throw new BadRequestException(LangProcess.msg("vehicle_check"));
-        }
-        String vehicleType = param.getString("vehicle_type");
-        JSONObject stackParameters = param.getJSONObject("palletize"); // 参数
-        if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
-            vehicleType = GeneralDefinition.STEEL_TRAY;
-        }
-        // 修改参数
-        SchBaseVehiclematerialgroup groupObject = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
-                GroupBindMaterialStatusEnum.BOUND.getValue());
-        if (ObjectUtil.isEmpty(groupObject)) {
-            throw new BadRequestException(LangProcess.msg("vehicle_check_1",vehicleCode));
-        }
-        groupObject.setIs_full(false);
-        groupObject.setMaterial_qty(param.getInteger("qty"));
-        groupObject.setExt_data(JSONObject.toJSONString(stackParameters));
-        TaskUtils.setGroupUpdateByAcs(groupObject);
-        vehiclematerialgroupService.updateById(groupObject);
-        return groupObject.getGroup_id();
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String vehicleCode = taskObj.getVehicle_code();
-        String vehicleType = taskObj.getVehicle_type();
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            // 终点解锁
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            // 记录库存并解锁
-            endPointObj.setIng_task_code("");
-            endPointObj.setVehicle_code(vehicleCode);
-            endPointObj.setVehicle_qty(1);
-            endPointObj.setVehicle_type(vehicleType);
-            endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-            // 组盘表数据改成已绑定
-            SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
-            vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
-            vehiclematerialgroup.setMove_way(vehiclematerialgroup.getMove_way() + " -> " + endPointObj.getPoint_code());
-            vehiclematerialgroupService.updateById(vehiclematerialgroup);
-        }
-        // 起点清空
-        PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-        PointUtils.clearPoint(startPointObj);
-
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java
deleted file mode 100644
index 473f339..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.fj.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description: 分拣
- * @Date: 2023/6/20
- */
-public interface FJMapper {
-    List<SchBasePoint> findPointForFJQL(List<String> regionCode, String materialId);
-    List<SchBasePoint> findPointForFJSK(List<String> regionCode);
-
-    SchBasePoint findPointForFJQK(List<String> regionCode, @Param("fluentPut") JSONObject fluentPut);
-
-    /**
-     * 获取库存剩余数量
-     * @return
-     */
-    int getInventoryQuantity(String material_id);
-
-    /**
-     * 获取满托需要多少块
-     * eg: 2*7*6
-     * @param materialId
-     * @return
-     */
-    String getNeedFullNumber(String materialId);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml
deleted file mode 100644
index 3b0369f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper">
-    <select id="findPointForFJQL" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*,
-            vg.group_id
-        FROM
-            `sch_base_point` p
-            LEFT JOIN sch_base_vehiclematerialgroup vg ON p.vehicle_code = vg.vehicle_code AND p.vehicle_type = vg.vehicle_type AND vg.group_bind_material_status = '2'
-            LEFT JOIN md_base_material ma ON ma.material_id = vg.material_id
-        WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-            AND p.is_used = 1
-            AND p.point_status = '3'
-            AND vg.is_firing = true
-            AND vg.material_id = #{materialId}
-            AND TIMESTAMPDIFF(MINUTE, vg.instorage_time, NOW()) >= ma.cooling_time
-            AND p.region_code IN
-        <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-            #{code}
-        </foreach>
-        ORDER BY vg.is_full, vg.material_qty, p.update_time, p.out_order_seq
-    </select>
-    <select id="findPointForFJSK" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*
-        FROM
-            `sch_base_point` p
-        WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-            AND p.point_type = '3'
-            AND p.region_code IN
-            <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-                #{code}
-            </foreach>
-    </select>
-    <select id="findPointForFJQK" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*
-        FROM
-            `sch_base_point` p
-        WHERE (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-            AND p.point_type = #{fluentPut.pointType}
-            AND p.vehicle_type = #{fluentPut.vehicleType}
-            AND p.region_code IN
-            <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-                #{code}
-            </foreach>
-    </select>
-<!--    <select id="getInventoryQuantity" resultType="java.lang.Integer">-->
-<!--        SELECT-->
-<!--            IF(LENGTH(SUM(vg.material_qty)) > 0, SUM(vg.material_qty), 0) AS sum-->
-<!--        FROM-->
-<!--            `sch_base_vehiclematerialgroup` vg-->
-<!--        WHERE (vg.point_code IN (-->
-<!--            SELECT p.point_code FROM sch_base_point p WHERE p.region_code = 'GTPHC' AND p.point_status = '3' AND p.point_type = '2'-->
-<!--            ) AND vg.group_bind_material_status = '2')-->
-<!--           OR (-->
-<!--            vg.point_code IN (-->
-<!--            SELECT t.point_code1 FROM sch_base_task t WHERE t.task_status IN (2,3,4) AND t.config_code = 'GZYMLTask'-->
-<!--            ) AND vg.group_bind_material_status = '1'-->
-<!--            )-->
-<!--    </select>-->
-    <select id="getNeedFullNumber" resultType="java.lang.String">
-        SELECT
-            pack_method
-        FROM
-            `md_base_material`
-        WHERE material_id = #{materialId}
-    </select>
-    <select id="getInventoryQuantity" resultType="java.lang.Integer">
-        SELECT
-            IF(LENGTH(SUM(vg.material_qty)) > 0, SUM(vg.material_qty), 0) AS sum
-        FROM
-            `sch_base_point` p
-            LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.vehicle_code = p.vehicle_code AND vg.vehicle_type = p.vehicle_type AND vg.group_bind_material_status = '2'
-        WHERE
-            region_code = 'GTPHC' AND material_id = #{materialId}
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
deleted file mode 100644
index f7542ed..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.hn;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.database.material.service.IMdBaseMaterialService;
-import org.nl.wms.database.material.service.dao.MdBaseMaterial;
-import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.*;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.hn.mapper.HNMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author ldjun
- * @version 1.0
- * @date 2023年05月16日 16:44
- * @desc 混碾满料任务： 混碾机 -> 困料输送线
- */
-@Component
-@TaskType("HLMLTask")
-public class HNMLTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "HLMLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private IPdmBdRequestMaterialRecordService requestMaterialRecordService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private IMdBaseMaterialService materialService;
-    @Autowired
-    private HNMapper hnMapper;
-
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        } else if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        } else if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    /**
-     * 具体业务
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void create() { // 找点+下发-定时任务
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            String requestParam = task.getRequest_param();// 任务的其他数据
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            // 找终点
-            SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未存在生产该料的压机!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(), NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 叫料完成
-//            requestMaterialRecordService.callMaterialFinish(point.getRecord_id());
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            task.setVehicle_type(GeneralDefinition.MATERIAL_CUP);
-            // 告知acs去左边右边
-            int number = getNumber(point);
-            task.setResponse_param(new JSONObject().fluentPut("direction", number).toJSONString());
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-//            this.renotifyAcs(task);
-        }
-
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        String requestParam = task.getRequest_param();// 任务的其他数据
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        // 找终点
-        SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("未存在生产该料的压机!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("未存在生产该料的压机!");
-        }
-        // 叫料完成
-//            requestMaterialRecordService.callMaterialFinish(point.getRecord_id());
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        task.setVehicle_type(GeneralDefinition.MATERIAL_CUP);
-        // 告知acs去左边右边
-        int number = getNumber(point);
-        task.setResponse_param(new JSONObject().fluentPut("direction", number).toJSONString());
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    private static int getNumber(SchBasePoint point) {
-        String deviceCode = point.getDevice_code(); // 获取设备编码
-        int number = Integer.parseInt(deviceCode.replaceAll("[^0-9]", ""));
-        // 1左边2右边
-        number = (number % 2) == 0 ? 2 : (number % 2);
-        return number;
-    }
-
-    /**
-     * 根据压机工单的原料编码以及点位的更新时间
-     *
-     * @param nextRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject requestParam) {
-        // *: 混碾无工单
-        String materialCode = requestParam.getString("material_code"); // 混碾编码
-        Assert.notNull(materialCode, "物料编码不能为空!");
-        materialCode = materialCode.substring(0, 12);
-        // 根据工单物料标识寻找点位
-        List<SchBasePoint> points = hnMapper.findPointForHNMLAndWorkOrder(nextRegionStr, materialCode);
-        return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
-    }
-
-    @Override
-    public void forceFinish(String task_code) { // 人工完成任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) { // 人工取消任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-        // todo： 通知acs取消任务
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        String responseParam = taskObj.getResponse_param();
-        JSONObject responseObj = JSONObject.parseObject(responseParam);
-        // 要把数据存到组盘表。压制工单放进去，
-        SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getOne(
-                new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
-                        .eq(SchBaseVehiclematerialgroup::getGroup_id, taskObj.getGroup_id()));
-        if (ObjectUtil.isEmpty(groupEntity)) {
-            // 找不到组盘信息
-            throw new BadRequestException("找不到组盘信息");
-        }
-        // 终点去除正在执行的任务, 设置载具编码、载具类型、载具数量
-        // 更新组盘数据
-        groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
-        groupEntity.setTask_code(taskObj.getTask_code()); // 当前任务的编码
-        TaskUtils.setGroupUpdateByType(groupEntity, taskFinishedType);
-        vehiclematerialgroupService.updateById(groupEntity);
-        // 起点清空 - 由ACS请求修改
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 终点
-        SchBasePoint one = ObjectUtil.isNotEmpty(endPoint)
-                ? pointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, endPoint))
-                : null;
-        if (one != null) {
-            one.setIng_task_code("");
-            PointUtils.setUpdateByType(one, taskFinishedType);
-            pointService.updateById(one);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    // 组盘
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        // 吨袋号（泥料号+2位年+月日时分+设备号+碾次）
-        // LMS组盘时生成混料批次：压制工单+混砂机号+碾次
-        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
-        String vehicleType = param.getString("vehicle_type");
-        // 泥料物料对应不出物料标识
-        String packNo = param.getString("material_code"); // 泥料编码: 吨袋号，泥料前
-        String materialCode = packNo.substring(0, 12);
-        String mixTimes = packNo.substring(18, packNo.length()); // 碾次
-        // 载具类型默认料盅
-        if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
-            vehicleType = GeneralDefinition.MATERIAL_CUP;
-        }
-        String deviceCode = param.getString("device_code");
-        BigDecimal weight = param.getBigDecimal("weight");
-        SchBasePoint basePoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
-                .eq(SchBasePoint::getPoint_code, deviceCode)
-                .eq(SchBasePoint::getIs_used, true));
-        if (ObjectUtil.isEmpty(basePoint)) {
-            throw new BadRequestException("点位[" + deviceCode + "]已被禁用");
-        }
-        if (vehicleCode == null || vehicleCode.equals(GeneralDefinition.NO)) {
-            throw new BadRequestException("载具编码不能为空");
-        }
-        // 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
-        // 找到不直接返回，用那条数据进行修改
-        // 解绑同载具的信息
-        vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
-        SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
-        groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        // 要把数据存到组盘表
-        groupEntity.setMaterial_id(GeneralDefinition.UNKNOWN); // 物料标识等任务完成后赋值
-        groupEntity.setRedundance_material_code(materialCode);
-        groupEntity.setCreate_id(GeneralDefinition.ACS_ID);
-        groupEntity.setCreate_name(GeneralDefinition.ACS_NAME);
-        groupEntity.setCreate_time(DateUtil.now());
-        groupEntity.setVehicle_code(vehicleCode);
-        groupEntity.setVehicle_type(vehicleType);
-        groupEntity.setSource_vehicle_code(basePoint.getPoint_code());
-        groupEntity.setPoint_code(basePoint.getPoint_code()); // 当前位置
-        groupEntity.setPoint_name(basePoint.getPoint_name());
-        groupEntity.setMove_way(basePoint.getPoint_code()); // 头次
-        groupEntity.setMix_times(mixTimes); // 碾次
-        groupEntity.setInstorage_time(DateUtil.now());
-        groupEntity.setMaterial_weight(ObjectUtil.isNotEmpty(weight)// 重量
-                ? weight
-                : BigDecimal.valueOf(0));
-        groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); // 绑定
-        groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); // 暂时不维护。
-        groupEntity.setIs_delete(false);
-        groupEntity.setExt_data(packNo);// todo: 对于混碾的组盘 暂时存吨袋号
-        vehiclematerialgroupService.saveOrUpdate(groupEntity);
-        return groupEntity.getGroup_id();
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
deleted file mode 100644
index 05313cc..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
+++ /dev/null
@@ -1,166 +0,0 @@
-//package org.nl.wms.sch.task_manage.task.tasks.hn;
-//
-//import cn.hutool.core.date.DateUtil;
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import org.nl.common.exception.BadRequestException;
-//import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
-//import org.nl.wms.sch.point.service.ISchBasePointService;
-//import org.nl.wms.sch.point.service.dao.SchBasePoint;
-//import org.nl.wms.sch.task.service.ISchBaseTaskService;
-//import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-//import org.nl.wms.sch.task.service.dao.SchBaseTask;
-//import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-//import org.nl.wms.sch.task_manage.AbstractTask;
-//import org.nl.wms.sch.task_manage.GeneralDefinition;
-//import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-//import org.nl.wms.sch.task_manage.task.TaskType;
-//import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-//import org.nl.wms.util.PointUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Author: lyd
-// * @Description: 混料缺空：呼叫空载具
-// * @Date: 2023/5/19
-// */
-//@Deprecated
-//@Component
-//@TaskType("--")
-//public class HNQKTask extends AbstractTask {
-//    private static String TASK_CONFIG_CODE = "--";
-//    private static String EMPTY_ZHONG = "1";
-//
-//    @Autowired
-//    private ISchBasePointService pointService;
-//    @Autowired
-//    private ISchBaseTaskService taskService;
-//    @Autowired
-//    private ISchBaseTaskconfigService taskConfigService;
-//    @Autowired
-//    private IPdmBdWorkorderService workorderService;
-//
-//    /**
-//     * 具体业务
-//     */
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    protected void create() {
-//        // 获取任务
-//        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-//        // 配置信息
-//        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-//                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-//        for (SchBaseTask task : tasks) {
-//            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")).collect(Collectors.toList());
-//            // 找起点
-//            String extGroupData = task.getExt_group_data();
-//            JSONObject jsonObject = JSONObject.parseObject(extGroupData);
-//            SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-//            if (ObjectUtil.isEmpty(point)) {
-//                task.setRemark("未找到所需点位!");
-//                taskService.update(task);
-//                // 消息通知
-//                continue;
-//            }
-//            // 设置终点并修改创建成功状态
-//            task.setPoint_code1(point.getPoint_code());
-//            task.setRemark("");
-//            task.setTask_status(TaskStatus.CREATED.getCode());
-//            taskService.update(task);
-//
-//            point.setIng_task_code(task.getTask_code());
-//            pointService.update(point);
-//
-//            //下发
-////            this.renotifyAcs(task);
-//        }
-//    }
-//
-//    /**
-//     * 找起点, 通过料盅睏料线区域的空盅位置找到空盅
-//     *
-//     * @param startRegionStr
-//     * @param extGroupData
-//     * @return
-//     */
-//    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
-//        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-//        lam.in(SchBasePoint::getRegion_code, startRegionStr)
-//                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
-//                .eq(SchBasePoint::getPoint_type, EMPTY_ZHONG)
-//                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-//                        .or()
-//                        .eq(SchBasePoint::getIng_task_code, ""))
-//                .orderByAsc(SchBasePoint::getIn_order_seq)
-//                .orderByAsc(SchBasePoint::getPoint_code);
-//        List<SchBasePoint> schBasePoints = pointService.list(lam);
-//        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-//    }
-//
-//    @Override
-//    @Transactional(rollbackFor = Exception.class)
-//    protected void updateStatus(String task_code, TaskStatus status) {
-//        // 校验任务
-//        SchBaseTask taskObj = taskService.getByCode(task_code);
-//        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        // 获取参数
-//        String startPoint = taskObj.getPoint_code1(); // 获取起点
-//        String endPoint = taskObj.getPoint_code2(); // 获取起点
-//        SchBasePoint startPointObj = pointService.getById(startPoint);
-//        SchBasePoint endPointObj = pointService.getById(endPoint);
-//        // 根据传来的类型去对任务进行操作
-//        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-//            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-//            taskObj.setRemark("执行中");
-//        }
-//        if (status.equals(TaskStatus.FINISHED)) { // 完成
-//            // 起点清空
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                PointUtils.clearPoint(startPointObj);
-//                taskObj.setVehicle_code(startPointObj.getVehicle_code());
-//                endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-//                endPointObj.setVehicle_type("1");
-//                endPointObj.setVehicle_code(startPointObj.getVehicle_code());
-//                endPointObj.setVehicle_qty(1);
-//                endPointObj.setUpdate_time(DateUtil.now());
-//                pointService.updateById(endPointObj);
-//            }
-//            // 任务完成
-//            taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-//            taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-//        }
-//        if (status.equals(TaskStatus.CANCELED)) { // 取消
-//            // 起点解锁
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                startPointObj.setIng_task_code("");
-//                pointService.update(startPointObj);
-//            }
-//            taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-//        }
-//        taskService.update(taskObj);
-//    }
-//
-//    @Override
-//    public void forceFinish(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.FINISHED);
-//    }
-//
-//    @Override
-//    public void cancel(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.CANCELED);
-//    }
-//}
-//
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java
deleted file mode 100644
index e64c205..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.hn.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description: 混碾的mapper
- * @Date: 2023/6/19
- */
-public interface HNMapper extends BaseMapper<JSONObject> {
-    // 通过叫料单
-    List<SchBasePoint> findPointForHNML(List<String> regionCode, String materialId);
-    // 通过工单与点位更新
-    List<SchBasePoint> findPointForHNMLAndWorkOrder(List<String> regionCode, String materialCode);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml
deleted file mode 100644
index 0869e49..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.sch.task_manage.task.tasks.hn.mapper.HNMapper">
-    <select id="findPointForHNML" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*,
-            r.device_code,
-            r.create_time,
-            r.record_id
-        FROM
-            `sch_base_point` p
-        LEFT JOIN pdm_bd_request_material_record r ON r.material_id = #{materialId} AND r.is_finish = false
-        WHERE p.point_type = '5'
-        AND p.point_status = '1'
-        AND p.parent_point_code LIKE CONCAT('%', r.device_code, '%')
-        AND p.is_used = true
-        AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-        AND p.region_code IN
-        <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-            #{code}
-        </foreach>
-        ORDER BY r.create_time
-    </select>
-        <select id="findPointForHNMLAndWorkOrder" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*,
-            p2.point_code AS device_code
-        FROM
-            `sch_base_point` p
-        LEFT JOIN (
-            SELECT
-                p2.point_code
-            FROM
-                sch_base_point p2
-            WHERE
-                p2.point_code IN (
-                    SELECT w.point_code FROM pdm_bd_workorder w
-                    WHERE w.raw_material_code = #{materialCode} AND w.workorder_status = '3'
-                )
-            AND p2.point_status = '1'
-            ORDER BY p2.update_time LIMIT 1
-        ) p2 ON p.parent_point_code LIKE CONCAT('%', p2.point_code, '%')
-        WHERE
-            p.point_type = '5'
-        AND p.point_status = '1'
-        AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-        AND p.region_code IN
-        <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-            #{code}
-        </foreach>
-        AND p2.point_code IS NOT NULL
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java
deleted file mode 100644
index 184452a..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yao;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.mes.service.WmsToMesService;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 出窑暂存
- * @Date: 2023/6/20
- */
-@Slf4j
-@Component
-@TaskType("GZYMLTask")
-public class CYZCTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "GZYMLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private IPdmBdProductionProcessTrackingService processTrackingService;
-    @Autowired
-    private WmsToMesService wmsToMesService;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-            // 找终点
-            String extGroupData = task.getExt_group_data();
-            JSONObject jsonObject = JSONObject.parseObject(extGroupData);
-            SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未找到钢托盘缓存区域空位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            TaskUtils.setUpdateByAcs(task);
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList());
-        // 找终点
-        String extGroupData = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(extGroupData);
-        SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("未找到钢托盘缓存区域空位!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        // 设置终点并修改创建成功状态
-        task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        TaskUtils.setUpdateByAcs(task);
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        // 查找组盘表信息，不做修改
-        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
-        String vehicleType = param.getString("vehicle_type");
-        if (vehicleCode == null) {
-            vehicleType = GeneralDefinition.STEEL_TRAY;
-        }
-        SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroupInfo(vehicleCode,
-                vehicleType, GroupBindMaterialStatusEnum.BOUND.getValue());
-        return ObjectUtil.isNotEmpty(one) ? one.getGroup_id() : "";
-    }
-
-    /**
-     * 找终点：到钢托盘缓存区中获取一个空位
-     *
-     * @param nextRegionStr
-     * @param extData
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject extData) {
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getIs_used, true)
-                .ne(SchBasePoint::getLayer_num, "3")
-                .orderByAsc(SchBasePoint::getIn_order_seq);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 载具编码：前面需要根据任务判断，没有载具不能生成任务
-        String vehicle_code = taskObj.getVehicle_code();
-        String vehicleType = taskObj.getVehicle_type();
-        if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
-            vehicleType = GeneralDefinition.STEEL_TRAY;
-        }
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            // 修改组盘信息 - 设置已烧制
-            SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
-                    .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)
-                    .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType)
-                    .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
-                            GroupBindMaterialStatusEnum.BOUND.getValue())
-                    .eq(SchBaseVehiclematerialgroup::getIs_firing, false));
-            if (ObjectUtil.isEmpty(one)) {
-                throw new BadRequestException(vehicle_code + " => " + vehicleType + "的组盘信息未找到");
-            }
-            one.setTask_code(taskObj.getTask_code());
-            one.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            one.setPoint_name(endPointObj.getPoint_name());
-            one.setMove_way(one.getMove_way() + " -> " + endPointObj.getPoint_code());
-            one.setIs_firing(true);
-            one.setOut_kiln_time(DateUtil.now());
-            TaskUtils.setGroupUpdateByType(one, taskFinishedType);
-            vehiclematerialgroupService.updateById(one);
-            // 插入生产过程跟踪表
-            PdmBdProductionProcessTracking processTracking = new PdmBdProductionProcessTracking();
-            processTracking.setBuss_move_id(one.getBuss_move_id());
-            processTracking.setProcess_action("出窑到钢托盘缓存位");
-            processTracking.setProcess_location(endPoint);
-            processTracking.setRecord_time(DateUtil.now());
-            processTrackingService.create(processTracking);
-            // 记录库存并解锁
-            endPointObj.setIng_task_code("");
-            endPointObj.setVehicle_code(vehicle_code);
-            endPointObj.setVehicle_qty(1);
-            endPointObj.setVehicle_type(vehicleType);
-            endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            endPointObj.setIng_task_code("");
-            pointService.update(endPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
deleted file mode 100644
index fed0938..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yao;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.mes.service.WmsToMesService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 入窑口任务
- * @Date: 2023/7/20
- */
-@Slf4j
-@Component
-@TaskType("GZYQLTask")
-public class GZYQLTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "GZYQLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private WmsToMesService wmsToMesService;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private YZMapper yzMapper;
-    @Override
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找起点
-            String requestParam = task.getRequest_param();
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("入窑口[" + task.getPoint_code1() + "]未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            TaskUtils.setUpdateByAcs(task);
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找起点
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("入窑口[" + task.getPoint_code2() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code2(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置终点并修改创建成功状态
-        task.setPoint_code1(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        TaskUtils.setUpdateByAcs(task);
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-
-    }
-
-    /**
-     * 找到有货最多的那层搬运到入窑口
-     * @param startRegionStr
-     * @param jsonObject
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject jsonObject) {
-        // 无需工单
-        // 如果一个有货一个没货，但是载具数量又是5的时候，就要不需要检测不能为5
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, startRegionStr)
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) // 点位类型是缓存输送线出口
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
-                .eq(SchBasePoint::getIs_used, true);
-        List<SchBasePoint> list = pointService.list(lam);
-        boolean doDetection = true; // 如果只有一条符合的数据就不需要检验不符合5个托
-        if (list.size() == 1) {
-            doDetection = false;
-        }
-        // 默认认为缓存线有东西
-        lam.ne(doDetection, SchBasePoint::getVehicle_qty, 5).orderByDesc(SchBasePoint::getVehicle_qty); // 每次都将载具数量+1，每次拿最大的
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 起点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            PointUtils.clearPointAndRetainNum(startPointObj);
-            pointService.updateById(startPointObj);
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 起点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            pointService.updateById(startPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
deleted file mode 100644
index 0baf4c2..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yz;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 压制呼叫空盘
- * @Date: 2023/6/16
- */
-@Slf4j
-@Component
-@TaskType("YZQKTask")
-public class YZQKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "YZQKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-
-    @Override
-    @Transactional
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找起点
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code2(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("未找到所需点位!");
-        }
-        // 设置终点并修改创建成功状态
-        task.setPoint_code1(point.getPoint_code());
-        task.setRemark("");
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void create() {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找起点
-            String requestParam = task.getRequest_param();
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice("未找到所需点位!", TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
-            task.setRemark("");
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    /**
-     * 业务过程：到指定的区域获取空托盘
-     * @param startRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject requestParam) {
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, startRegionStr) // 默认一直都有载具
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.EXIT) // 点位类型是拆盘机出口
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getIs_used, true);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        String endPoint = taskObj.getPoint_code2(); // 获取起点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 起点清空
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            PointUtils.clearPoint(startPointObj);
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            endPointObj.setVehicle_type(GeneralDefinition.STEEL_TRAY);
-            endPointObj.setVehicle_qty(1);
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String startPoint = taskObj.getPoint_code1(); // 获取起点
-        SchBasePoint startPointObj = pointService.getById(startPoint);
-        // 起点解锁
-        if (ObjectUtil.isNotEmpty(startPointObj)) {
-            startPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
-            pointService.updateById(startPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
deleted file mode 100644
index 1873916..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
+++ /dev/null
@@ -1,171 +0,0 @@
-//package org.nl.wms.sch.task_manage.task.tasks.yz;
-//
-//import cn.hutool.core.lang.Assert;
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import lombok.extern.slf4j.Slf4j;
-//import org.nl.common.exception.BadRequestException;
-//import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
-//import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
-//import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-//import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-//import org.nl.wms.sch.point.service.ISchBasePointService;
-//import org.nl.wms.sch.point.service.dao.SchBasePoint;
-//import org.nl.wms.sch.task.service.ISchBaseTaskService;
-//import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-//import org.nl.wms.sch.task.service.dao.SchBaseTask;
-//import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-//import org.nl.wms.sch.task_manage.AbstractTask;
-//import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-//import org.nl.wms.sch.task_manage.task.TaskType;
-//import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-//import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
-//import org.nl.wms.util.PointUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Author: lyd
-// * @Description: 压制缺料任务
-// * @Date: 2023/5/25
-// */
-//@Slf4j
-//@Deprecated
-//@Component
-//@TaskType("-")
-//public class YZQLTask extends AbstractTask {
-//    private static String TASK_CONFIG_CODE = "-";
-//
-//    @Autowired
-//    private ISchBasePointService pointService;
-//    @Autowired
-//    private ISchBaseTaskService taskService;
-//    @Autowired
-//    private ISchBaseTaskconfigService taskConfigService;
-//    @Autowired
-//    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-//    @Autowired
-//    private IPdmBdWorkorderService workorderService;
-//    @Autowired
-//    private YZMapper yzMapper;
-//
-//    @Override
-//    protected void create() throws BadRequestException {
-//        // 获取任务
-//        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-//        // 配置信息
-//        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-//                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-//        for (SchBaseTask task : tasks) {
-//            List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(",")).collect(Collectors.toList());
-//            // 找起点
-//            String extGroupData = task.getExt_group_data();
-//            JSONObject jsonObject = JSONObject.parseObject(extGroupData);
-//            jsonObject.put("vehicle_type", task.getVehicle_type());
-//            SchBasePoint point = findStartPoint(startRegionStr, jsonObject);
-//            if (ObjectUtil.isEmpty(point)) {
-//                task.setRemark("未找到所需点位!");
-//                taskService.update(task);
-//                // 消息通知
-//                continue;
-//            }
-//            // 设置起点并修改创建成功状态
-//            task.setPoint_code1(point.getPoint_code());
-//            task.setTask_status(TaskStatus.CREATED.getCode());
-//            task.setVehicle_code(point.getVehicle_code());
-//            taskService.update(task);
-//
-//            point.setIng_task_code(task.getTask_code());
-//            pointService.update(point);
-//
-//            //下发
-////            this.renotifyAcs(task);
-//        }
-//    }
-//
-//    /**
-//     * 找起点业务：混碾机工单的物料标识相同的位置
-//     *
-//     * @param startRegionStr : 区域列表
-//     * @param extGroupData   : 外部参数，包含条件所需的信息
-//     * @return
-//     * @description : JSONObject获取不到就是null
-//     */
-//    private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
-//        // 获取当前工单
-//        String workorderCode = extGroupData.getString("workorder_code");
-//        PdmBdWorkorder workOrder = ObjectUtil.isNotEmpty(workorderCode)
-//                ? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
-//                    .eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
-//                : null;
-//        Assert.notNull(workOrder, "工单不能为空!");
-//        // 查找混碾机工单的物料相同的位置
-//        List<SchBasePoint> points = yzMapper.findPointForYZQL(startRegionStr, workOrder.getMaterial_id());
-//        return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
-//    }
-//
-//
-//    @Override
-//    protected void updateStatus(String task_code, TaskStatus status) {
-//        // 校验任务
-//        SchBaseTask taskObj = taskService.getByCode(task_code);
-//        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-//        }
-//        // 获取参数
-//        String startPoint = taskObj.getPoint_code1(); // 起点
-//        JSONObject extGroupData = ObjectUtil.isNotEmpty(taskObj.getExt_group_data())
-//                ? JSONObject.parseObject(taskObj.getExt_group_data())
-//                : null;
-//        SchBasePoint startPointObj = pointService.getById(startPoint);
-//        // 根据传来的类型去对任务进行操作
-//        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-//            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-//            taskObj.setRemark("执行中");
-//        }
-//        if (status.equals(TaskStatus.FINISHED)) { // 完成
-//            // 任务上有载具编码 -> 获取当前载具编码的组盘信息
-//            SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
-//                    .eq(SchBaseVehiclematerialgroup::getVehicle_code, taskObj.getVehicle_code())
-//                    .eq(SchBaseVehiclematerialgroup::getVehicle_type, taskObj.getVehicle_type())
-//                    .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue()));
-//            // 将载具设置为已解绑
-//            one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
-//            vehiclematerialgroupService.update(one);
-//            // 释放点位，将点位设置为空位,清空数据
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                PointUtils.clearPoint(startPointObj);
-//                // todo: 终点暂时无设置
-//            }
-//            // 任务修改成完成
-//            taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-//        }
-//        if (status.equals(TaskStatus.CANCELED)) { // 取消
-//            taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-//            // 释放点位，起点正在执行的任务清空
-//            if (ObjectUtil.isNotEmpty(startPointObj)) {
-//                startPointObj.setIng_task_code("");
-//                pointService.update(startPointObj);
-//            }
-//        }
-//        taskService.update(taskObj);
-//    }
-//
-//    @Override
-//    public void forceFinish(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.FINISHED);
-//    }
-//
-//    @Override
-//    public void cancel(String task_code) {
-//        this.updateStatus(task_code, TaskStatus.CANCELED);
-//    }
-//}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
deleted file mode 100644
index cb77caa..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yz;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 压制送空盅任务
- * @Date: 2023/5/25
- */
-@Slf4j
-@Component
-@TaskType("LZKLXSKTask")
-public class YZSKTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "LZKLXSKTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISysNoticeService noticeService;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找终点
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-        String vehicleType = jsonObject.getString("vehicle_type");
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("送空盅任务未找到混料机空位!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        log.warn("送空盅找到点位的信息：{}", point);
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        if (task.getVehicle_type() == null) {
-            task.setVehicle_type(vehicleType != null ? vehicleType : GeneralDefinition.MATERIAL_CUP);
-        }
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找终点
-            String requestParam = task.getRequest_param();
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-            String vehicleType = jsonObject.getString("vehicle_type");
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("送空盅任务未找到混料机空位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            if (task.getVehicle_type() == null) {
-                task.setVehicle_type(vehicleType != null ? vehicleType : GeneralDefinition.MATERIAL_CUP);
-            }
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    /**
-     * 在混料区域找一个空位放着
-     *
-     * @param nextRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject requestParam) {
-        String vehicleType = ObjectUtil.isNotEmpty(requestParam.getString("vehicle_type"))
-                ? requestParam.getString("vehicle_type")
-                : GeneralDefinition.MATERIAL_CUP;
-        // 载具已经设置可为空，当不需要校验工单时候也不会出现空指针
-        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
-        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .like(SchBasePoint::getCan_vehicle_type, vehicleType)
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.DOCKING_POINT) // 对接位
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getIs_used, true)
-                .orderByAsc(SchBasePoint::getIn_order_seq)
-                .orderByAsc(SchBasePoint::getPoint_code);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        String vehicleType = ObjectUtil.isNotEmpty(taskObj.getVehicle_type())
-                ? taskObj.getVehicle_type()
-                : GeneralDefinition.MATERIAL_CUP;
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 设置载具类型、点位状态、释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            endPointObj.setVehicle_type(vehicleType);
-            endPointObj.setVehicle_qty(1);
-            endPointObj.setVehicle_code(taskObj.getVehicle_code());
-            endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType); // 区分完成者
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 释放点位
-        if (ObjectUtil.isNotEmpty(endPoint)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
deleted file mode 100644
index 5863a96..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yz;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.language.LangProcess;
-import org.nl.system.service.notice.ISysNoticeService;
-import org.nl.wms.ext.mes.service.WmsToMesService;
-import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
-import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
-import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
-import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task.service.ISchBaseTaskService;
-import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
-import org.nl.wms.sch.task.service.dao.SchBaseTask;
-import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
-import org.nl.wms.sch.task_manage.AbstractTask;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
-import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
-import org.nl.wms.sch.task_manage.task.TaskType;
-import org.nl.wms.sch.task_manage.task.core.TaskStatus;
-import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
-import org.nl.wms.util.PointUtils;
-import org.nl.wms.util.TaskUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Author: lyd
- * @Description: 压制送料
- * @Date: 2023/6/19
- */
-@Slf4j
-@Component
-@TaskType("YZMLTask")
-public class YZSLTask extends AbstractTask {
-    private static String TASK_CONFIG_CODE = "YZMLTask";
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private ISchBaseTaskService taskService;
-    @Autowired
-    private ISchBaseTaskconfigService taskConfigService;
-    @Autowired
-    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
-    @Autowired
-    private YZMapper yzMapper;
-    @Autowired
-    private ISysNoticeService noticeService;
-    @Autowired
-    private IPdmBdProductionProcessTrackingService processTrackingService;
-    @Autowired
-    private WmsToMesService wmsToMesService;
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void create() throws BadRequestException {
-        // 获取任务
-        List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        for (SchBaseTask task : tasks) {
-            TaskUtils.setUpdateByAcs(task); // 修改修改者
-            List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                    .collect(Collectors.toList());
-            // 找终点
-            String requestParam = task.getRequest_param();
-            JSONObject jsonObject = JSONObject.parseObject(requestParam);
-            SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-            if (ObjectUtil.isEmpty(point)) {
-                task.setRemark("压机[" + task.getPoint_code1() + "]未找到所需点位!");
-                taskService.updateById(task);
-                // 消息通知
-                noticeService.createNotice(task.getRemark(), TASK_CONFIG_CODE + task.getTask_code(),
-                        NoticeTypeEnum.WARN.getCode());
-                continue;
-            }
-            // 设置终点并修改创建成功状态
-            task.setPoint_code2(point.getPoint_code());
-            task.setTask_status(TaskStatus.CREATED.getCode());
-            task.setRemark("");
-            TaskUtils.setUpdateByAcs(task);
-            taskService.updateById(task);
-
-            point.setIng_task_code(task.getTask_code());
-            PointUtils.setUpdateByAcs(point);
-            pointService.updateById(point);
-
-            //下发
-            //this.renotifyAcs(task);
-        }
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    protected void createCompletion(SchBaseTask task) {
-        // 配置信息
-        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
-                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
-        TaskUtils.setUpdateByAcs(task); // 修改修改者
-        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
-                .collect(Collectors.toList());
-        // 找终点
-        String requestParam = task.getRequest_param();
-        JSONObject jsonObject = JSONObject.parseObject(requestParam);
-        SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
-        if (ObjectUtil.isEmpty(point)) {
-            // 消息通知
-            noticeService.createNotice("压机[" + task.getPoint_code1() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code1(),
-                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException(LangProcess.msg("point_checkNull"));
-        }
-        // 设置组盘 - 需要的话由子类自行实现
-        task.setGroup_id(setGroupPlate(jsonObject));
-        // 设置终点并修改创建成功状态
-        task.setPoint_code2(point.getPoint_code());
-        task.setTask_status(TaskStatus.CREATED.getCode());
-        task.setRemark("");
-        TaskUtils.setUpdateByAcs(task);
-        taskService.save(task);
-
-        point.setIng_task_code(task.getTask_code());
-        PointUtils.setUpdateByAcs(point);
-        pointService.updateById(point);
-    }
-
-    /**
-     * 判断是否加急：是->入窑口，否->双层缓存线
-     *
-     * @param nextRegionStr
-     * @param requestParam
-     * @return
-     */
-    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject requestParam) {
-        return null;
-    }
-
-    @Override
-    protected void updateStatus(String task_code, TaskStatus status) {
-        // 校验任务
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
-        }
-        // 根据传来的类型去对任务进行操作
-        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
-            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
-            taskObj.setRemark("执行中");
-            TaskUtils.setUpdateByAcs(taskObj);
-            taskService.updateById(taskObj);
-            // todo：暂时现在执行中的时候将满托上给mes
-        }
-        if (status.equals(TaskStatus.FINISHED)) { // 完成
-            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-            // todo: 完成后上报给MES
-        }
-        if (status.equals(TaskStatus.CANCELED)) { // 取消
-            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
-        }
-    }
-
-    @Override
-    public String setGroupPlate(JSONObject param) {
-        return null;
-    }
-
-
-    @Override
-    public void forceFinish(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    @Override
-    public void cancel(String task_code) {
-        SchBaseTask taskObj = taskService.getByCode(task_code);
-        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
-        }
-        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
-    }
-
-    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            // 终点解锁
-            endPointObj.setIng_task_code("");
-            // 终点清空
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            PointUtils.clearPointAndRetainNum(endPointObj);
-            pointService.updateById(endPointObj);
-            // 组盘表数据改成已绑定
-            SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
-            TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
-            vehiclematerialgroup.setTask_code(taskObj.getTask_code()); // 当前任务
-            vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code()); // 设置链路id，使用任务编码
-            vehiclematerialgroup.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
-            vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code()); // 当前位置
-            vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
-            vehiclematerialgroup.setMove_way(vehiclematerialgroup.getMove_way() + " -> " + endPointObj.getPoint_code());
-            vehiclematerialgroupService.updateById(vehiclematerialgroup);
-            // 插入生产过程跟踪表
-            PdmBdProductionProcessTracking processTracking = new PdmBdProductionProcessTracking();
-            processTracking.setBuss_move_id(vehiclematerialgroup.getBuss_move_id());
-            processTracking.setProcess_action("压制送料入双层缓存线");
-            processTracking.setProcess_location(endPoint);
-            processTracking.setRecord_time(DateUtil.now());
-            processTrackingService.create(processTracking);
-            // 工单统计实际数量
-            Integer materialQty = vehiclematerialgroup.getMaterial_qty();
-        }
-        // 任务完成
-        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
-        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-
-    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
-        // 获取参数
-        String endPoint = taskObj.getPoint_code2(); // 获取终点
-        SchBasePoint endPointObj = pointService.getById(endPoint);
-        // 终点解锁
-        if (ObjectUtil.isNotEmpty(endPointObj)) {
-            endPointObj.setIng_task_code("");
-            PointUtils.setUpdateByType(endPointObj, taskFinishedType);
-            pointService.updateById(endPointObj);
-        }
-        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
-        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
-        taskObj.setFinished_type(taskFinishedType.getCode());
-        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
-        taskService.updateById(taskObj);
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/backup.txt b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/backup.txt
deleted file mode 100644
index a6de0aa..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/backup.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
-        // 获取当前工单
-        String workorderCode = extGroupData.getString("workorder_code");
-        PdmBdWorkorder workOrder = ObjectUtil.isNotEmpty(workorderCode)
-                ? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
-                    .eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
-                : null;
-        Assert.notNull(workOrder, "工单不能为空!");
-        String vehicleType = workOrder.getVehicle_type();
-        String materialId = workOrder.getMaterial_id();
-        int standingTime = workOrder.getStanding_time(); // 静置时间
-        Assert.notNull(materialId, "物料不能为空!");
-        Assert.notNull(vehicleType, "载具类型不能为空!");
-        Assert.notNull(standingTime, "静置时间不能为空!");
-        // 找到所需要物料的载具编号
-        List<SchBaseVehiclematerialgroup> list = vehiclematerialgroupService.list(
-                new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
-                .eq(SchBaseVehiclematerialgroup::getMaterial_id, materialId)
-                .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType)
-                .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())
-                .apply("DATE_ADD(instorage_time, INTERVAL " + standingTime + " MINUTE) <= NOW()")
-                .orderByAsc(SchBaseVehiclematerialgroup::getPoint_code));
-        // 获取第一个
-        SchBaseVehiclematerialgroup vehiclematerialgroup = ObjectUtil.isNotEmpty(list) ? list.get(0) : null;
-        if (ObjectUtil.isEmpty(vehiclematerialgroup)) return null;
-        SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
-                .in(SchBasePoint::getRegion_code, startRegionStr)
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.FULL_POINT.getCode())
-                .eq(SchBasePoint::getVehicle_code, vehiclematerialgroup.getVehicle_code())
-                .eq(SchBasePoint::getVehicle_type, vehicleType));
-        return one;
-    }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java
deleted file mode 100644
index 34110ba..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.nl.wms.sch.task_manage.task.tasks.yz.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2023/6/19
- */
-public interface YZMapper {
-    List<SchBasePoint> findPointForYZQL(List<String> regionCode, String materialId);
-    @Deprecated
-    List<SchBasePoint> findPointForYZSL(JSONObject param);
-
-    /**
-     * 统计输送线数量
-     * @param regionCode
-     * @param pointType
-     * @return
-     */
-    int countConveyorLine(String regionCode, String pointType, String pointStatus);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml
deleted file mode 100644
index 864c64f..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper">
-    <select id="findPointForYZQL" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*
-        FROM
-            `sch_base_point` p
-                LEFT JOIN pdm_bd_workorder w ON w.material_id = #{materialId} AND w.workorder_status = '3'
-                                                    AND w.region_code = 'HN'
-        WHERE p.point_code = w.point_code
-          AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
-          AND p.is_used = 1
-          AND p.region_code IN
-        <foreach collection="regionCode" item="code" separator="," open="(" close=")">
-            #{code}
-        </foreach>
-    </select>
-    <select id="findPointForYZSL" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
-        SELECT
-            p.*
-        FROM
-            `sch_base_point` p
-        LEFT JOIN sch_base_task t ON ( t.point_code1 = p.point_code OR t.point_code2 = p.point_code )
-        AND t.task_status != '5'
-        AND t.task_status != '6'
-        WHERE
-            ( p.ing_task_code IS NULL OR p.ing_task_code = '' )
-            AND p.region_code = #{regionCode}
-            AND p.point_type = #{pointType}
-            AND p.is_used = TRUE
-            AND ( t.task_code IS NULL OR t.task_code = '')
-    </select>
-    <select id="countConveyorLine" resultType="java.lang.Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            sch_base_point p2
-        WHERE
-            p2.region_code = #{regionCode}
-          AND p2.point_type = #{pointType}
-          AND p2.point_status = #{pointStatus}
-    </select>
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java
index de7891d..15e9b6a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java
@@ -8,7 +8,8 @@ import org.nl.config.MapOf;
 
 import java.util.Map;
 
-/*
+/**
+ * 出入库枚举
  * @author lxy
  * @Date 2023/11/14 20:11
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
index 5f4ccef..a2eff57 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
@@ -19,7 +19,8 @@ public interface IStIvtIostorinvOutService extends IService<StIvtIostorinv> {
 
     /**
      * 分页查询
-     * @param query,page /
+     * @param query 查询条件
+     * @param page 分页查询
      * @return Object
      */
     Object pageQuery(IostorInvQuery query, PageQuery page);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java
index b2dcb62..75bcc27 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java
@@ -19,7 +19,8 @@ public interface IStIvtIostorinvService extends IService<StIvtIostorinv> {
 
     /**
      * 分页查询
-     * @param query,page /
+     * @param query 查询条件
+     * @param page 分页查询
      * @return Object
      */
     Object pageQuery(IostorInvQuery query, PageQuery page);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
index 148fad5..28f52d8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
@@ -29,7 +29,7 @@ public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
 
     /**
      * 获取单据明细
-     * @param {iostorinv_id} 、
+     * @param param {iostorinv_id} 、
      * @return JSONArray 、
      */
     JSONArray getIosDtl(JSONObject param);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java
index 5adb63f..3cf4cc5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java
@@ -6,7 +6,8 @@ import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
 import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv;
 
-/*
+/**
+ * 条件
  * @author LXY
  * @Date 2023/11/10 14:49
  */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 65696aa..6ce873d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -55,23 +55,41 @@ import java.util.stream.Collectors;
 @Service
 public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutMapper, StIvtIostorinv> implements IStIvtIostorinvOutService {
 
+    /**
+     * 子卷包装mapper
+     */
     @Autowired
-    private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper; // 子卷包装mapper
+    private PdmBiSubpackagerelationMapper pdmBiSubpackagerelationMapper;
 
+    /**
+     * 出入库明细服务
+     */
     @Autowired
-    private IStIvtIostorinvdtlService iStIvtIostorinvdtlService; // 出入库明细服务
+    private IStIvtIostorinvdtlService iStIvtIostorinvdtlService;
 
+    /**
+     * 出入库分配明细服务
+     */
     @Autowired
-    private IStIvtIostorinvdisService iStIvtIostorinvdisService; // 出入库分配明细服务
+    private IStIvtIostorinvdisService iStIvtIostorinvdisService;
 
+    /**
+     * 出库分配规则
+     */
     @Autowired
-    private IosOutRuleService iosOutRuleService; // 出库分配规则
+    private IosOutRuleService iosOutRuleService;
 
+    /**
+     * 点位服务
+     */
     @Autowired
-    private ISchBasePointService iSchBasePointService; // 点位服务
+    private ISchBasePointService iSchBasePointService;
 
+    /**
+     * 任务服务
+     */
     @Autowired
-    private ISchBaseTaskService iSchBaseTaskService; // 任务服务
+    private ISchBaseTaskService iSchBaseTaskService;
 
     @Override
     public Object pageQuery(IostorInvQuery query, PageQuery pageQuery) {
@@ -100,7 +118,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void create(JSONObject whereJson) {
 
         // 组织主表数据
@@ -140,7 +158,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void update(JSONObject whereJson) {
         StIvtIostorinv mstDao = this.getById(whereJson.getString("iostorinv_id"));
 
@@ -172,7 +190,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
         for (Long id : ids) {
             this.update(
@@ -194,7 +212,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void moneySubmit(JSONObject whereJson) {
         // JSONObject转实体类
         StIvtIostorinv mstDao = BeanUtil.copyProperties(whereJson,StIvtIostorinv.class);
@@ -206,7 +224,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void allDiv(JSONObject whereJson) {
         // 查出未分配的明细
         List<StIvtIostorinvdtl> dtlDaoList = new ArrayList<>();
@@ -229,9 +247,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
         if (ObjectUtil.isEmpty(dtlDaoList)) throw new BadRequestException("没有需要分配的明细!");
 
-        List<JSONObject> ivtList = iosOutRuleService.getCancelIvt(whereJson); // 库存集合
+        // 库存集合
+        List<JSONObject> ivtList = iosOutRuleService.getCancelIvt(whereJson);
 
-        List<JSONObject> disList = new ArrayList<>(); // 需插入分配明细集合
+        // 需插入分配明细集合
+        List<JSONObject> disList = new ArrayList<>();
 
         for (int i = 0; i < dtlDaoList.size(); i++) {
             StIvtIostorinvdtl dtlDao = dtlDaoList.get(i);
@@ -256,9 +276,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 dtlDao.setAssign_qty(dtlDao.getUnassign_qty());
                 dtlDao.setUnassign_qty(BigDecimal.valueOf(0));
             } else {
-                // 无批次：根据物料和销售订单找库存
-                double unassign_qty = dtlDao.getUnassign_qty().doubleValue();// 未分配重量
-                double assign_qty = 0.00; // 已分配重量
+                /*
+                 * 无批次：根据物料和销售订单找库存
+                 */
+                // 未分配重量
+                double unassign_qty = dtlDao.getUnassign_qty().doubleValue();
+                // 已分配重量
+                double assign_qty = 0.00;
 
                 // 符合条件的集合
                 List<JSONObject> ivtDaoList = ivtList.stream()
@@ -343,7 +367,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void allCancel(JSONObject whereJson) {
         // 查出已分配的明细
         List<StIvtIostorinvdtl> dtlDaoList = new ArrayList<>();
@@ -413,7 +437,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void allSetPoint(JSONObject whereJson) {
         // 判断主表状态是否为分配完
         StIvtIostorinv mstDao = this.getById(whereJson.getString("iostorinv_id"));
@@ -446,13 +470,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void issueTask(JSONObject whereJson) {
 
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void confirmTask(JSONObject whereJson) {
         // 更新任务为完成
         iSchBaseTaskService.update(
@@ -473,7 +497,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void confirm(JSONObject whereJson) {
         StIvtIostorinv mstDao = this.getById(whereJson.getString("iostorinv_id"));
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 6f3f631..864719c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -53,23 +53,41 @@ import java.util.stream.Collectors;
 @Service
 public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinv> implements IStIvtIostorinvService {
 
+    /**
+     * 子卷包装关系服务
+     */
     @Autowired
-    private IPdmBiSubpackagerelationService iPdmBiSubpackagerelationService; // 子卷包装关系服务
+    private IPdmBiSubpackagerelationService iPdmBiSubpackagerelationService;
 
+    /**
+     * 出入库明细服务
+     */
     @Autowired
-    private IStIvtIostorinvdtlService iStIvtIostorinvdtlService; // 出入库明细服务
+    private IStIvtIostorinvdtlService iStIvtIostorinvdtlService;
 
+    /**
+     * 出入库分配明细服务
+     */
     @Autowired
-    private IStIvtIostorinvdisService iStIvtIostorinvdisService; // 出入库分配明细服务
+    private IStIvtIostorinvdisService iStIvtIostorinvdisService;
 
+    /**
+     * 入库分配规则服务
+     */
     @Autowired
-    private IosInRuleService iosInRuleService; // 入库分配规则服务
+    private IosInRuleService iosInRuleService;
 
+    /**
+     * 点位服务
+     */
     @Autowired
-    private ISchBasePointService iSchBasePointService; // 点位服务
+    private ISchBasePointService iSchBasePointService;
 
+    /**
+     * 任务服务
+     */
     @Autowired
-    private ISchBaseTaskService iSchBaseTaskService; // 任务服务
+    private ISchBaseTaskService iSchBaseTaskService;
 
     @Override
     public Object pageQuery(IostorInvQuery query, PageQuery pageQuery) {
@@ -101,7 +119,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void create(JSONObject whereJson) {
 
         // 组织主表数据
@@ -141,7 +159,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void update(JSONObject whereJson) {
         StIvtIostorinv mstDao = this.getById(whereJson.getString("iostorinv_id"));
 
@@ -173,7 +191,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
         for (Long id : ids) {
             this.update(
@@ -217,7 +235,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void autoDivPoint(JSONObject whereJson) {
         // 明细
         JSONObject dtl_row = whereJson.getJSONObject("dtl_row");
@@ -287,7 +305,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void unDivPoint(JSONObject whereJson) {
 
         // 校验是否需要分配
@@ -341,7 +359,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void setPoint(JSONObject whereJson) {
 
         // 校验入库点
@@ -370,7 +388,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delTask(JSONObject whereJson) {
         // 校验任务是否为生成
         SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id"));
@@ -391,7 +409,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void issueTask(JSONObject whereJson) {
         // 校验任务是否为生成
         SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id"));
@@ -402,7 +420,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void confirmTask(JSONObject whereJson) {
         // 更新任务为完成
         iSchBaseTaskService.update(
@@ -424,7 +442,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void confirm(JSONObject whereJson) {
         StIvtIostorinv mstDao = this.getById(whereJson.getString("iostorinv_id"));
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
index 0881d21..966cf22 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
@@ -28,7 +28,7 @@ import java.util.List;
 public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisMapper, StIvtIostorinvdis> implements IStIvtIostorinvdisService {
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void insetDis(List<JSONObject> collect) {
 
         ArrayList<StIvtIostorinvdis> disDaoList = new ArrayList<>();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
index 16cf850..32c0566 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
@@ -37,17 +37,26 @@ import java.util.stream.Collectors;
 @Service
 public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlService {
 
+    /**
+     * 物料服务
+     */
     @Autowired
-    private IMdBaseMaterialService iMdBaseMaterialService; // 物料服务
+    private IMdBaseMaterialService iMdBaseMaterialService;
 
+    /**
+     * 出入库主表服务
+     */
     @Autowired
-    private IStIvtIostorinvService iStIvtIostorinvService; // 出入库主表服务
+    private IStIvtIostorinvService iStIvtIostorinvService;
 
+    /**
+     * 出入库分配服务
+     */
     @Autowired
-    private IStIvtIostorinvdisService iStIvtIostorinvdisService; // 出入库分配服务
+    private IStIvtIostorinvdisService iStIvtIostorinvdisService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ArrayList<StIvtIostorinvdtl>  insertDtl(String iostorinv_id, List<JSONObject> tableDataList) {
 
         // 查询所有对应物料集合
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/dto/RuleDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/dto/RuleDto.java
index de82639..be5335d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/dto/RuleDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/dto/RuleDto.java
@@ -1,8 +1,16 @@
 package org.nl.wms.storage_manage.ios.util.dto;
 
+/**
+ * <p>
+ * 分配规则
+ * </p>
+ *
+ * @author generator
+ * @since 2023-11-16
+ */
 public class RuleDto {
 
-    /*
+    /**
      * 入库分配：
      * 按照仓库、区域、找到一个点位
      */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosInRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosInRuleServiceImpl.java
index b3a3fa8..50af958 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosInRuleServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosInRuleServiceImpl.java
@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class IosInRuleServiceImpl implements IosInRuleService {
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public SchBasePoint getOnePoint(JSONObject param) {
         String type = param.getString("type");
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosOutRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosOutRuleServiceImpl.java
index 9118952..24373f9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosOutRuleServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/util/impl/IosOutRuleServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.List;
 public class IosOutRuleServiceImpl implements IosOutRuleService {
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public List<JSONObject> getCancelIvt(JSONObject param) {
         List<JSONObject> list = new ArrayList<>();
         return list;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java
deleted file mode 100644
index 04f6d53..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.nl.wms.util;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-/**
- * @Author: lyd
- * @Description: 通用工具
- * @Date: 2023/7/17
- */
-public class CommonUtils {
-    /**
-     *
-     * @param inStorageTime 入库时间
-     * @param standingTime 静置时间 / 分钟
-     * @return
-     */
-    public static boolean isStandingFinish(String inStorageTime, Integer standingTime) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime inStorageDateTime = LocalDateTime.parse(inStorageTime, formatter);
-        Duration standingDuration = Duration.ofMinutes(standingTime);
-        LocalDateTime currentTime = LocalDateTime.now();
-        LocalDateTime expiryTime = inStorageDateTime.plus(standingDuration);
-        return currentTime.isAfter(expiryTime);
-    }
-
-    /**
-     * 还有几分钟静置完成
-     * @param inputDateString
-     * @param staticDurationMinutes
-     * @return
-     */
-    public static String remainStandingFinishTime(String inputDateString, Integer staticDurationMinutes) {
-        // 创建SimpleDateFormat以解析日期时间字符串
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            // 将输入日期时间字符串解析为Date对象
-            Date inputDate = dateFormat.parse(inputDateString);
-            // 获取当前时间
-            Date currentDate = new Date();
-            // 计算距离静置完成还有多少毫秒
-            long timeDifferenceMillis = inputDate.getTime() + (staticDurationMinutes * 60 * 1000) - currentDate.getTime();
-            // 将毫秒转换为分钟
-            double timeDifferenceMinutes = (double) timeDifferenceMillis / (60 * 1000);
-//            System.out.println("距离静置完成还有 " + timeDifferenceMinutes + " 分钟");
-            // 计算预计完成时间
-            Date estimatedCompletionTime = new Date(currentDate.getTime() + timeDifferenceMillis);
-            // 格式化预计完成时间为字符串
-            String estimatedCompletionTimeString = dateFormat.format(estimatedCompletionTime);
-            return "距离静置完成还有 " +  String.format("%.2f", timeDifferenceMinutes) + " 分钟" + ", 预计完成时间为：" + estimatedCompletionTimeString;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 获取当前时间是白晚班
-     * @return
-     */
-    public static String getDayShift() {
-        // 获取当前时间
-        LocalTime currentTime = LocalTime.now();
-        // 设置白班和晚班的时间范围
-        LocalTime dayShiftStart = LocalTime.of(8, 0);   // 白班开始时间：8:00 AM
-        LocalTime dayShiftEnd = LocalTime.of(15, 59);    // 白班结束时间：5:00 PM
-        LocalTime nightShiftStart = LocalTime.of(16, 0); // 小夜班开始时间：5:00 PM
-        LocalTime nightShiftEnd = LocalTime.of(23, 59);  // 小夜班结束时间：11:59 PM
-
-        // 检查当前时间属于哪个班次
-        if (currentTime.isAfter(dayShiftStart) && currentTime.isBefore(dayShiftEnd)) {
-            return "白班";
-        } else if (currentTime.isAfter(nightShiftStart) && currentTime.isBefore(nightShiftEnd)) {
-            return "小夜班";
-        } else {
-            return "大夜班";
-        }
-    }
-
-    public static <T> T toJavaObject(String objectString, Class<T> clazz) {
-        JSONObject jsonObject = JSONObject.parseObject(objectString);
-        return jsonObject.toJavaObject(clazz);
-    }
-
-    public static String CurrentData() {
-        // 获取当前日期
-        LocalDate currentDate = LocalDate.now();
-        // 定义日期格式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        // 格式化日期为"20231030"
-        String formattedDate = currentDate.format(formatter);
-        return formattedDate;
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/DatabaseBackup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/DatabaseBackup.java
index ff1b7db..6f6204b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/DatabaseBackup.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/DatabaseBackup.java
@@ -21,7 +21,8 @@ public class DatabaseBackup {
         try {
             Connection connection = DriverManager.getConnection(jdbcUrl, username, password);
             // 在这里执行备份操作
-            String backupPath = "D:\\backup.sql"; // 备份文件保存的路径
+            // 备份文件保存的路径
+            String backupPath = "D:\\backup.sql";
             // 构建备份命令
             List<String> command = Arrays.asList(
                     "mysqldump",
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MainConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MainConfig.java
deleted file mode 100644
index 016aba2..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MainConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.nl.wms.util;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2023/9/27
- */
-@Configuration
-@ComponentScan(basePackages = "org.nl.wms.util")
-public class MainConfig {
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java
deleted file mode 100644
index 1f120aa..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.nl.wms.util;
-
-import org.springframework.context.ApplicationEvent;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: lyd
- * @Description: 监听事件，用来debug查看bean工厂等信息
- * @Date: 2023/5/23
- */
-public class MyEventListener extends ApplicationEvent {
-
-    public MyEventListener(Object source) {
-        super(source);
-    }
-
-//    @EventListener
-//    public void handleContextRefresh(ContextRefreshedEvent event) {
-//        ApplicationContext applicationContext = event.getApplicationContext();
-//    }
-
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java
deleted file mode 100644
index 54a6219..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.nl.wms.util;
-
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2023/9/27
- */
-@Component
-public class MyListener implements ApplicationListener<MyEventListener> {
-    @Override
-    public void onApplicationEvent(MyEventListener myEventListener) {
-        System.out.println("事件："+myEventListener.toString());
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
deleted file mode 100644
index 1c58081..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/OracleJDBCExample.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.nl.wms.util;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-
-public class OracleJDBCExample {
-
-    public static void main(String[] args) {
-        String jdbcUrl = "jdbc:oracle:thin:@172.27.37.66:1521:RTMES"; // 根据您的数据库配置修改连接字符串
-        String username = "LMSTELCOM"; // 您的数据库用户名
-        String password = "LMSTELCOM_6463"; // 您的数据库密码
-
-        Connection connection = null;
-        Statement statement = null;
-        ResultSet resultSet = null;
-
-        try {
-            // 1. 加载 Oracle JDBC 驱动程序
-            Class.forName("oracle.jdbc.OracleDriver");
-
-            // 2. 创建数据库连接
-            connection = DriverManager.getConnection(jdbcUrl, username, password);
-
-            // 3. 创建 SQL 语句执行器
-            statement = connection.createStatement();
-
-            // 4. 执行 SQL 查询
-            String sqlQuery = "SELECT * FROM RTMG.VIEW_MATERIAL_LMS"; // 根据您的查询修改表名
-            resultSet = statement.executeQuery(sqlQuery);
-
-            // 5. 处理查询结果
-            while (resultSet.next()) {
-                // 从结果集中获取数据
-                String id = resultSet.getString("MATNR"); // 根据表的列名修改
-
-                // 打印查询结果
-                System.out.println("ID: " + id);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            // 6. 关闭资源
-            try {
-                if (resultSet != null) resultSet.close();
-                if (statement != null) statement.close();
-                if (connection != null) connection.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
-
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
index 24dd769..497bc7b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java
@@ -74,7 +74,8 @@ public class PointUtils {
         point.setVehicle_code("");
         point.setIng_task_code("");
         point.setVehicle_qty(point.getVehicle_qty() == 5 ? point.getVehicle_qty() : point.getVehicle_qty() + 1);
-        if (basePoint.getVehicle_qty() == 5) { // 等到新的点执行第一托的时候，才判断另一个点满足5个托盘的时候就清空
+        // 等到新的点执行第一托的时候，才判断另一个点满足5个托盘的时候就清空
+        if (basePoint.getVehicle_qty() == 5) {
             basePoint.setVehicle_qty(0);
             basePoint.setUpdate_time(DateUtil.now());
             pointService.updateById(basePoint);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
index 66e4a15..41df837 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
@@ -67,7 +67,11 @@ public class TaskUtils {
         groupEntity.setUpdate_time(DateUtil.now());
     }
 
-    // 根据类型去判断谁修改的
+    /**
+     * 根据类型去判断谁修改的
+     * @param groupEntity
+     * @param taskFinishedType
+     */
     public static void setGroupUpdateByType(SchBaseVehiclematerialgroup groupEntity, TaskFinishedTypeEnum taskFinishedType) {
         if (taskFinishedType.equals(TaskFinishedTypeEnum.AUTO_ACS)) {
             setGroupUpdateByAcs(groupEntity);
@@ -88,7 +92,11 @@ public class TaskUtils {
         taskObj.setUpdate_time(DateUtil.now());
     }
 
-    // 根据类型去判断谁修改的
+    /**
+     * 根据类型去判断谁修改的
+     * @param taskObj
+     * @param taskFinishedType
+     */
     public static void setUpdateByType(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
         if (taskFinishedType.equals(TaskFinishedTypeEnum.AUTO_ACS)) {
             setUpdateByAcs(taskObj);
@@ -176,11 +184,15 @@ public class TaskUtils {
      * @return
      */
     public static int convertMultiply(String needFullNumberStr) {
-        String[] parts = needFullNumberStr.split("\\*"); // 使用 "*" 来分割字符串
-        int result = 1; // 初始化结果为1
+        // 使用 "*" 来分割字符串
+        String[] parts = needFullNumberStr.split("\\*");
+        // 初始化结果为1
+        int result = 1;
         for (String part : parts) {
-            int number = Integer.parseInt(part); // 将字符串部分解析为整数
-            result *= number; // 将解析的整数与结果相乘
+            // 将字符串部分解析为整数
+            int number = Integer.parseInt(part);
+            // 将解析的整数与结果相乘
+            result *= number;
         }
         return result;
     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TreePrinter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TreePrinter.java
deleted file mode 100644
index 331ba15..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TreePrinter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.nl.wms.util;
-
-import java.io.File;
-
-/**
- * @Author: lyd
- * @Description:
- * @Date: 2023/10/8
- */
-public class TreePrinter {
-    public static void main(String[] args) {
-        // 指定文件夹的路径
-        String folderPath = "D:\\Code\\Work\\rl_mg\\acs\\nladmin-system\\src\\main\\java\\org\\nl\\acs\\device_driver";
-
-        // 调用递归方法获取文件树并打印
-        File folder = new File(folderPath);
-        if (folder.exists() && folder.isDirectory()) {
-            System.out.println(folder.getAbsolutePath());
-            printFileTree(folder, "", true);
-        } else {
-            System.out.println("指定路径不是一个有效的文件夹。");
-        }
-    }
-
-    public static void printFileTree(File folder, String prefix, boolean isLast) {
-        File[] files = folder.listFiles();
-        if (files != null) {
-            int count = 0;
-            for (File file : files) {
-                count++;
-                boolean isSubfolder = file.isDirectory();
-                boolean isLastItem = count == files.length;
-
-                System.out.print(prefix);
-                System.out.print(isLastItem ? "└── " : "├── ");
-                System.out.println(file.getName());
-
-                if (isSubfolder) {
-                    String newPrefix = prefix + (isLastItem ? "    " : "│   ");
-                    printFileTree(file, newPrefix, isLastItem);
-                }
-            }
-        }
-    }
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java
deleted file mode 100644
index 8f35f59..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.nl.wms.util;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @Author: lyd
- * @Description: 将xml字符串存入xml文件中
- * @Date: 2023/8/7
- */
-public class XmlFormatter {
-    public static void main(String[] args) {
-        String xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<definitions>\n" +
-                "  <process id=\"JGXL\" name=\"机关下料\">\n" +
-                "    <start id=\"start\" name=\"Starter\" targetRef=\"A1_JGXL\"></start>\n" +
-                "    <flow id=\"A1_JGXL\" name=\"机关下料工序\" has=\"1\" sourceRef=\"start\" targetRef=\"A1_TWYTJ\">\n" +
-                "      <param id=\"cacheLine\" has=\"2\">\n" +
-                "        <item spec=\"15\" value=\"A1_HCX_01\"></item>\n" +
-                "        <item spec=\"22\" value=\"A1_HCX_02\"></item>\n" +
-                "      </param>\n" +
-                "    </flow>\n" +
-                "    <flow id=\"A1_TWYTJ\" name=\"推弯一体工序\" sourceRef=\"A1_JGXL\" targetRef=\"A1_SKQX\">\n" +
-                "    </flow>\n" +
-                "    <flow id=\"A1_SKQX\" name=\"深坑清洗\" sourceRef=\"A1_TWYTJ\" targetRef=\"end\"></flow>\n" +
-                "    <end id=\"end\" name=\"Junior Reject End\" sourceRef=\"A1_SKQX\"></end>\n" +
-                "  </process>\n" +
-                "  <process id=\"WXXL\" name=\"直管无屑下料\">\n" +
-                "    <start id=\"start\" name=\"Starter\" targetRef=\"A1_WXXL\"></start>\n" +
-                "    <flow id=\"A1_WXXL\" name=\"无屑下料工序\" has=\"1\" sourceRef=\"starter\" targetRef=\"A1_STLS\">\n" +
-                "      <param id=\"cacheLine\" value=\"A1_HCX_03\"/>\n" +
-                "    </flow>\n" +
-                "    <flow id=\"A1_STLS\" name=\"三通拉伸工序\" sourceRef=\"A1_WXXL\" targetRef=\"A1_TK\"></flow>\n" +
-                "    <flow id=\"A1_TK\" name=\"镗孔\" sourceRef=\"A1_TK\" targetRef=\"A1_SKQX\"></flow>\n" +
-                "    <flow id=\"A1_SKQX\" name=\"深坑清洗\" sourceRef=\"A1_STLS\" targetRef=\"end\"></flow>\n" +
-                "    <end id=\"end\" name=\"Junior Reject End\" sourceRef=\"A1_SKQX\"></end>\n" +
-                "  </process>\n" +
-                "</definitions>\n";
-
-        // 格式化XML字符串
-        String formattedXmlString = formatXmlString(xmlString);
-
-        // 将格式化后的XML字符串存储到文件中
-        String fileName = "xx.xml";
-        saveXmlToFile(fileName, formattedXmlString);
-    }
-
-    public static String formatXmlString(String xmlString) {
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(new InputSource(new java.io.StringReader(xmlString)));
-
-            // 格式化XML
-            TransformerFactory transformerFactory = TransformerFactory.newInstance();
-            Transformer transformer = transformerFactory.newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-            DOMSource source = new DOMSource(document);
-
-            java.io.StringWriter sw = new java.io.StringWriter();
-            StreamResult result = new StreamResult(sw);
-            transformer.transform(source, result);
-
-            return sw.toString();
-        } catch (ParserConfigurationException | IOException | SAXException | TransformerException e) {
-            e.printStackTrace();
-        }
-        return xmlString;
-    }
-
-    public static void saveXmlToFile(String fileName, String xmlString) {
-        try {
-            File file = new File(fileName);
-            FileWriter writer = new FileWriter(file);
-            writer.write(xmlString);
-            writer.flush();
-            writer.close();
-            System.out.println("XML file saved successfully.");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
-
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.java
deleted file mode 100644
index a49a721..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.nl.wms.util.test.mapper;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description: mapper接口
- * @Date: 2023/5/23
- */
-public interface TestMapper extends BaseMapper<JSONObject> {
-
-    List<HashMap<String, Object>> getAll();
-
-    JSONObject getAll2();
-
-    List<JSONObject> getAll3();
-
-    JSONArray getAll4();
-
-    JSONArray getAll5();
-
-    HashMap<String, Object> getAll6();
-
-    JSONObject getAll7();
-
-    JSONArray getAll8();
-
-    JSONArray getAll9();
-
-    JSONObject getAll10(HashMap map);
-
-    JSONArray getAll11(JSONObject map);
-
-    JSONArray getAll12(List<String> list);
-
-    void updateByObject(JSONObject object);
-}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml
deleted file mode 100644
index caac9be..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.util.test.mapper.TestMapper">
-    <resultMap id="selectPoint" type="java.util.HashMap">
-        <result property="point_code" column="point_code"/>
-        <result property="point_name" column="point_name"/>
-        <result property="region" column="region_name"/>
-    </resultMap>
-    <resultMap id="selectPoint2" type="com.alibaba.fastjson.JSONObject">
-        <result property="point_code" column="point_code"/>
-        <result property="point_name" column="point_name"/>
-        <result property="region" column="region_name"/>
-    </resultMap>
-    <update id="updateByObject" parameterType="com.alibaba.fastjson.JSONObject">
-        UPDATE sch_base_point
-        SET point_name = #{point_name}
-        WHERE point_code = #{point_code}
-    </update>
-
-    <select id="getAll" resultMap="selectPoint">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll2" resultMap="selectPoint2">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        WHERE point_code = 'HNJ01'
-    </select>
-    <select id="getAll3" resultMap="selectPoint2">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll4" resultMap="selectPoint2">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll5" resultMap="selectPoint">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll6" resultType="java.util.HashMap">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        WHERE point_code = 'HNJ01'
-    </select>
-    <select id="getAll7" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        WHERE point_code = 'HNJ01'
-    </select>
-    <select id="getAll8" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll9" resultType="java.util.HashMap">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-    </select>
-    <select id="getAll10" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.util.HashMap">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        WHERE 1 = 1
-            <if test="pointCode != '' and pointCode != null">
-               AND point_code = #{pointCode}
-            </if>
-    </select>
-    <!-- 查询所有数据 -->
-    <select id="getAll11" resultType="com.alibaba.fastjson.JSONObject" parameterType="com.alibaba.fastjson.JSONObject">
-        <!-- 查询所有数据 -->
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        <where>
-            <if test="pointCode != '' and pointCode != null">
-                AND point_code = #{pointCode} -- 条件过滤
-            </if>
-        </where>
-    </select>
-    <select id="getAll12" resultType="com.alibaba.fastjson.JSONObject" parameterType="java.util.List">
-        SELECT point_code, point_name, region_name
-        FROM sch_base_point
-        <where>
-            point_code IN
-            <foreach collection="list" item="code" separator="," open="(" close=")">
-                #{code}
-            </foreach>
-        </where>
-    </select>
-
-
-</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
index b7df35b..5866333 100644
--- a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
+++ b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
@@ -1,24 +1,8 @@
 package org.nl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.junit.jupiter.api.Test;
-import org.nl.config.MapOf;
-import org.nl.system.service.user.ISysUserService;
-import org.nl.wms.database.material.service.dao.MdBaseMaterial;
-import org.nl.wms.ext.mes.service.WmsToMesService;
-import org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.task.tasks.yz.mapper.YZMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.List;
-
 /**
  * @Author: lyd
  * @Description: 单元测试
@@ -26,57 +10,9 @@ import java.util.List;
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class ApplicationTest {
-    @Autowired
-    private ISysUserService userService;
-    @Autowired
-    private ISchBasePointService pointService;
-    @Autowired
-    private YZMapper yzMapper;
-    @Autowired
-    private WmsToMesService wms;
-    @Autowired
-    private MesRequestMapper mesRequestMapper;
+
     @Test
     void contextLoads() {
-        System.out.println(userService.list());
     }
-    @Test
-    void yzMapperTest() {
-//        List<SchBasePoint> pointForYZSL = yzMapper.findPointForYZSL(new JSONObject(
-//                MapOf.of("regionCode", "HCSSX", "pointType", "1")));
-        int countUp = yzMapper.countConveyorLine("HCSSX", GeneralDefinition.UPPER_CONVEYOR_LINE,
-                PointStatusEnum.EMPTY_POINT.getCode());
-        System.out.println(countUp);
-    }
-    @Test
-    void yzMapper2Test() {
-//        String apply = "ORDER BY point_code";
-        int countUp = yzMapper.countConveyorLine("HCSSX", GeneralDefinition.UPPER_CONVEYOR_LINE,
-                PointStatusEnum.EMPTY_POINT.getCode());
-        int countLower = yzMapper.countConveyorLine("HCSSX", GeneralDefinition.LOWER_CONVEYOR_LINE,
-                PointStatusEnum.EMPTY_POINT.getCode());
-//        if (countUp < countLower) {
-//            apply = "ORDER BY point_code DESC";
-//        }
-        LambdaQueryWrapper<SchBasePoint> lam = new QueryWrapper<SchBasePoint>().lambda();
-        lam.eq(SchBasePoint::getRegion_code, "HCSSX")
-                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
-                .eq(SchBasePoint::getPoint_type, GeneralDefinition.ENTRANCE) // 对接位
-                .and(la -> la.isNull(SchBasePoint::getIng_task_code) // 当前执行的任务为空或者NULL，有数据表示锁住
-                        .or()
-                        .eq(SchBasePoint::getIng_task_code, ""))
-                .eq(SchBasePoint::getIs_used, true)
-                .orderBy(true, countUp > countLower, SchBasePoint::getPoint_code);
-        List<SchBasePoint> schBasePoints = pointService.list(lam);
-        System.out.println(schBasePoints.get(0));
-    }
-
-    @Test
-    public void formats() {
-        String original = "1115";
-        String formatted = String.format("%04d", Integer.parseInt(original));
-        System.out.println("Formatted: " + formatted);
-    }
-
 
 }
diff --git a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/task/MapperTest.java b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/task/MapperTest.java
deleted file mode 100644
index dd9f684..0000000
--- a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/task/MapperTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.nl.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.junit.jupiter.api.Test;
-import org.nl.common.exception.BadRequestException;
-import org.nl.config.MapOf;
-import org.nl.config.language.LangProcess;
-import org.nl.wms.sch.point.service.ISchBasePointService;
-import org.nl.wms.sch.point.service.dao.SchBasePoint;
-import org.nl.wms.util.test.mapper.TestMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @Author: lyd
- * @Description: 单元测试
- * @Date: 2023/5/19
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class MapperTest {
-    @Autowired
-    private TestMapper testMapper;
-
-    @Autowired
-    private ISchBasePointService pointService;
-
-    /**
-     * 无参查询
-     * 返回类型: List<HashMap<String, Object>> 等同于JSONArray
-     * 定义resultMap
-     */
-    @Test
-    void testMapper() {
-        List<HashMap<String, Object>> all = testMapper.getAll();
-        System.out.println(all);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONObject
-     * 定义resultMap
-     */
-    @Test
-    void testMapper2() {
-        JSONObject all2 = testMapper.getAll2();
-        System.out.println(all2);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: List<JSONObject> 等同JSONArray
-     * 定义resultMap
-     */
-    @Test
-    void testMapper3() {
-        List<JSONObject> all3 = testMapper.getAll3();
-        System.out.println(all3);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONArray
-     * 每条记录类型: JSONObject
-     * 定义resultMap
-     */
-    @Test
-    void testMapper4() {
-        JSONArray all4 = testMapper.getAll4();
-        System.out.println(all4);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONArray
-     * 每条记录类型: HashMap
-     * 定义resultMap
-     */
-    @Test
-    void testMapper5() {
-        JSONArray all5 = testMapper.getAll5();
-        System.out.println(all5);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: HashMap
-     */
-    @Test
-    void testMapper6() {
-        HashMap<String, Object> all6 = testMapper.getAll6();
-        System.out.println("结果集：" + all6);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONObject
-     */
-    @Test
-    void testMapper7() {
-        JSONObject all7 = testMapper.getAll7();
-        System.out.println("结果集：" + all7);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONArray
-     * 每条记录类型: JSONObject
-     */
-    @Test
-    void testMapper8() {
-        JSONArray all8 = testMapper.getAll8();
-        System.out.println("结果集：" + all8);
-    }
-
-    /**
-     * 无参查询
-     * 返回类型: JSONArray
-     * 每条记录类型: HashMap
-     */
-    @Test
-    void testMapper9() {
-        JSONArray all9 = testMapper.getAll9();
-        System.out.println("结果集：" + all9);
-    }
-
-    /**
-     * 含参查询
-     * 返回类型: JSONObject
-     * 传参类型: HashMap
-     */
-    @Test
-    void testMapper10() {
-        JSONObject all10 = testMapper.getAll10(MapOf.of("pointCode", "HNJ01"));
-        System.out.println("结果集：" + all10);
-    }
-
-    /**
-     * 含参查询
-     * 返回类型: JSONObject
-     * 传参类型: JSONObject
-     */
-    @Test
-    void testMapper11() {
-        //
-        JSONObject json=new JSONObject();
-//        json.put("pointCode","HNJ01");
-        JSONArray all11 = testMapper.getAll11(json);
-        System.out.println("结果集：" + all11);
-    }
-
-    /**
-     * mybatis - for的写法 - 使用于IN查询
-     */
-    @Test
-    void testMapper12() {
-        List<String> list = Arrays.asList("HNJ01", "KLHJ02");
-//        List<String> list = new ArrayList<>();
-        JSONArray all12 = testMapper.getAll12(list);
-        System.out.println("结果集：" + all12);
-    }
-
-    @Test
-    void testMapper13() {
-        SchBasePoint bcphj01 = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, "BCPHJ01"));
-        String s = JSON.toJSONString(bcphj01);
-        JSONObject jsonObject = JSONObject.parseObject(s);
-        jsonObject.put("point_name", "测试");
-        testMapper.updateByObject(jsonObject);
-    }
-
-
-    @Test
-    void test111() {
-        try {
-            for (int i = 0; i < 5; i++) {
-                // 参数处理
-                if (i == 1) {
-                    throw new BadRequestException(LangProcess.msg("error_SystemError"));
-                }
-                try {
-                    // 创建
-                    if (i == 2) {
-                        throw new BadRequestException(LangProcess.msg("error_SystemError"));
-                    }
-                }catch (Exception e) {
-                    // 记录
-                    System.out.println("捕获 - 2");
-                }
-
-                // 成功
-                System.out.println(i);
-            }
-        } catch (Exception e) {
-            System.out.println("捕获 - 1");
-        }
-    }
-    @Test
-    void test112() {
-        try {
-            // 转换
-            for (int i = 0; i < 5; i++) {
-                try {
-                    // 参数处理
-                    if (i == 1) {
-                        throw new BadRequestException(LangProcess.msg("error_SystemError"));
-                    }
-                    // 创建任务
-                    if (i == 2) {
-                        throw new BadRequestException(LangProcess.msg("error_SystemError"));
-                    }
-
-                    // 成功
-                    System.out.println(i);
-                } catch (Exception e) {
-                    // add
-                    System.out.println("ssssssss");
-                }
-            }
-        } catch (Exception e) {
-            // x 400
-        }
-        // 200  errArray()
-
-    }
-}