wms / wms2_xinyi · Commits

Commit 81c737f9308352b30b79bb982280afe7b1d344ff

Authored by pengcheng
1 parent c0c7ee48
master ... develop

maven

Inline Side-by-side
Showing 21 changed files with 951 additions and 271 deletions
.idea/.gitignore 0 → 100644
  View file @81c737f
  1 +# Datasource local storage ignored files
  2 +/dataSources/
  3 +/dataSources.local.xml
0 4 \ No newline at end of file
... ...
.idea/dataSources.xml 0 → 100644
  View file @81c737f
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
  4 + <data-source source="LOCAL" name="wms2" uuid="e67b6455-2363-423c-bed8-503129974854">
  5 + <driver-ref>mysql</driver-ref>
  6 + <synchronize>true</synchronize>
  7 + <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
  8 + <jdbc-url>jdbc:mysql://172.16.29.45:3306/wms_v2</jdbc-url>
  9 + <driver-properties>
  10 + <property name="autoReconnect" value="true" />
  11 + <property name="zeroDateTimeBehavior" value="convertToNull" />
  12 + <property name="tinyInt1isBit" value="false" />
  13 + <property name="characterEncoding" value="utf8" />
  14 + <property name="characterSetResults" value="utf8" />
  15 + <property name="yearIsDateType" value="false" />
  16 + </driver-properties>
  17 + </data-source>
  18 + </component>
  19 +</project>
0 20 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml renamed to .idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
  2 + <library name="Maven: com.baomidou:mybatis-plus:3.1.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_22.xml renamed to .idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
  2 + <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_23.xml renamed to .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
  2 + <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_6.xml renamed to .idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper:5.1.6">
  2 + <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_62.xml renamed to .idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper:5.1.6">
  2 + <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_63.xml renamed to .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper:5.1.6">
  2 + <library name="Maven: com.github.jsqlparser:jsqlparser:2.0">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.0/jsqlparser-2.0.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.0/jsqlparser-2.0-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.0/jsqlparser-2.0-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_23.xml renamed to .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2">
  2 + <library name="Maven: com.github.pagehelper:pagehelper:5.1.10">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.10/pagehelper-5.1.10.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.10/pagehelper-5.1.10-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.10/pagehelper-5.1.10-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_7.xml renamed to .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_12.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7">
  2 + <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.12/pagehelper-spring-boot-autoconfigure-1.2.12.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.12/pagehelper-spring-boot-autoconfigure-1.2.12-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.12/pagehelper-spring-boot-autoconfigure-1.2.12-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_72.xml deleted
View file @c0c7ee4
1   -<component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_73.xml deleted
View file @c0c7ee4
1   -<component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7">
3   - <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7.jar!/" />
5   - </CLASSES>
6   - <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-javadoc.jar!/" />
8   - </JAVADOC>
9   - <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-sources.jar!/" />
11   - </SOURCES>
12   - </library>
13   -</component>
14 0 \ No newline at end of file
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_7.xml renamed to .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_12.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7">
  2 + <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.12">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.12/pagehelper-spring-boot-starter-1.2.12.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.12/pagehelper-spring-boot-starter-1.2.12-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.12/pagehelper-spring-boot-starter-1.2.12-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_72.xml renamed to .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7">
  2 + <library name="Maven: commons-fileupload:commons-fileupload:1.4">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_73.xml renamed to .idea/libraries/Maven__commons_io_commons_io_2_2.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7">
  2 + <library name="Maven: commons-io:commons-io:2.2">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_22.xml renamed to .idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2">
  2 + <library name="Maven: org.mybatis:mybatis:3.5.1">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_23.xml renamed to .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2">
  2 + <library name="Maven: org.mybatis:mybatis-spring:2.0.1">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml renamed to .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_0_1.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2">
  2 + <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.1">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.0.1/mybatis-spring-boot-autoconfigure-2.0.1.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.0.1/mybatis-spring-boot-autoconfigure-2.0.1-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.0.1/mybatis-spring-boot-autoconfigure-2.0.1-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml renamed to .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_0_1.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2">
  2 + <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.0.1/mybatis-spring-boot-starter-2.0.1.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.0.1/mybatis-spring-boot-starter-2.0.1-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.0.1/mybatis-spring-boot-starter-2.0.1-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_22.xml renamed to .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
  View file @81c737f
1 1 <component name="libraryTable">
2   - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2">
  2 + <library name="Maven: org.projectlombok:lombok:1.18.8">
3 3 <CLASSES>
4   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2.jar!/" />
  4 + <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
5 5 </CLASSES>
6 6 <JAVADOC>
7   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-javadoc.jar!/" />
  7 + <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
8 8 </JAVADOC>
9 9 <SOURCES>
10   - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-sources.jar!/" />
  10 + <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
11 11 </SOURCES>
12 12 </library>
13 13 </component>
14 14 \ No newline at end of file
... ...
.idea/workspace.xml
  View file @81c737f
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="用户查询修改">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" afterDir="false" />
7   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml" beforeDir="false" />
10   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml" beforeDir="false" />
11   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml" beforeDir="false" />
12   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml" beforeDir="false" />
13   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" />
14   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" beforeDir="false" />
15   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
16   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
17   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml" beforeDir="false" />
18   - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml" beforeDir="false" />
  4 + <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="回退">
  5 + <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml" beforeDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_22.xml" beforeDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_23.xml" beforeDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_6.xml" beforeDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_62.xml" beforeDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_63.xml" beforeDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_7.xml" beforeDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_72.xml" beforeDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_73.xml" beforeDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_7.xml" beforeDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_72.xml" beforeDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_73.xml" beforeDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml" beforeDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_22.xml" beforeDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_23.xml" beforeDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml" beforeDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_22.xml" beforeDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_23.xml" beforeDir="false" />
19 24 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" afterDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" afterDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" afterDir="false" />
  28 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" afterDir="false" />
  29 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" afterDir="false" />
  30 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" afterDir="false" />
20 31 </list>
21   - <ignored path="$PROJECT_DIR$/classes/" />
22 32 <ignored path="$PROJECT_DIR$/target/" />
23 33 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
24 34 <option name="SHOW_DIALOG" value="false" />
... ... @@ -26,13 +36,43 @@
26 36 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
27 37 <option name="LAST_RESOLUTION" value="IGNORE" />
28 38 </component>
  39 + <component name="DatabaseView">
  40 + <option name="SHOW_INTERMEDIATE" value="true" />
  41 + <option name="GROUP_DATA_SOURCES" value="true" />
  42 + <option name="GROUP_SCHEMA" value="true" />
  43 + <option name="GROUP_CONTENTS" value="false" />
  44 + <option name="SORT_POSITIONED" value="false" />
  45 + <option name="SHOW_EMPTY_GROUPS" value="false" />
  46 + <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
  47 + <option name="HIDDEN_KINDS">
  48 + <set />
  49 + </option>
  50 + <expand>
  51 + <path>
  52 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  53 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
  54 + </path>
  55 + <path>
  56 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  57 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
  58 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  59 + </path>
  60 + <path>
  61 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  62 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
  63 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  64 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  65 + </path>
  66 + </expand>
  67 + <select />
  68 + </component>
29 69 <component name="FileEditorManager">
30 70 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31 71 <file pinned="false" current-in-tab="false">
32   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java">
  72 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java">
33 73 <provider selected="true" editor-type-id="text-editor">
34   - <state relative-caret-position="1955">
35   - <caret line="85" selection-start-line="85" selection-end-line="85" />
  74 + <state relative-caret-position="436">
  75 + <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
36 76 <folding>
37 77 <element signature="imports" expanded="true" />
38 78 </folding>
... ... @@ -41,31 +81,28 @@
41 81 </entry>
42 82 </file>
43 83 <file pinned="false" current-in-tab="false">
44   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserRoleMapper.java">
  84 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html">
45 85 <provider selected="true" editor-type-id="text-editor">
46   - <state relative-caret-position="207">
47   - <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
  86 + <state relative-caret-position="385">
  87 + <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" />
48 88 </state>
49 89 </provider>
50 90 </entry>
51 91 </file>
52 92 <file pinned="false" current-in-tab="false">
53   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
  93 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html">
54 94 <provider selected="true" editor-type-id="text-editor">
55   - <state relative-caret-position="115">
56   - <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
57   - <folding>
58   - <element signature="imports" expanded="true" />
59   - </folding>
  95 + <state relative-caret-position="268">
  96 + <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
60 97 </state>
61 98 </provider>
62 99 </entry>
63 100 </file>
64   - <file pinned="false" current-in-tab="true">
65   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
  101 + <file pinned="false" current-in-tab="false">
  102 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java">
66 103 <provider selected="true" editor-type-id="text-editor">
67   - <state relative-caret-position="404">
68   - <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
  104 + <state relative-caret-position="200">
  105 + <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
69 106 <folding>
70 107 <element signature="imports" expanded="true" />
71 108 </folding>
... ... @@ -73,20 +110,23 @@
73 110 </provider>
74 111 </entry>
75 112 </file>
76   - <file pinned="false" current-in-tab="false">
77   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
  113 + <file pinned="false" current-in-tab="true">
  114 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java">
78 115 <provider selected="true" editor-type-id="text-editor">
79   - <state relative-caret-position="23">
80   - <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
  116 + <state relative-caret-position="358">
  117 + <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
  118 + <folding>
  119 + <element signature="imports" expanded="true" />
  120 + </folding>
81 121 </state>
82 122 </provider>
83 123 </entry>
84 124 </file>
85 125 <file pinned="false" current-in-tab="false">
86   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
  126 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java">
87 127 <provider selected="true" editor-type-id="text-editor">
88   - <state relative-caret-position="115">
89   - <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
  128 + <state relative-caret-position="200">
  129 + <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
90 130 <folding>
91 131 <element signature="imports" expanded="true" />
92 132 </folding>
... ... @@ -95,10 +135,13 @@
95 135 </entry>
96 136 </file>
97 137 <file pinned="false" current-in-tab="false">
98   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
  138 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java">
99 139 <provider selected="true" editor-type-id="text-editor">
100   - <state relative-caret-position="529">
101   - <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
  140 + <state relative-caret-position="350">
  141 + <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
  142 + <folding>
  143 + <element signature="imports" expanded="true" />
  144 + </folding>
102 145 </state>
103 146 </provider>
104 147 </entry>
... ... @@ -113,6 +156,11 @@
113 156 </list>
114 157 </option>
115 158 </component>
  159 + <component name="FindInProjectRecents">
  160 + <findStrings>
  161 + <find>zone</find>
  162 + </findStrings>
  163 + </component>
116 164 <component name="Git.Settings">
117 165 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
118 166 <option name="RECENT_BRANCH_BY_REPOSITORY">
... ... @@ -124,26 +172,62 @@
124 172 <component name="IdeDocumentHistory">
125 173 <option name="CHANGED_PATHS">
126 174 <list>
  175 + <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
  176 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java" />
  177 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java" />
  178 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" />
  179 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" />
  180 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" />
  181 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" />
  182 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" />
127 183 <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" />
128   - <option value="$PROJECT_DIR$/src/main/resources/templates/system/user/user.html" />
129   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java" />
130   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" />
131   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" />
132   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
  184 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java" />
  185 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" />
  186 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" />
  187 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java" />
  188 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java" />
  189 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" />
  190 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml" />
  191 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" />
  192 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" />
  193 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" />
  194 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" />
  195 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java" />
  196 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" />
  197 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java" />
133 198 </list>
134 199 </option>
135 200 </component>
  201 + <component name="IgnoredFileRootStore">
  202 + <option name="generatedRoots">
  203 + <set>
  204 + <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" />
  205 + </set>
  206 + </option>
  207 + </component>
  208 + <component name="MavenImportPreferences">
  209 + <option name="importingSettings">
  210 + <MavenImportingSettings>
  211 + <option name="importAutomatically" value="true" />
  212 + </MavenImportingSettings>
  213 + </option>
  214 + </component>
136 215 <component name="ProjectFrameBounds" extendedState="6">
137   - <option name="x" value="-1928" />
138   - <option name="y" value="-8" />
139   - <option name="width" value="1936" />
140   - <option name="height" value="1056" />
  216 + <option name="x" value="-9" />
  217 + <option name="y" value="-9" />
  218 + <option name="width" value="1938" />
  219 + <option name="height" value="1048" />
141 220 </component>
  221 + <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" />
142 222 <component name="ProjectView">
143 223 <navigator proportions="" version="1">
  224 + <flattenPackages ProjectPane="false" />
  225 + <hideEmptyPackages ProjectPane="false" />
144 226 <foldersAlwaysOnTop value="true" />
145 227 </navigator>
146 228 <panes>
  229 + <pane id="PackagesPane" />
  230 + <pane id="Scope" />
147 231 <pane id="ProjectPane">
148 232 <subPane>
149 233 <expand>
... ... @@ -205,7 +289,7 @@
205 289 <item name="com" type="462c0819:PsiDirectoryNode" />
206 290 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
207 291 <item name="pc" type="462c0819:PsiDirectoryNode" />
208   - <item name="general" type="462c0819:PsiDirectoryNode" />
  292 + <item name="config" type="462c0819:PsiDirectoryNode" />
209 293 </path>
210 294 <path>
211 295 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -216,39 +300,194 @@
216 300 <item name="com" type="462c0819:PsiDirectoryNode" />
217 301 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
218 302 <item name="pc" type="462c0819:PsiDirectoryNode" />
219   - <item name="general" type="462c0819:PsiDirectoryNode" />
  303 + <item name="config" type="462c0819:PsiDirectoryNode" />
220 304 <item name="zone" type="462c0819:PsiDirectoryNode" />
221 305 </path>
222 306 <path>
223 307 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
224 308 <item name="wms2" type="462c0819:PsiDirectoryNode" />
225 309 <item name="src" type="462c0819:PsiDirectoryNode" />
226   - <item name="test" type="462c0819:PsiDirectoryNode" />
  310 + <item name="main" type="462c0819:PsiDirectoryNode" />
  311 + <item name="java" type="462c0819:PsiDirectoryNode" />
  312 + <item name="com" type="462c0819:PsiDirectoryNode" />
  313 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  314 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  315 + <item name="config" type="462c0819:PsiDirectoryNode" />
  316 + <item name="zone" type="462c0819:PsiDirectoryNode" />
  317 + <item name="controller" type="462c0819:PsiDirectoryNode" />
227 318 </path>
228 319 <path>
229 320 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
230 321 <item name="wms2" type="462c0819:PsiDirectoryNode" />
231 322 <item name="src" type="462c0819:PsiDirectoryNode" />
232   - <item name="test" type="462c0819:PsiDirectoryNode" />
  323 + <item name="main" type="462c0819:PsiDirectoryNode" />
233 324 <item name="java" type="462c0819:PsiDirectoryNode" />
  325 + <item name="com" type="462c0819:PsiDirectoryNode" />
  326 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  327 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  328 + <item name="config" type="462c0819:PsiDirectoryNode" />
  329 + <item name="zone" type="462c0819:PsiDirectoryNode" />
  330 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
234 331 </path>
235 332 <path>
236 333 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
237 334 <item name="wms2" type="462c0819:PsiDirectoryNode" />
238 335 <item name="src" type="462c0819:PsiDirectoryNode" />
239   - <item name="test" type="462c0819:PsiDirectoryNode" />
  336 + <item name="main" type="462c0819:PsiDirectoryNode" />
240 337 <item name="java" type="462c0819:PsiDirectoryNode" />
241   - <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
  338 + <item name="com" type="462c0819:PsiDirectoryNode" />
  339 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  340 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  341 + <item name="config" type="462c0819:PsiDirectoryNode" />
  342 + <item name="zone" type="462c0819:PsiDirectoryNode" />
  343 + <item name="service" type="462c0819:PsiDirectoryNode" />
  344 + </path>
  345 + <path>
  346 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  347 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  348 + <item name="src" type="462c0819:PsiDirectoryNode" />
  349 + <item name="main" type="462c0819:PsiDirectoryNode" />
  350 + <item name="java" type="462c0819:PsiDirectoryNode" />
  351 + <item name="com" type="462c0819:PsiDirectoryNode" />
  352 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  353 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  354 + <item name="config" type="462c0819:PsiDirectoryNode" />
  355 + <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />
  356 + </path>
  357 + <path>
  358 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  359 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  360 + <item name="src" type="462c0819:PsiDirectoryNode" />
  361 + <item name="main" type="462c0819:PsiDirectoryNode" />
  362 + <item name="java" type="462c0819:PsiDirectoryNode" />
  363 + <item name="com" type="462c0819:PsiDirectoryNode" />
  364 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  365 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  366 + <item name="config" type="462c0819:PsiDirectoryNode" />
  367 + <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />
  368 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  369 + </path>
  370 + <path>
  371 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  372 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  373 + <item name="src" type="462c0819:PsiDirectoryNode" />
  374 + <item name="main" type="462c0819:PsiDirectoryNode" />
  375 + <item name="java" type="462c0819:PsiDirectoryNode" />
  376 + <item name="com" type="462c0819:PsiDirectoryNode" />
  377 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  378 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  379 + <item name="config" type="462c0819:PsiDirectoryNode" />
  380 + <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />
  381 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
  382 + </path>
  383 + <path>
  384 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  385 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  386 + <item name="src" type="462c0819:PsiDirectoryNode" />
  387 + <item name="main" type="462c0819:PsiDirectoryNode" />
  388 + <item name="java" type="462c0819:PsiDirectoryNode" />
  389 + <item name="com" type="462c0819:PsiDirectoryNode" />
  390 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  391 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  392 + <item name="config" type="462c0819:PsiDirectoryNode" />
  393 + <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />
  394 + <item name="service" type="462c0819:PsiDirectoryNode" />
  395 + </path>
  396 + <path>
  397 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  398 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  399 + <item name="src" type="462c0819:PsiDirectoryNode" />
  400 + <item name="main" type="462c0819:PsiDirectoryNode" />
  401 + <item name="java" type="462c0819:PsiDirectoryNode" />
  402 + <item name="com" type="462c0819:PsiDirectoryNode" />
  403 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  404 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  405 + <item name="general" type="462c0819:PsiDirectoryNode" />
  406 + </path>
  407 + <path>
  408 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  409 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  410 + <item name="src" type="462c0819:PsiDirectoryNode" />
  411 + <item name="main" type="462c0819:PsiDirectoryNode" />
  412 + <item name="java" type="462c0819:PsiDirectoryNode" />
  413 + <item name="com" type="462c0819:PsiDirectoryNode" />
  414 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  415 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  416 + <item name="general" type="462c0819:PsiDirectoryNode" />
  417 + <item name="company" type="462c0819:PsiDirectoryNode" />
  418 + </path>
  419 + <path>
  420 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  421 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  422 + <item name="src" type="462c0819:PsiDirectoryNode" />
  423 + <item name="main" type="462c0819:PsiDirectoryNode" />
  424 + <item name="java" type="462c0819:PsiDirectoryNode" />
  425 + <item name="com" type="462c0819:PsiDirectoryNode" />
  426 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  427 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  428 + <item name="general" type="462c0819:PsiDirectoryNode" />
  429 + <item name="company" type="462c0819:PsiDirectoryNode" />
  430 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  431 + </path>
  432 + <path>
  433 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  434 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  435 + <item name="src" type="462c0819:PsiDirectoryNode" />
  436 + <item name="main" type="462c0819:PsiDirectoryNode" />
  437 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  438 + </path>
  439 + <path>
  440 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  441 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  442 + <item name="src" type="462c0819:PsiDirectoryNode" />
  443 + <item name="main" type="462c0819:PsiDirectoryNode" />
  444 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  445 + <item name="mybatis" type="462c0819:PsiDirectoryNode" />
  446 + </path>
  447 + <path>
  448 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  449 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  450 + <item name="src" type="462c0819:PsiDirectoryNode" />
  451 + <item name="main" type="462c0819:PsiDirectoryNode" />
  452 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  453 + <item name="mybatis" type="462c0819:PsiDirectoryNode" />
  454 + <item name="config" type="462c0819:PsiDirectoryNode" />
  455 + </path>
  456 + <path>
  457 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  458 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  459 + <item name="src" type="462c0819:PsiDirectoryNode" />
  460 + <item name="main" type="462c0819:PsiDirectoryNode" />
  461 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  462 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  463 + </path>
  464 + <path>
  465 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  466 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  467 + <item name="src" type="462c0819:PsiDirectoryNode" />
  468 + <item name="main" type="462c0819:PsiDirectoryNode" />
  469 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  470 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  471 + <item name="config" type="462c0819:PsiDirectoryNode" />
  472 + </path>
  473 + <path>
  474 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  475 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  476 + <item name="src" type="462c0819:PsiDirectoryNode" />
  477 + <item name="main" type="462c0819:PsiDirectoryNode" />
  478 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  479 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  480 + <item name="config" type="462c0819:PsiDirectoryNode" />
  481 + <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />
242 482 </path>
243 483 </expand>
244 484 <select />
245 485 </subPane>
246 486 </pane>
247   - <pane id="Scope" />
248   - <pane id="PackagesPane" />
249 487 </panes>
250 488 </component>
251 489 <component name="PropertiesComponent">
  490 + <property name="DatabaseDriversLRU" value="mysql" />
252 491 <property name="RequestMappingsPanelOrder0" value="0" />
253 492 <property name="RequestMappingsPanelOrder1" value="1" />
254 493 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -256,10 +495,23 @@
256 495 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
257 496 <property name="WebServerToolWindowFactoryState" value="false" />
258 497 <property name="aspect.path.notification.shown" value="true" />
259   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565075665688" />
  498 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" />
  499 + <property name="database.console.LAST_STATE" value="true" />
260 500 <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
  501 + <property name="project.structure.last.edited" value="Project" />
  502 + <property name="project.structure.proportion" value="0.0" />
  503 + <property name="project.structure.side.proportion" value="0.0" />
261 504 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
262 505 </component>
  506 + <component name="RecentsManager">
  507 + <key name="CopyClassDialog.RECENTS_KEY">
  508 + <recent name="com.huaheng.pc.config.zoneCapacity.controller" />
  509 + </key>
  510 + <key name="CopyFile.RECENT_KEYS">
  511 + <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" />
  512 + <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" />
  513 + </key>
  514 + </component>
263 515 <component name="RunDashboard">
264 516 <option name="ruleStates">
265 517 <list>
... ... @@ -272,7 +524,7 @@
272 524 </list>
273 525 </option>
274 526 </component>
275   - <component name="RunManager" selected="Application.CreateCode">
  527 + <component name="RunManager" selected="Spring Boot.HuaHengApplication">
276 528 <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
277 529 <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
278 530 <module name="WMSV1" />
... ... @@ -299,6 +551,24 @@
299 551 </list>
300 552 </recent_temporary>
301 553 </component>
  554 + <component name="ServiceViewManager">
  555 + <option name="allServicesViewState">
  556 + <serviceView>
  557 + <treeState>
  558 + <expand>
  559 + <path>
  560 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  561 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5097fb15" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  562 + </path>
  563 + </expand>
  564 + <select />
  565 + </treeState>
  566 + </serviceView>
  567 + </option>
  568 + </component>
  569 + <component name="StructureViewFactory">
  570 + <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" />
  571 + </component>
302 572 <component name="SvnConfiguration">
303 573 <configuration />
304 574 </component>
... ... @@ -310,7 +580,19 @@
310 580 <option name="presentableId" value="Default" />
311 581 <updated>1563950700252</updated>
312 582 <workItem from="1563950701881" duration="73000" />
313   - <workItem from="1565055472980" duration="7608000" />
  583 + <workItem from="1565055472980" duration="9734000" />
  584 + <workItem from="1565078101170" duration="2642000" />
  585 + <workItem from="1565080771601" duration="951000" />
  586 + <workItem from="1565082117731" duration="348000" />
  587 + <workItem from="1565085916295" duration="323000" />
  588 + <workItem from="1565087331641" duration="170000" />
  589 + <workItem from="1565138504203" duration="3006000" />
  590 + <workItem from="1565162212626" duration="6726000" />
  591 + <workItem from="1565169755725" duration="2857000" />
  592 + <workItem from="1565242132637" duration="963000" />
  593 + <workItem from="1565244881255" duration="620000" />
  594 + <workItem from="1565245587599" duration="32000" />
  595 + <workItem from="1565245636976" duration="7465000" />
314 596 </task>
315 597 <task id="LOCAL-00001" summary="用户查询修改">
316 598 <created>1565058322310</created>
... ... @@ -319,47 +601,89 @@
319 601 <option name="project" value="LOCAL" />
320 602 <updated>1565058322310</updated>
321 603 </task>
322   - <option name="localTasksCounter" value="2" />
  604 + <task id="LOCAL-00002" summary="库区设置编辑">
  605 + <created>1565075790786</created>
  606 + <option name="number" value="00002" />
  607 + <option name="presentableId" value="LOCAL-00002" />
  608 + <option name="project" value="LOCAL" />
  609 + <updated>1565075790786</updated>
  610 + </task>
  611 + <task id="LOCAL-00003" summary="库区设置编辑">
  612 + <created>1565075857018</created>
  613 + <option name="number" value="00003" />
  614 + <option name="presentableId" value="LOCAL-00003" />
  615 + <option name="project" value="LOCAL" />
  616 + <updated>1565075857018</updated>
  617 + </task>
  618 + <task id="LOCAL-00004" summary="库区设置编辑">
  619 + <created>1565075883212</created>
  620 + <option name="number" value="00004" />
  621 + <option name="presentableId" value="LOCAL-00004" />
  622 + <option name="project" value="LOCAL" />
  623 + <updated>1565075883212</updated>
  624 + </task>
  625 + <task id="LOCAL-00005" summary="库区设置编辑">
  626 + <created>1565075915322</created>
  627 + <option name="number" value="00005" />
  628 + <option name="presentableId" value="LOCAL-00005" />
  629 + <option name="project" value="LOCAL" />
  630 + <updated>1565075915322</updated>
  631 + </task>
  632 + <task id="LOCAL-00006" summary="回退">
  633 + <created>1565081123490</created>
  634 + <option name="number" value="00006" />
  635 + <option name="presentableId" value="LOCAL-00006" />
  636 + <option name="project" value="LOCAL" />
  637 + <updated>1565081123490</updated>
  638 + </task>
  639 + <task id="LOCAL-00007" summary="zone修改">
  640 + <created>1565172969186</created>
  641 + <option name="number" value="00007" />
  642 + <option name="presentableId" value="LOCAL-00007" />
  643 + <option name="project" value="LOCAL" />
  644 + <updated>1565172969186</updated>
  645 + </task>
  646 + <option name="localTasksCounter" value="8" />
323 647 <servers />
324 648 </component>
325 649 <component name="TimeTrackingManager">
326   - <option name="totallyTimeSpent" value="7998000" />
  650 + <option name="totallyTimeSpent" value="21839000" />
327 651 </component>
328 652 <component name="ToolWindowManager">
329   - <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
  653 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
330 654 <editor active="true" />
331 655 <layout>
332   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1988273" />
333   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  656 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.269437" />
  657 + <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" />
334 658 <window_info id="Designer" order="2" />
335   - <window_info id="UI Designer" order="3" />
336   - <window_info id="Favorites" order="4" side_tool="true" />
337   - <window_info id="Capture Tool" order="5" />
338   - <window_info id="Web" order="6" side_tool="true" />
339   - <window_info id="Image Layers" order="7" />
  659 + <window_info id="Image Layers" order="3" />
  660 + <window_info id="Capture Tool" order="4" />
  661 + <window_info id="UI Designer" order="5" />
  662 + <window_info id="Favorites" order="6" side_tool="true" />
  663 + <window_info id="Web" order="7" side_tool="true" />
  664 + <window_info anchor="bottom" id="Database Console" weight="0.3286119" />
340 665 <window_info anchor="bottom" id="Message" order="0" />
341   - <window_info anchor="bottom" id="Find" order="1" />
342   - <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" />
343   - <window_info anchor="bottom" id="Debug" order="3" weight="0.26030368" />
  666 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  667 + <window_info anchor="bottom" id="Run" order="2" />
  668 + <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.25354108" />
344 669 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
345 670 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
346 671 <window_info anchor="bottom" id="TODO" order="6" />
347 672 <window_info anchor="bottom" id="Spring" order="7" />
348 673 <window_info anchor="bottom" id="Terminal" order="8" />
349   - <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
350   - <window_info anchor="bottom" id="Java Enterprise" order="10" />
351   - <window_info anchor="bottom" id="Database Changes" order="11" />
352   - <window_info anchor="bottom" id="Version Control" order="12" weight="0.17895879" />
353   - <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
  674 + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
  675 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.329718" />
  676 + <window_info anchor="bottom" id="Java Enterprise" order="11" />
  677 + <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
  678 + <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" />
354 679 <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
355   - <window_info anchor="right" id="BPMNPalette" />
356 680 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
357 681 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
358 682 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
359 683 <window_info anchor="right" id="Maven" order="3" />
360 684 <window_info anchor="right" id="Palette" order="4" />
361 685 <window_info anchor="right" id="Capture Analysis" order="5" />
362   - <window_info anchor="right" id="Database" order="6" />
  686 + <window_info anchor="right" id="Database" order="6" weight="0.26876676" />
363 687 <window_info anchor="right" id="Palette&#9;" order="7" />
364 688 <window_info anchor="right" id="Theme Preview" order="8" />
365 689 <window_info anchor="right" id="Bean Validation" order="9" />
... ... @@ -380,240 +704,524 @@
380 704 <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
381 705 <collection />
382 706 </option>
383   - <option name="COLUMN_ORDER">
384   - <list>
385   - <option value="0" />
386   - <option value="1" />
387   - <option value="2" />
388   - <option value="3" />
389   - </list>
  707 + <option name="FILTERS">
  708 + <map>
  709 + <entry key="branch">
  710 + <value>
  711 + <list>
  712 + <option value="origin/develop" />
  713 + </list>
  714 + </value>
  715 + </entry>
  716 + </map>
390 717 </option>
  718 + <option name="COLUMN_ORDER" />
391 719 </State>
392 720 </value>
393 721 </entry>
394 722 </map>
395 723 </option>
  724 + <option name="RECENT_FILTERS">
  725 + <map>
  726 + <entry key="Branch">
  727 + <value>
  728 + <list>
  729 + <RecentGroup>
  730 + <option name="FILTER_VALUES">
  731 + <option value="origin/develop" />
  732 + </option>
  733 + </RecentGroup>
  734 + </list>
  735 + </value>
  736 + </entry>
  737 + </map>
  738 + </option>
396 739 </component>
397 740 <component name="VcsManagerConfiguration">
398 741 <MESSAGE value="用户查询修改" />
399   - <option name="LAST_COMMIT_MESSAGE" value="用户查询修改" />
  742 + <MESSAGE value="库区设置编辑" />
  743 + <MESSAGE value="回退" />
  744 + <MESSAGE value="zone修改" />
  745 + <option name="LAST_COMMIT_MESSAGE" value="zone修改" />
  746 + </component>
  747 + <component name="XDebuggerManager">
  748 + <breakpoint-manager>
  749 + <breakpoints>
  750 + <line-breakpoint enabled="true" type="java-line">
  751 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url>
  752 + <line>52</line>
  753 + <properties />
  754 + <option name="timeStamp" value="11" />
  755 + </line-breakpoint>
  756 + <line-breakpoint enabled="true" type="java-line">
  757 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java</url>
  758 + <line>56</line>
  759 + <properties />
  760 + <option name="timeStamp" value="13" />
  761 + </line-breakpoint>
  762 + </breakpoints>
  763 + </breakpoint-manager>
  764 + </component>
  765 + <component name="antWorkspaceConfiguration">
  766 + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
  767 + <option name="FILTER_TARGETS" value="false" />
400 768 </component>
401 769 <component name="editorHistoryManager">
402   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  770 + <entry file="file://$PROJECT_DIR$/pom.xml">
  771 + <provider selected="true" editor-type-id="text-editor" />
  772 + </entry>
  773 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/domain/Company.java">
403 774 <provider selected="true" editor-type-id="text-editor">
404   - <state relative-caret-position="131">
405   - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
  775 + <state relative-caret-position="100">
  776 + <caret line="11" selection-start-line="11" selection-end-line="11" />
406 777 </state>
407 778 </provider>
408 779 </entry>
409   - <entry file="file://$PROJECT_DIR$/pom.xml">
  780 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
410 781 <provider selected="true" editor-type-id="text-editor">
411   - <state relative-caret-position="23">
412   - <caret line="367" column="21" selection-start-line="367" selection-start-column="21" selection-end-line="367" selection-end-column="21" />
  782 + <state relative-caret-position="-2585">
  783 + <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
413 784 </state>
414 785 </provider>
415 786 </entry>
416   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserRole.java">
  787 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
  788 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
417 789 <provider selected="true" editor-type-id="text-editor">
418   - <state relative-caret-position="177">
419   - <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
  790 + <state relative-caret-position="1625">
  791 + <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
420 792 </state>
421 793 </provider>
422 794 </entry>
423   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/CompanyMapper.xml">
  795 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java">
424 796 <provider selected="true" editor-type-id="text-editor">
425   - <state relative-caret-position="120">
426   - <caret line="49" column="2" selection-start-line="49" selection-start-column="2" selection-end-line="49" selection-end-column="2" />
  797 + <state relative-caret-position="245">
  798 + <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
427 799 </state>
428 800 </provider>
429 801 </entry>
430   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
  802 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/company/company.html">
431 803 <provider selected="true" editor-type-id="text-editor">
432   - <state relative-caret-position="407">
433   - <caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
  804 + <state relative-caret-position="-150" />
  805 + </provider>
  806 + </entry>
  807 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/mapper/MenuMapper.java">
  808 + <provider selected="true" editor-type-id="text-editor">
  809 + <state relative-caret-position="375">
  810 + <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  811 + <folding>
  812 + <element signature="imports" expanded="true" />
  813 + </folding>
434 814 </state>
435 815 </provider>
436 816 </entry>
437   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/user.html">
  817 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java">
  818 + <provider selected="true" editor-type-id="text-editor">
  819 + <state relative-caret-position="250">
  820 + <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
  821 + </state>
  822 + </provider>
  823 + </entry>
  824 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/ZoneMapper.xml" />
  825 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
438 826 <provider selected="true" editor-type-id="text-editor">
439   - <state relative-caret-position="79">
440   - <caret line="41" column="70" selection-start-line="41" selection-start-column="70" selection-end-line="41" selection-end-column="70" />
  827 + <state relative-caret-position="168">
  828 + <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
441 829 </state>
442 830 </provider>
443 831 </entry>
444   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java">
  832 + <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/lang/Integer.java">
445 833 <provider selected="true" editor-type-id="text-editor">
446   - <state relative-caret-position="-4830">
447   - <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
  834 + <state relative-caret-position="124">
  835 + <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
  836 + </state>
  837 + </provider>
  838 + </entry>
  839 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java">
  840 + <provider selected="true" editor-type-id="text-editor">
  841 + <state relative-caret-position="141">
  842 + <caret line="78" column="32" lean-forward="true" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
  843 + </state>
  844 + </provider>
  845 + </entry>
  846 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
  847 + <provider selected="true" editor-type-id="text-editor">
  848 + <state relative-caret-position="-1187">
  849 + <caret line="72" column="58" selection-start-line="72" selection-start-column="58" selection-end-line="72" selection-end-column="58" />
  850 + </state>
  851 + </provider>
  852 + </entry>
  853 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/login.js">
  854 + <provider selected="true" editor-type-id="text-editor">
  855 + <state relative-caret-position="225">
  856 + <caret line="21" column="66" selection-start-line="21" selection-start-column="62" selection-end-line="21" selection-end-column="66" />
  857 + </state>
  858 + </provider>
  859 + </entry>
  860 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml">
  861 + <provider selected="true" editor-type-id="text-editor">
  862 + <state relative-caret-position="2553">
  863 + <caret line="130" column="11" selection-start-line="130" selection-start-column="11" selection-end-line="130" selection-end-column="11" />
  864 + </state>
  865 + </provider>
  866 + </entry>
  867 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java">
  868 + <provider selected="true" editor-type-id="text-editor">
  869 + <state relative-caret-position="175">
  870 + <caret line="12" selection-start-line="12" selection-end-line="12" />
448 871 </state>
449 872 </provider>
450 873 </entry>
451 874 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java">
452 875 <provider selected="true" editor-type-id="text-editor">
453   - <state relative-caret-position="92">
454   - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  876 + <state relative-caret-position="200">
  877 + <caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
455 878 </state>
456 879 </provider>
457 880 </entry>
458   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserCompany.java">
  881 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java">
459 882 <provider selected="true" editor-type-id="text-editor">
460   - <state relative-caret-position="-84">
461   - <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
  883 + <state relative-caret-position="200">
  884 + <caret line="12" column="91" selection-start-line="12" selection-start-column="91" selection-end-line="12" selection-end-column="91" />
462 885 </state>
463 886 </provider>
464 887 </entry>
465   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java">
  888 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
466 889 <provider selected="true" editor-type-id="text-editor">
467   - <state relative-caret-position="276">
468   - <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
  890 + <state relative-caret-position="135">
  891 + <caret line="127" selection-start-line="127" selection-end-line="127" />
469 892 </state>
470 893 </provider>
471 894 </entry>
472   - <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  895 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
473 896 <provider selected="true" editor-type-id="text-editor">
474   - <state relative-caret-position="-313" />
  897 + <state relative-caret-position="149">
  898 + <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
  899 + </state>
475 900 </provider>
476 901 </entry>
477   - <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
  902 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java">
478 903 <provider selected="true" editor-type-id="text-editor">
479   - <state relative-caret-position="-1242" />
  904 + <state relative-caret-position="252">
  905 + <caret line="92" selection-start-line="92" selection-end-line="92" />
  906 + </state>
480 907 </provider>
481 908 </entry>
482   - <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/util/Date.java">
  909 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
483 910 <provider selected="true" editor-type-id="text-editor">
484   - <state relative-caret-position="631">
485   - <caret line="130" column="13" selection-start-line="130" selection-start-column="13" selection-end-line="130" selection-end-column="13" />
  911 + <state relative-caret-position="185">
  912 + <caret line="188" column="26" selection-start-line="188" selection-start-column="26" selection-end-line="188" selection-end-column="26" />
486 913 </state>
487 914 </provider>
488 915 </entry>
489   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java">
  916 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
490 917 <provider selected="true" editor-type-id="text-editor">
491   - <state>
492   - <caret line="198" column="17" selection-start-line="198" selection-start-column="17" selection-end-line="198" selection-end-column="17" />
493   - <folding>
494   - <element signature="imports" expanded="true" />
495   - </folding>
  918 + <state relative-caret-position="135">
  919 + <caret line="132" column="37" selection-start-line="132" selection-start-column="37" selection-end-line="132" selection-end-column="37" />
496 920 </state>
497 921 </provider>
498 922 </entry>
499 923 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
500 924 <provider selected="true" editor-type-id="text-editor">
501   - <state relative-caret-position="-1716">
502   - <caret line="159" column="36" selection-start-line="159" selection-start-column="36" selection-end-line="159" selection-end-column="36" />
503   - <folding>
504   - <element signature="e#5289#5290#0" expanded="true" />
505   - <element signature="e#5343#5344#0" expanded="true" />
506   - </folding>
  925 + <state>
  926 + <caret line="471" column="43" selection-start-line="471" selection-start-column="43" selection-end-line="471" selection-end-column="43" />
507 927 </state>
508 928 </provider>
509 929 </entry>
510   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
  930 + <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/d0963ee7-a6e7-4e61-9f9b-2a0b4ecc4332/console.sql">
  931 + <provider selected="true" editor-type-id="text-editor" />
  932 + </entry>
  933 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
511 934 <provider selected="true" editor-type-id="text-editor">
512   - <state relative-caret-position="170">
513   - <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
  935 + <state relative-caret-position="275">
  936 + <caret line="11" column="51" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="51" />
514 937 </state>
515 938 </provider>
516 939 </entry>
517   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  940 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
518 941 <provider selected="true" editor-type-id="text-editor">
519   - <state relative-caret-position="-2338">
520   - <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
  942 + <state relative-caret-position="133">
  943 + <caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
  944 + </state>
  945 + </provider>
  946 + </entry>
  947 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
  948 + <provider selected="true" editor-type-id="text-editor">
  949 + <state relative-caret-position="158">
  950 + <caret line="198" lean-forward="true" selection-start-line="198" selection-end-line="198" />
  951 + </state>
  952 + </provider>
  953 + </entry>
  954 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java">
  955 + <provider selected="true" editor-type-id="text-editor">
  956 + <state relative-caret-position="158">
  957 + <caret line="275" column="32" lean-forward="true" selection-start-line="275" selection-start-column="32" selection-end-line="275" selection-end-column="32" />
521 958 <folding>
522   - <element signature="imports" expanded="true" />
  959 + <element signature="e#9323#9324#0" expanded="true" />
  960 + <element signature="e#9381#9382#0" expanded="true" />
  961 + <element signature="e#9463#9464#0" expanded="true" />
  962 + <element signature="e#9527#9528#0" expanded="true" />
523 963 </folding>
524 964 </state>
525 965 </provider>
526 966 </entry>
527   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
  967 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
528 968 <provider selected="true" editor-type-id="text-editor">
529   - <state relative-caret-position="-4031">
530   - <caret line="2" selection-start-line="2" selection-end-line="2" />
  969 + <state relative-caret-position="-17">
  970 + <caret line="249" column="7" lean-forward="true" selection-start-line="249" selection-start-column="7" selection-end-line="249" selection-end-column="7" />
531 971 </state>
532 972 </provider>
533 973 </entry>
534   - <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
  974 + <entry file="das://e67b6455-2363-423c-bed8-503129974854/schema/wms_v2/table/zone_capacity">
  975 + <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
  976 + <state>
  977 + <filtering enabled="true" />
  978 + </state>
  979 + </provider>
  980 + </entry>
  981 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/container/container.html">
535 982 <provider selected="true" editor-type-id="text-editor">
536   - <state relative-caret-position="23">
537   - <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
  983 + <state relative-caret-position="450">
  984 + <caret line="24" column="90" lean-forward="true" selection-start-line="24" selection-start-column="90" selection-end-line="24" selection-end-column="90" />
538 985 </state>
539 986 </provider>
540 987 </entry>
541   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
  988 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/mapper/ZoneMapper.java">
  989 + <provider selected="true" editor-type-id="text-editor">
  990 + <state relative-caret-position="100">
  991 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
  992 + </state>
  993 + </provider>
  994 + </entry>
  995 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneService.java">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state relative-caret-position="25">
  998 + <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
  999 + </state>
  1000 + </provider>
  1001 + </entry>
  1002 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml">
  1003 + <provider selected="true" editor-type-id="text-editor">
  1004 + <state relative-caret-position="75">
  1005 + <caret line="3" column="70" selection-start-line="3" selection-start-column="70" selection-end-line="3" selection-end-column="70" />
  1006 + </state>
  1007 + </provider>
  1008 + </entry>
  1009 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml">
542 1010 <provider selected="true" editor-type-id="text-editor">
543   - <state relative-caret-position="-345">
544   - <caret line="14" selection-start-line="14" selection-end-line="14" />
  1011 + <state relative-caret-position="353">
  1012 + <caret line="26" column="27" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="27" />
545 1013 </state>
546 1014 </provider>
547 1015 </entry>
548   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserRoleMapper.java">
  1016 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java">
549 1017 <provider selected="true" editor-type-id="text-editor">
550   - <state relative-caret-position="207">
551   - <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
  1018 + <state relative-caret-position="253">
  1019 + <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
552 1020 </state>
553 1021 </provider>
554 1022 </entry>
555   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java">
  1023 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java">
556 1024 <provider selected="true" editor-type-id="text-editor">
557   - <state relative-caret-position="1955">
558   - <caret line="85" selection-start-line="85" selection-end-line="85" />
  1025 + <state relative-caret-position="-8697">
  1026 + <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
559 1027 <folding>
560 1028 <element signature="imports" expanded="true" />
  1029 + <element signature="e#2856#2857#0" expanded="true" />
  1030 + <element signature="e#2881#2882#0" expanded="true" />
  1031 + <element signature="e#2918#2919#0" expanded="true" />
  1032 + <element signature="e#2946#2947#0" expanded="true" />
  1033 + <element signature="e#2986#2987#0" expanded="true" />
  1034 + <element signature="e#3022#3023#0" expanded="true" />
  1035 + <element signature="e#3080#3081#0" expanded="true" />
  1036 + <element signature="e#3130#3131#0" expanded="true" />
  1037 + <element signature="e#3168#3169#0" expanded="true" />
  1038 + <element signature="e#3202#3203#0" expanded="true" />
  1039 + <element signature="e#3256#3257#0" expanded="true" />
  1040 + <element signature="e#3302#3303#0" expanded="true" />
  1041 + <element signature="e#3341#3342#0" expanded="true" />
  1042 + <element signature="e#3376#3377#0" expanded="true" />
  1043 + <element signature="e#3432#3433#0" expanded="true" />
  1044 + <element signature="e#3480#3481#0" expanded="true" />
  1045 + <element signature="e#3519#3520#0" expanded="true" />
  1046 + <element signature="e#3554#3555#0" expanded="true" />
  1047 + <element signature="e#3610#3611#0" expanded="true" />
  1048 + <element signature="e#3658#3659#0" expanded="true" />
  1049 + <element signature="e#3697#3698#0" expanded="true" />
  1050 + <element signature="e#3732#3733#0" expanded="true" />
  1051 + <element signature="e#3788#3789#0" expanded="true" />
  1052 + <element signature="e#3836#3837#0" expanded="true" />
  1053 + <element signature="e#3875#3876#0" expanded="true" />
  1054 + <element signature="e#3910#3911#0" expanded="true" />
  1055 + <element signature="e#3966#3967#0" expanded="true" />
  1056 + <element signature="e#4014#4015#0" expanded="true" />
  1057 + <element signature="e#4051#4052#0" expanded="true" />
  1058 + <element signature="e#4084#4085#0" expanded="true" />
  1059 + <element signature="e#4136#4137#0" expanded="true" />
  1060 + <element signature="e#4180#4181#0" expanded="true" />
  1061 + <element signature="e#4214#4215#0" expanded="true" />
  1062 + <element signature="e#4243#4244#0" expanded="true" />
  1063 + <element signature="e#4288#4289#0" expanded="true" />
  1064 + <element signature="e#4324#4325#0" expanded="true" />
  1065 + <element signature="e#4358#4359#0" expanded="true" />
  1066 + <element signature="e#4387#4388#0" expanded="true" />
  1067 + <element signature="e#4432#4433#0" expanded="true" />
  1068 + <element signature="e#4468#4469#0" expanded="true" />
  1069 + <element signature="e#4500#4501#0" expanded="true" />
  1070 + <element signature="e#4530#4531#0" expanded="true" />
  1071 + <element signature="e#4574#4575#0" expanded="true" />
  1072 + <element signature="e#4612#4613#0" expanded="true" />
  1073 + <element signature="e#4648#4649#0" expanded="true" />
  1074 + <element signature="e#4680#4681#0" expanded="true" />
  1075 + <element signature="e#4730#4731#0" expanded="true" />
  1076 + <element signature="e#4772#4773#0" expanded="true" />
  1077 + <element signature="e#4808#4809#0" expanded="true" />
  1078 + <element signature="e#4842#4843#0" expanded="true" />
  1079 + <element signature="e#4894#4895#0" expanded="true" />
  1080 + <element signature="e#4940#4941#0" expanded="true" />
  1081 + <element signature="e#4980#4981#0" expanded="true" />
  1082 + <element signature="e#5016#5017#0" expanded="true" />
  1083 + <element signature="e#5074#5075#0" expanded="true" />
  1084 + <element signature="e#5124#5125#0" expanded="true" />
  1085 + <element signature="e#5159#5160#0" expanded="true" />
  1086 + <element signature="e#5189#5190#0" expanded="true" />
  1087 + <element signature="e#5236#5237#0" expanded="true" />
  1088 + <element signature="e#5274#5275#0" expanded="true" />
  1089 + <element signature="e#5309#5310#0" expanded="true" />
  1090 + <element signature="e#5340#5341#0" expanded="true" />
  1091 + <element signature="e#5388#5389#0" expanded="true" />
  1092 + <element signature="e#5428#5429#0" expanded="true" />
  1093 + <element signature="e#5463#5464#0" expanded="true" />
  1094 + <element signature="e#5494#5495#0" expanded="true" />
  1095 + <element signature="e#5542#5543#0" expanded="true" />
  1096 + <element signature="e#5582#5583#0" expanded="true" />
  1097 + <element signature="e#5617#5618#0" expanded="true" />
  1098 + <element signature="e#5648#5649#0" expanded="true" />
  1099 + <element signature="e#5696#5697#0" expanded="true" />
  1100 + <element signature="e#5736#5737#0" expanded="true" />
  1101 + <element signature="e#5771#5772#0" expanded="true" />
  1102 + <element signature="e#5802#5803#0" expanded="true" />
  1103 + <element signature="e#5850#5851#0" expanded="true" />
  1104 + <element signature="e#5890#5891#0" expanded="true" />
  1105 + <element signature="e#5925#5926#0" expanded="true" />
  1106 + <element signature="e#5956#5957#0" expanded="true" />
  1107 + <element signature="e#6004#6005#0" expanded="true" />
  1108 + <element signature="e#6044#6045#0" expanded="true" />
  1109 + <element signature="e#6079#6080#0" expanded="true" />
  1110 + <element signature="e#6110#6111#0" expanded="true" />
  1111 + <element signature="e#6158#6159#0" expanded="true" />
  1112 + <element signature="e#6198#6199#0" expanded="true" />
  1113 + <element signature="e#6233#6234#0" expanded="true" />
  1114 + <element signature="e#6264#6265#0" expanded="true" />
  1115 + <element signature="e#6312#6313#0" expanded="true" />
  1116 + <element signature="e#6352#6353#0" expanded="true" />
  1117 + <element signature="e#6387#6388#0" expanded="true" />
  1118 + <element signature="e#6418#6419#0" expanded="true" />
  1119 + <element signature="e#6466#6467#0" expanded="true" />
  1120 + <element signature="e#6506#6507#0" expanded="true" />
  1121 + <element signature="e#6545#6546#0" expanded="true" />
  1122 + <element signature="e#6580#6581#0" expanded="true" />
  1123 + <element signature="e#6636#6637#0" expanded="true" />
  1124 + <element signature="e#6684#6685#0" expanded="true" />
561 1125 </folding>
562 1126 </state>
563 1127 </provider>
564 1128 </entry>
565   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
  1129 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
  1130 + <provider selected="true" editor-type-id="text-editor">
  1131 + <state relative-caret-position="292">
  1132 + <caret line="63" selection-start-line="63" selection-end-line="63" />
  1133 + </state>
  1134 + </provider>
  1135 + </entry>
  1136 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java">
566 1137 <provider selected="true" editor-type-id="text-editor">
567   - <state relative-caret-position="115">
568   - <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
  1138 + <state relative-caret-position="225">
  1139 + <caret line="56" selection-start-line="56" selection-end-line="56" />
  1140 + </state>
  1141 + </provider>
  1142 + </entry>
  1143 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  1144 + <provider selected="true" editor-type-id="text-editor">
  1145 + <state relative-caret-position="194">
  1146 + <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" />
  1147 + </state>
  1148 + </provider>
  1149 + </entry>
  1150 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html">
  1151 + <provider selected="true" editor-type-id="text-editor">
  1152 + <state relative-caret-position="1460">
  1153 + <caret line="128" column="18" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" />
  1154 + </state>
  1155 + </provider>
  1156 + </entry>
  1157 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java">
  1158 + <provider selected="true" editor-type-id="text-editor">
  1159 + <state relative-caret-position="436">
  1160 + <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
569 1161 <folding>
570 1162 <element signature="imports" expanded="true" />
571 1163 </folding>
572 1164 </state>
573 1165 </provider>
574 1166 </entry>
575   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
  1167 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html">
576 1168 <provider selected="true" editor-type-id="text-editor">
577   - <state relative-caret-position="138">
578   - <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
  1169 + <state relative-caret-position="385">
  1170 + <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" />
579 1171 </state>
580 1172 </provider>
581 1173 </entry>
582   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
  1174 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java">
583 1175 <provider selected="true" editor-type-id="text-editor">
584   - <state relative-caret-position="138">
585   - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  1176 + <state relative-caret-position="125">
  1177 + <caret line="5" column="61" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" />
  1178 + <folding>
  1179 + <element signature="imports" expanded="true" />
  1180 + </folding>
586 1181 </state>
587 1182 </provider>
588 1183 </entry>
589   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
  1184 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java">
  1185 + <provider selected="true" editor-type-id="text-editor">
  1186 + <state relative-caret-position="200">
  1187 + <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
  1188 + <folding>
  1189 + <element signature="imports" expanded="true" />
  1190 + </folding>
  1191 + </state>
  1192 + </provider>
  1193 + </entry>
  1194 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html">
590 1195 <provider selected="true" editor-type-id="text-editor">
591   - <state relative-caret-position="23">
592   - <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
  1196 + <state relative-caret-position="268">
  1197 + <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
593 1198 </state>
594 1199 </provider>
595 1200 </entry>
596   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
  1201 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java">
597 1202 <provider selected="true" editor-type-id="text-editor">
598   - <state relative-caret-position="529">
599   - <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
  1203 + <state relative-caret-position="200">
  1204 + <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
  1205 + <folding>
  1206 + <element signature="imports" expanded="true" />
  1207 + </folding>
600 1208 </state>
601 1209 </provider>
602 1210 </entry>
603   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
  1211 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java">
604 1212 <provider selected="true" editor-type-id="text-editor">
605   - <state relative-caret-position="115">
606   - <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
  1213 + <state relative-caret-position="350">
  1214 + <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
607 1215 <folding>
608 1216 <element signature="imports" expanded="true" />
609 1217 </folding>
610 1218 </state>
611 1219 </provider>
612 1220 </entry>
613   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
  1221 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java">
614 1222 <provider selected="true" editor-type-id="text-editor">
615   - <state relative-caret-position="404">
616   - <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
  1223 + <state relative-caret-position="358">
  1224 + <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
617 1225 <folding>
618 1226 <element signature="imports" expanded="true" />
619 1227 </folding>
... ... @@ -621,4 +1229,80 @@
621 1229 </provider>
622 1230 </entry>
623 1231 </component>
  1232 + <component name="masterDetails">
  1233 + <states>
  1234 + <state key="ArtifactsStructureConfigurable.UI">
  1235 + <settings>
  1236 + <artifact-editor />
  1237 + <splitter-proportions>
  1238 + <option name="proportions">
  1239 + <list>
  1240 + <option value="0.2" />
  1241 + </list>
  1242 + </option>
  1243 + </splitter-proportions>
  1244 + </settings>
  1245 + </state>
  1246 + <state key="FacetStructureConfigurable.UI">
  1247 + <settings>
  1248 + <last-edited>Spring</last-edited>
  1249 + <splitter-proportions>
  1250 + <option name="proportions">
  1251 + <list>
  1252 + <option value="0.2" />
  1253 + </list>
  1254 + </option>
  1255 + </splitter-proportions>
  1256 + </settings>
  1257 + </state>
  1258 + <state key="GlobalLibrariesConfigurable.UI">
  1259 + <settings>
  1260 + <splitter-proportions>
  1261 + <option name="proportions">
  1262 + <list>
  1263 + <option value="0.2" />
  1264 + </list>
  1265 + </option>
  1266 + </splitter-proportions>
  1267 + </settings>
  1268 + </state>
  1269 + <state key="JdkListConfigurable.UI">
  1270 + <settings>
  1271 + <last-edited>1.8</last-edited>
  1272 + <splitter-proportions>
  1273 + <option name="proportions">
  1274 + <list>
  1275 + <option value="0.2" />
  1276 + </list>
  1277 + </option>
  1278 + </splitter-proportions>
  1279 + </settings>
  1280 + </state>
  1281 + <state key="ModuleStructureConfigurable.UI">
  1282 + <settings>
  1283 + <last-edited>WMSV1</last-edited>
  1284 + <splitter-proportions>
  1285 + <option name="proportions">
  1286 + <list>
  1287 + <option value="0.2" />
  1288 + <option value="0.6" />
  1289 + </list>
  1290 + </option>
  1291 + </splitter-proportions>
  1292 + </settings>
  1293 + </state>
  1294 + <state key="ProjectLibrariesConfigurable.UI">
  1295 + <settings>
  1296 + <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited>
  1297 + <splitter-proportions>
  1298 + <option name="proportions">
  1299 + <list>
  1300 + <option value="0.2" />
  1301 + </list>
  1302 + </option>
  1303 + </splitter-proportions>
  1304 + </settings>
  1305 + </state>
  1306 + </states>
  1307 + </component>
624 1308 </project>
625 1309 \ No newline at end of file
... ...