ACS基线接口改造
This commit is contained in:
0
.idea/.gitignore
generated
vendored
Normal file
0
.idea/.gitignore
generated
vendored
Normal file
11
.idea/aws.xml
generated
Normal file
11
.idea/aws.xml
generated
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="accountSettings">
|
||||
<option name="activeRegion" value="us-east-1" />
|
||||
<option name="recentlyUsedRegions">
|
||||
<list>
|
||||
<option value="us-east-1" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
9
.idea/beiterui.iml
generated
Normal file
9
.idea/beiterui.iml
generated
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
25
.idea/compiler.xml
generated
Normal file
25
.idea/compiler.xml
generated
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<module name="nlsso-server (1)" />
|
||||
<module name="nlsso-server (2)" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="nladmin-system" target="1.8" />
|
||||
<module name="nlsso-server" target="1.8" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
<component name="JavacSettings">
|
||||
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
|
||||
<module name="nlsso-server" options="" />
|
||||
<module name="nlsso-server (1)" options="-parameters" />
|
||||
<module name="nlsso-server (2)" options="-parameters" />
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
13
.idea/encodings.xml
generated
Normal file
13
.idea/encodings.xml
generated
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/acs/nladmin-system/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/acs/nladmin-system/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lms/nladmin-system/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/lms/nladmin-system/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
5
.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
5
.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
@@ -0,0 +1,5 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="PROJECT_PROFILE" />
|
||||
</settings>
|
||||
</component>
|
||||
20
.idea/jarRepositories.xml
generated
Normal file
20
.idea/jarRepositories.xml
generated
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="http://121.40.234.130:8081/repository/maven-public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
15
.idea/misc.xml
generated
Normal file
15
.idea/misc.xml
generated
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/acs/nladmin-system/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/lms/nladmin-system/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/beiterui.iml" filepath="$PROJECT_DIR$/.idea/beiterui.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
347
.idea/workspace.xml
generated
Normal file
347
.idea/workspace.xml
generated
Normal file
@@ -0,0 +1,347 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="68a9d4fc-7a4f-4244-aeee-e0e036a74bcf" name="更改" comment="基线版本差异调整">
|
||||
<change afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStatusRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStatusResponse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/AcsToWmsService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/PalletizeDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/Resp.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/ResultForAcs.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/SignalData.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/BaseRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/BaseResponse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/acs/ApplyTaskResponse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/acs/CancelTaskRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/acs/DeviceInfoDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/AcsResponse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/ApplyDeviceDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/ApplySignalStatusRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/ApplyTaskRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/CancelTaskResponse.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/to/wms/FeedBackTaskStatusRequest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvUtil.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BaseRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BaseRequest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/AcsToWmsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XSCKTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XSCKTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ZJBZKDDTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ZJBZKDDTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/YZMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/YZMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/group/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/group/index.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/point/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/point/index.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/task/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/lms/nladmin-ui/src/views/wms/sch/task/index.vue" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="useMavenConfig" value="true" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProblemsViewState">
|
||||
<option name="autoscrollToSource" value="true" />
|
||||
</component>
|
||||
<component name="ProjectId" id="2U5jExMzDj9DYSQYwRsfUTeg57a" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"last_opened_file_path": "D:/workSpace/beiterui/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "模块",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"spring.configuration.checksum": "e4ee2f4706eb22f8f8c7bfa0ca2c8645",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}</component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CreateClassDialog.RecentsKey">
|
||||
<recent name="org.nl.acs.ext.wms" />
|
||||
</key>
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\workSpace\beiterui\lms\nladmin-system\nlsso-server\src\main\java\org\nl\wms\ext" />
|
||||
<recent name="D:\workSpace\beiterui\acs\nladmin-system\nlsso-server\src\main\java\org\nl\acs\ext\wms\data" />
|
||||
<recent name="D:\workSpace\beiterui\acs\nladmin-system\nlsso-server\src\main\java\org\nl\acs" />
|
||||
<recent name="D:\workSpace\beiterui\acs\nladmin-system\nlsso-server\src\main\java\org\nl\common\utils" />
|
||||
<recent name="D:\workSpace\beiterui\acs\nladmin-system\nlsso-server\src\main\java\org\nl\config" />
|
||||
</key>
|
||||
<key name="CopyClassDialog.RECENTS_KEY">
|
||||
<recent name="org.nl.wms.ext" />
|
||||
<recent name="org.nl.acs.ext.wms" />
|
||||
<recent name="org.nl.acs.device_driver" />
|
||||
<recent name="org.nl.wms.sch.task_manage.task.tasks.ghs" />
|
||||
<recent name="org.nl.wms.sch.task_manage.task.tasks" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.lms">
|
||||
<configuration name="acs" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="nlsso-server (1)" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="org.nl.AppRun" />
|
||||
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
|
||||
<option name="credential" />
|
||||
<option name="region" />
|
||||
<option name="useCurrentConnection" value="false" />
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="lms" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="nlsso-server (2)" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="org.nl.AppRun" />
|
||||
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
|
||||
<option name="credential" />
|
||||
<option name="region" />
|
||||
<option name="useCurrentConnection" value="false" />
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="SvnConfiguration">
|
||||
<configuration>C:\Users\Dell\AppData\Roaming\Subversion</configuration>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="68a9d4fc-7a4f-4244-aeee-e0e036a74bcf" name="更改" comment="" />
|
||||
<created>1692236228215</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1692236228215</updated>
|
||||
<workItem from="1692236229757" duration="189000" />
|
||||
<workItem from="1692236742855" duration="5527000" />
|
||||
<workItem from="1692251057371" duration="4312000" />
|
||||
<workItem from="1692264017741" duration="1901000" />
|
||||
<workItem from="1692318755272" duration="9713000" />
|
||||
<workItem from="1692431212097" duration="616000" />
|
||||
<workItem from="1692509276678" duration="58000" />
|
||||
<workItem from="1692578804917" duration="4925000" />
|
||||
<workItem from="1692614063225" duration="69000" />
|
||||
<workItem from="1692663914221" duration="11875000" />
|
||||
<workItem from="1692688884546" duration="383000" />
|
||||
<workItem from="1692691309407" duration="2551000" />
|
||||
<workItem from="1692751151962" duration="2444000" />
|
||||
<workItem from="1692753625994" duration="7948000" />
|
||||
<workItem from="1692837823870" duration="12179000" />
|
||||
<workItem from="1692924045800" duration="12798000" />
|
||||
<workItem from="1692952697992" duration="2325000" />
|
||||
<workItem from="1693184674480" duration="2599000" />
|
||||
<workItem from="1693386794185" duration="1189000" />
|
||||
<workItem from="1693815199943" duration="309000" />
|
||||
<workItem from="1693873790713" duration="5699000" />
|
||||
<workItem from="1693960637035" duration="118000" />
|
||||
<workItem from="1694416738033" duration="3266000" />
|
||||
<workItem from="1694478894766" duration="3905000" />
|
||||
<workItem from="1694511911563" duration="690000" />
|
||||
<workItem from="1694566314305" duration="7142000" />
|
||||
<workItem from="1694651357018" duration="258000" />
|
||||
<workItem from="1694654061249" duration="1264000" />
|
||||
<workItem from="1694740394864" duration="620000" />
|
||||
<workItem from="1695602451414" duration="13351000" />
|
||||
<workItem from="1695688670306" duration="15000" />
|
||||
<workItem from="1695688885290" duration="1319000" />
|
||||
<workItem from="1695690709621" duration="4571000" />
|
||||
<workItem from="1695728624697" duration="595000" />
|
||||
<workItem from="1695776890654" duration="10836000" />
|
||||
<workItem from="1695863198669" duration="15371000" />
|
||||
<workItem from="1696638533993" duration="11266000" />
|
||||
<workItem from="1696810649874" duration="23287000" />
|
||||
<workItem from="1696901975020" duration="19770000" />
|
||||
<workItem from="1696987275046" duration="373000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="初始化提交">
|
||||
<created>1692255936629</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692255936629</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="fix">
|
||||
<created>1692264853815</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692264853815</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="fix">
|
||||
<created>1692335875733</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692335875733</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="同步">
|
||||
<created>1692344232955</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692344232955</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="同步">
|
||||
<created>1692691703800</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692691703800</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="同步">
|
||||
<created>1692754464305</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692754464305</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00007" summary="同步">
|
||||
<created>1692769559855</created>
|
||||
<option name="number" value="00007" />
|
||||
<option name="presentableId" value="LOCAL-00007" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1692769559855</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00008" summary="LMS基线更新马钢版本">
|
||||
<created>1695794790261</created>
|
||||
<option name="number" value="00008" />
|
||||
<option name="presentableId" value="LOCAL-00008" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1695794790261</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00009" summary="fix">
|
||||
<created>1696639760545</created>
|
||||
<option name="number" value="00009" />
|
||||
<option name="presentableId" value="LOCAL-00009" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696639760545</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="10" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="OPEN_GENERIC_TABS">
|
||||
<map>
|
||||
<entry key="d19747fb-5383-4c26-9c84-c76063f89821" value="TOOL_WINDOW" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="d19747fb-5383-4c26-9c84-c76063f89821">
|
||||
<value>
|
||||
<State>
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="HEAD" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
<entry key="roots">
|
||||
<value>
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="初始化提交" />
|
||||
<MESSAGE value="同步" />
|
||||
<MESSAGE value="LMS初始版本提交" />
|
||||
<MESSAGE value="LMS基线更新马钢版本" />
|
||||
<MESSAGE value="fix" />
|
||||
<MESSAGE value="基线版本差异调整" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="基线版本差异调整" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java</url>
|
||||
<line>109</line>
|
||||
<option name="timeStamp" value="31" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
||||
Reference in New Issue
Block a user