wms / wms_xiaogangabu · Commits

Commit 93f50a088f6cfc1435dba12bb7a78f479ddd57ac

Authored by mahuandong
2 parents 98ed080d 3f01badb

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 2 changed files with 845 additions and 286 deletions
.idea/workspace.xml
  View file @93f50a0
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">  
5 - <change afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_17.xml" beforeDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_17.xml" beforeDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml" beforeDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml" beforeDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml" beforeDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml" beforeDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml" beforeDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_72.xml" beforeDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_722.xml" beforeDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_723.xml" beforeDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" beforeDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" beforeDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" beforeDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" beforeDir="false" />  
30 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" beforeDir="false" />  
31 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml" beforeDir="false" />  
32 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml" beforeDir="false" />  
33 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_12.xml" beforeDir="false" />  
34 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_12.xml" beforeDir="false" />  
35 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" />  
36 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_theborakompanioni_thymeleaf_extras_shiro_2_0_0.xml" beforeDir="false" />  
37 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml" beforeDir="false" />  
38 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_22.xml" beforeDir="false" />  
39 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_23.xml" beforeDir="false" />  
40 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_24.xml" beforeDir="false" />  
41 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.xml" beforeDir="false" />  
42 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml" beforeDir="false" />  
43 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_1.xml" beforeDir="false" />  
44 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_12.xml" beforeDir="false" />  
45 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_13.xml" beforeDir="false" />  
46 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_14.xml" beforeDir="false" />  
47 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" />  
48 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />  
49 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml" beforeDir="false" />  
50 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_1.xml" beforeDir="false" />  
51 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_12.xml" beforeDir="false" />  
52 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_13.xml" beforeDir="false" />  
53 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" />  
54 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" />  
55 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_java7_2_4_13.xml" beforeDir="false" />  
56 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" beforeDir="false" />  
57 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" />  
58 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" />  
59 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml" beforeDir="false" />  
60 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" />  
61 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" />  
62 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />  
63 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_19.xml" beforeDir="false" />  
64 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml" beforeDir="false" />  
65 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml" beforeDir="false" />  
66 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml" beforeDir="false" />  
67 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml" beforeDir="false" />  
68 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml" beforeDir="false" />  
69 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml" beforeDir="false" />  
70 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml" beforeDir="false" />  
71 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml" beforeDir="false" />  
72 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml" beforeDir="false" />  
73 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" />  
74 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_12.xml" beforeDir="false" />  
75 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_13.xml" beforeDir="false" />  
76 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />  
77 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />  
78 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />  
79 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml" beforeDir="false" />  
80 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" />  
81 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" />  
82 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" />  
83 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" />  
84 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="false" />  
85 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml" beforeDir="false" />  
86 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" />  
87 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />  
88 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_02.xml" beforeDir="false" />  
89 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_03.xml" beforeDir="false" />  
90 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml" beforeDir="false" />  
91 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_52.xml" beforeDir="false" />  
92 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_53.xml" beforeDir="false" />  
93 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml" beforeDir="false" />  
94 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_92.xml" beforeDir="false" />  
95 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_93.xml" beforeDir="false" />  
96 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" />  
97 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" />  
98 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml" beforeDir="false" />  
99 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml" beforeDir="false" />  
100 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml" beforeDir="false" />  
101 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" beforeDir="false" />  
102 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" beforeDir="false" />  
103 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" beforeDir="false" />  
104 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" beforeDir="false" />  
105 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" beforeDir="false" />  
106 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" beforeDir="false" />  
107 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" beforeDir="false" />  
108 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" beforeDir="false" />  
109 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" beforeDir="false" />  
110 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" beforeDir="false" />  
111 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" beforeDir="false" />  
112 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" beforeDir="false" />  
113 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml" beforeDir="false" />  
114 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml" beforeDir="false" />  
115 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml" beforeDir="false" />  
116 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="false" />  
117 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" />  
118 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml" beforeDir="false" />  
119 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_02.xml" beforeDir="false" />  
120 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_03.xml" beforeDir="false" />  
121 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" />  
122 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" />  
123 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml" beforeDir="false" />  
124 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />  
125 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />  
126 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" beforeDir="false" />  
127 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" beforeDir="false" />  
128 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" />  
129 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_11_3.xml" beforeDir="false" />  
130 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_1.xml" beforeDir="false" />  
131 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_12.xml" beforeDir="false" />  
132 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_13.xml" beforeDir="false" />  
133 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_1.xml" beforeDir="false" />  
134 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_12.xml" beforeDir="false" />  
135 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_13.xml" beforeDir="false" />  
136 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml" beforeDir="false" />  
137 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" />  
138 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml" beforeDir="false" />  
139 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml" beforeDir="false" />  
140 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_0_1.xml" beforeDir="false" />  
141 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_0_1.xml" beforeDir="false" />  
142 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />  
143 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_0.xml" beforeDir="false" />  
144 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_02.xml" beforeDir="false" />  
145 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_03.xml" beforeDir="false" />  
146 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" />  
147 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml" beforeDir="false" />  
148 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_1.xml" beforeDir="false" />  
149 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" beforeDir="false" />  
150 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" />  
151 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" />  
152 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />  
153 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" beforeDir="false" />  
154 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />  
155 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_3_RELEASE.xml" beforeDir="false" />  
156 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" beforeDir="false" />  
157 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" beforeDir="false" />  
158 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml" beforeDir="false" />  
159 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE2.xml" beforeDir="false" />  
160 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE3.xml" beforeDir="false" />  
161 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" beforeDir="false" />  
162 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" beforeDir="false" />  
163 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" beforeDir="false" />  
164 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE.xml" beforeDir="false" />  
165 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE2.xml" beforeDir="false" />  
166 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE3.xml" beforeDir="false" />  
167 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" beforeDir="false" />  
168 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_3_RELEASE.xml" beforeDir="false" />  
169 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" beforeDir="false" />  
170 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" beforeDir="false" />  
171 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" beforeDir="false" />  
172 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />  
173 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" beforeDir="false" />  
174 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE2.xml" beforeDir="false" />  
175 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE3.xml" beforeDir="false" />  
176 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml" beforeDir="false" />  
177 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE2.xml" beforeDir="false" />  
178 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE3.xml" beforeDir="false" />  
179 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml" beforeDir="false" />  
180 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE2.xml" beforeDir="false" />  
181 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE3.xml" beforeDir="false" />  
182 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />  
183 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" />  
184 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE.xml" beforeDir="false" />  
185 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE2.xml" beforeDir="false" />  
186 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE3.xml" beforeDir="false" />  
187 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE.xml" beforeDir="false" />  
188 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE2.xml" beforeDir="false" />  
189 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE3.xml" beforeDir="false" />  
190 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" beforeDir="false" />  
191 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" beforeDir="false" />  
192 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" beforeDir="false" />  
193 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml" beforeDir="false" />  
194 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" beforeDir="false" />  
195 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" beforeDir="false" />  
196 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" beforeDir="false" />  
197 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" beforeDir="false" />  
198 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml" beforeDir="false" />  
199 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE2.xml" beforeDir="false" />  
200 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE3.xml" beforeDir="false" />  
201 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" beforeDir="false" />  
202 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" beforeDir="false" />  
203 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" beforeDir="false" />  
204 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" beforeDir="false" />  
205 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_testng_testng_7_0_0_beta7.xml" beforeDir="false" />  
206 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml" beforeDir="false" />  
207 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml" beforeDir="false" />  
208 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml" beforeDir="false" />  
209 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml" beforeDir="false" />  
210 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" />  
211 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" />  
212 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />  
213 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_02.xml" beforeDir="false" />  
214 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_03.xml" beforeDir="false" />  
215 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />  
216 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml" beforeDir="false" />  
217 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" />  
218 - <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />  
219 - <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />  
220 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
221 - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/domain/Customer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/domain/Customer.java" afterDir="false" />  
222 - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" afterDir="false" />  
223 - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/company/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/company/edit.html" afterDir="false" />  
224 - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/customer/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/customer/add.html" afterDir="false" />  
225 - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/customer/customer.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/customer/customer.html" afterDir="false" />  
226 - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/customer/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/customer/edit.html" afterDir="false" /> 4 + <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="回退" />
  5 + <list id="560adde2-f267-4051-b179-368004a880e1" name="Revert &quot;库区容量增加修改&quot;" comment="Revert &quot;库区容量增加修改&quot;&#10;&#10;This reverts commit d12fb0d9">
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" afterDir="false" />
227 </list> 7 </list>
  8 + <ignored path="$PROJECT_DIR$/target/" />
228 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
229 <option name="SHOW_DIALOG" value="false" /> 10 <option name="SHOW_DIALOG" value="false" />
230 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 11 <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -232,70 +13,133 @@ @@ -232,70 +13,133 @@
232 <option name="LAST_RESOLUTION" value="IGNORE" /> 13 <option name="LAST_RESOLUTION" value="IGNORE" />
233 </component> 14 </component>
234 <component name="DatabaseView"> 15 <component name="DatabaseView">
235 - <option name="SHOW_INTERMEDIATE" value="false" /> 16 + <option name="SHOW_INTERMEDIATE" value="true" />
236 <option name="GROUP_DATA_SOURCES" value="true" /> 17 <option name="GROUP_DATA_SOURCES" value="true" />
237 <option name="GROUP_SCHEMA" value="true" /> 18 <option name="GROUP_SCHEMA" value="true" />
238 <option name="GROUP_CONTENTS" value="false" /> 19 <option name="GROUP_CONTENTS" value="false" />
239 <option name="SORT_POSITIONED" value="false" /> 20 <option name="SORT_POSITIONED" value="false" />
240 <option name="SHOW_EMPTY_GROUPS" value="false" /> 21 <option name="SHOW_EMPTY_GROUPS" value="false" />
241 - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> 22 + <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
242 <option name="HIDDEN_KINDS"> 23 <option name="HIDDEN_KINDS">
243 <set /> 24 <set />
244 </option> 25 </option>
245 <expand> 26 <expand>
246 <path> 27 <path>
247 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 28 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
248 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> 29 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
249 </path> 30 </path>
250 <path> 31 <path>
251 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 32 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
252 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> 33 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
253 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> 34 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
254 </path> 35 </path>
255 <path> 36 <path>
256 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 37 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
257 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> 38 + <item name="wms2" type="feb32156:DbDataSourceImpl" />
258 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> 39 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
259 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> 40 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
260 </path> 41 </path>
261 - <path>  
262 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
263 - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />  
264 - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />  
265 - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />  
266 - <item name="location: table" type="285a2a93:MysqlImplModel$Table" />  
267 - </path>  
268 </expand> 42 </expand>
269 <select /> 43 <select />
270 </component> 44 </component>
  45 + <component name="FileEditorManager">
  46 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  47 + <file pinned="false" current-in-tab="true">
  48 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state relative-caret-position="165">
  51 + <caret line="45" selection-start-line="45" selection-end-line="45" />
  52 + </state>
  53 + </provider>
  54 + </entry>
  55 + </file>
  56 + </leaf>
  57 + </component>
271 <component name="FileTemplateManagerImpl"> 58 <component name="FileTemplateManagerImpl">
272 <option name="RECENT_TEMPLATES"> 59 <option name="RECENT_TEMPLATES">
273 <list> 60 <list>
  61 + <option value="Interface" />
274 <option value="Class" /> 62 <option value="Class" />
275 </list> 63 </list>
276 </option> 64 </option>
277 </component> 65 </component>
  66 + <component name="FindInProjectRecents">
  67 + <findStrings>
  68 + <find>zone</find>
  69 + </findStrings>
  70 + </component>
278 <component name="Git.Settings"> 71 <component name="Git.Settings">
  72 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
279 <option name="RECENT_BRANCH_BY_REPOSITORY"> 73 <option name="RECENT_BRANCH_BY_REPOSITORY">
280 <map> 74 <map>
281 - <entry key="$PROJECT_DIR$" value="master" /> 75 + <entry key="$PROJECT_DIR$" value="developMain" />
282 </map> 76 </map>
283 </option> 77 </option>
284 - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 78 + <option name="RESET_MODE" value="HARD" />
  79 + </component>
  80 + <component name="IdeDocumentHistory">
  81 + <option name="CHANGED_PATHS">
  82 + <list>
  83 + <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
  84 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java" />
  85 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java" />
  86 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" />
  87 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" />
  88 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" />
  89 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" />
  90 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" />
  91 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" />
  92 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java" />
  93 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" />
  94 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" />
  95 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java" />
  96 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java" />
  97 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" />
  98 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml" />
  99 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" />
  100 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" />
  101 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" />
  102 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" />
  103 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java" />
  104 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" />
  105 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java" />
  106 + </list>
  107 + </option>
285 </component> 108 </component>
286 <component name="IgnoredFileRootStore"> 109 <component name="IgnoredFileRootStore">
287 <option name="generatedRoots"> 110 <option name="generatedRoots">
288 <set> 111 <set>
289 - <option value="E:\code\wms2\.idea" /> 112 + <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" />
290 </set> 113 </set>
291 </option> 114 </option>
292 </component> 115 </component>
293 - <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />  
294 - <component name="ProjectLevelVcsManager">  
295 - <ConfirmationsSetting value="2" id="Add" /> 116 + <component name="MavenImportPreferences">
  117 + <option name="importingSettings">
  118 + <MavenImportingSettings>
  119 + <option name="importAutomatically" value="true" />
  120 + </MavenImportingSettings>
  121 + </option>
  122 + </component>
  123 + <component name="ProjectFrameBounds" extendedState="6">
  124 + <option name="x" value="-9" />
  125 + <option name="y" value="-9" />
  126 + <option name="width" value="1938" />
  127 + <option name="height" value="1048" />
  128 + </component>
  129 + <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" />
  130 + <component name="ProjectView">
  131 + <navigator proportions="" version="1">
  132 + <flattenPackages ProjectPane="false" />
  133 + <hideEmptyPackages ProjectPane="false" />
  134 + <foldersAlwaysOnTop value="true" />
  135 + </navigator>
  136 + <panes>
  137 + <pane id="PackagesPane" />
  138 + <pane id="ProjectPane" />
  139 + <pane id="Scope" />
  140 + </panes>
296 </component> 141 </component>
297 <component name="PropertiesComponent"> 142 <component name="PropertiesComponent">
298 - <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />  
299 <property name="DatabaseDriversLRU" value="mysql" /> 143 <property name="DatabaseDriversLRU" value="mysql" />
300 <property name="RequestMappingsPanelOrder0" value="0" /> 144 <property name="RequestMappingsPanelOrder0" value="0" />
301 <property name="RequestMappingsPanelOrder1" value="1" /> 145 <property name="RequestMappingsPanelOrder1" value="1" />
@@ -304,19 +148,21 @@ @@ -304,19 +148,21 @@
304 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> 148 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
305 <property name="WebServerToolWindowFactoryState" value="false" /> 149 <property name="WebServerToolWindowFactoryState" value="false" />
306 <property name="aspect.path.notification.shown" value="true" /> 150 <property name="aspect.path.notification.shown" value="true" />
307 - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />  
308 - <property name="node.js.detected.package.eslint" value="true" />  
309 - <property name="node.js.detected.package.tslint" value="true" />  
310 - <property name="node.js.path.for.package.eslint" value="project" />  
311 - <property name="node.js.path.for.package.tslint" value="project" />  
312 - <property name="node.js.selected.package.eslint" value="(autodetect)" />  
313 - <property name="node.js.selected.package.tslint" value="(autodetect)" /> 151 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" />
  152 + <property name="database.console.LAST_STATE" value="true" />
  153 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
  154 + <property name="project.structure.last.edited" value="Project" />
  155 + <property name="project.structure.proportion" value="0.0" />
  156 + <property name="project.structure.side.proportion" value="0.0" />
314 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> 157 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
315 </component> 158 </component>
316 <component name="RecentsManager"> 159 <component name="RecentsManager">
317 - <key name="MoveFile.RECENT_KEYS">  
318 - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />  
319 - <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> 160 + <key name="CopyClassDialog.RECENTS_KEY">
  161 + <recent name="com.huaheng.pc.config.zoneCapacity.controller" />
  162 + </key>
  163 + <key name="CopyFile.RECENT_KEYS">
  164 + <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" />
  165 + <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" />
320 </key> 166 </key>
321 </component> 167 </component>
322 <component name="RunDashboard"> 168 <component name="RunDashboard">
@@ -331,25 +177,32 @@ @@ -331,25 +177,32 @@
331 </list> 177 </list>
332 </option> 178 </option>
333 </component> 179 </component>
334 - <component name="RunManager">  
335 - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 180 + <component name="RunManager" selected="Spring Boot.HuaHengApplication">
  181 + <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
  182 + <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
336 <module name="WMSV1" /> 183 <module name="WMSV1" />
337 - <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />  
338 - <option name="ALTERNATIVE_JRE_PATH" />  
339 - <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />  
340 - <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> 184 + <extension name="coverage">
  185 + <pattern>
  186 + <option name="PATTERN" value="com.huaheng.test.*" />
  187 + <option name="ENABLED" value="true" />
  188 + </pattern>
  189 + </extension>
341 <method v="2"> 190 <method v="2">
342 <option name="Make" enabled="true" /> 191 <option name="Make" enabled="true" />
343 </method> 192 </method>
344 </configuration> 193 </configuration>
345 - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 194 + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
346 <module name="WMSV1" /> 195 <module name="WMSV1" />
347 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> 196 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
348 - <option name="ALTERNATIVE_JRE_PATH" />  
349 <method v="2"> 197 <method v="2">
350 <option name="Make" enabled="true" /> 198 <option name="Make" enabled="true" />
351 </method> 199 </method>
352 </configuration> 200 </configuration>
  201 + <recent_temporary>
  202 + <list>
  203 + <item itemvalue="Application.CreateCode" />
  204 + </list>
  205 + </recent_temporary>
353 </component> 206 </component>
354 <component name="ServiceViewManager"> 207 <component name="ServiceViewManager">
355 <option name="allServicesViewState"> 208 <option name="allServicesViewState">
@@ -358,7 +211,7 @@ @@ -358,7 +211,7 @@
358 <expand> 211 <expand>
359 <path> 212 <path>
360 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> 213 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
361 - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" /> 214 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5097fb15" type="7427dc5b:ServiceModel$ServiceGroupNode" />
362 </path> 215 </path>
363 </expand> 216 </expand>
364 <select /> 217 <select />
@@ -366,47 +219,135 @@ @@ -366,47 +219,135 @@
366 </serviceView> 219 </serviceView>
367 </option> 220 </option>
368 </component> 221 </component>
  222 + <component name="StructureViewFactory">
  223 + <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" />
  224 + </component>
369 <component name="SvnConfiguration"> 225 <component name="SvnConfiguration">
370 <configuration /> 226 <configuration />
371 </component> 227 </component>
372 <component name="TaskManager"> 228 <component name="TaskManager">
373 <task active="true" id="Default" summary="Default task"> 229 <task active="true" id="Default" summary="Default task">
374 - <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />  
375 - <created>1565160110910</created> 230 + <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
  231 + <created>1563950700252</created>
376 <option name="number" value="Default" /> 232 <option name="number" value="Default" />
377 <option name="presentableId" value="Default" /> 233 <option name="presentableId" value="Default" />
378 - <updated>1565160110910</updated>  
379 - <workItem from="1565160112236" duration="11971000" />  
380 - <workItem from="1565224833241" duration="14642000" />  
381 - <workItem from="1565242153135" duration="1476000" />  
382 - <workItem from="1565259513116" duration="148000" />  
383 - <workItem from="1565311988064" duration="7176000" />  
384 - <workItem from="1565328536669" duration="797000" /> 234 + <updated>1563950700252</updated>
  235 + <workItem from="1563950701881" duration="73000" />
  236 + <workItem from="1565055472980" duration="9734000" />
  237 + <workItem from="1565078101170" duration="2642000" />
  238 + <workItem from="1565080771601" duration="951000" />
  239 + <workItem from="1565082117731" duration="348000" />
  240 + <workItem from="1565085916295" duration="323000" />
  241 + <workItem from="1565087331641" duration="170000" />
  242 + <workItem from="1565138504203" duration="3006000" />
  243 + <workItem from="1565162212626" duration="6726000" />
  244 + <workItem from="1565169755725" duration="2857000" />
  245 + <workItem from="1565242132637" duration="963000" />
  246 + <workItem from="1565244881255" duration="620000" />
  247 + <workItem from="1565245587599" duration="32000" />
  248 + <workItem from="1565245636976" duration="7465000" />
385 </task> 249 </task>
386 - <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">  
387 - <created>1565226427512</created> 250 + <task id="LOCAL-00001" summary="用户查询修改">
  251 + <created>1565058322310</created>
388 <option name="number" value="00001" /> 252 <option name="number" value="00001" />
389 <option name="presentableId" value="LOCAL-00001" /> 253 <option name="presentableId" value="LOCAL-00001" />
390 <option name="project" value="LOCAL" /> 254 <option name="project" value="LOCAL" />
391 - <updated>1565226427512</updated> 255 + <updated>1565058322310</updated>
392 </task> 256 </task>
393 - <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">  
394 - <created>1565256884822</created> 257 + <task id="LOCAL-00002" summary="库区设置编辑">
  258 + <created>1565075790786</created>
395 <option name="number" value="00002" /> 259 <option name="number" value="00002" />
396 <option name="presentableId" value="LOCAL-00002" /> 260 <option name="presentableId" value="LOCAL-00002" />
397 <option name="project" value="LOCAL" /> 261 <option name="project" value="LOCAL" />
398 - <updated>1565256884822</updated> 262 + <updated>1565075790786</updated>
399 </task> 263 </task>
400 - <task id="LOCAL-00003" summary="修改库区service">  
401 - <created>1565259481656</created> 264 + <task id="LOCAL-00003" summary="库区设置编辑">
  265 + <created>1565075857018</created>
402 <option name="number" value="00003" /> 266 <option name="number" value="00003" />
403 <option name="presentableId" value="LOCAL-00003" /> 267 <option name="presentableId" value="LOCAL-00003" />
404 <option name="project" value="LOCAL" /> 268 <option name="project" value="LOCAL" />
405 - <updated>1565259481656</updated> 269 + <updated>1565075857018</updated>
  270 + </task>
  271 + <task id="LOCAL-00004" summary="库区设置编辑">
  272 + <created>1565075883212</created>
  273 + <option name="number" value="00004" />
  274 + <option name="presentableId" value="LOCAL-00004" />
  275 + <option name="project" value="LOCAL" />
  276 + <updated>1565075883212</updated>
  277 + </task>
  278 + <task id="LOCAL-00005" summary="库区设置编辑">
  279 + <created>1565075915322</created>
  280 + <option name="number" value="00005" />
  281 + <option name="presentableId" value="LOCAL-00005" />
  282 + <option name="project" value="LOCAL" />
  283 + <updated>1565075915322</updated>
  284 + </task>
  285 + <task id="LOCAL-00006" summary="回退">
  286 + <created>1565081123490</created>
  287 + <option name="number" value="00006" />
  288 + <option name="presentableId" value="LOCAL-00006" />
  289 + <option name="project" value="LOCAL" />
  290 + <updated>1565081123490</updated>
  291 + </task>
  292 + <task id="LOCAL-00007" summary="zone修改">
  293 + <created>1565172969186</created>
  294 + <option name="number" value="00007" />
  295 + <option name="presentableId" value="LOCAL-00007" />
  296 + <option name="project" value="LOCAL" />
  297 + <updated>1565172969186</updated>
406 </task> 298 </task>
407 - <option name="localTasksCounter" value="4" /> 299 + <task id="LOCAL-00008" summary="回退">
  300 + <created>1565332810976</created>
  301 + <option name="number" value="00008" />
  302 + <option name="presentableId" value="LOCAL-00008" />
  303 + <option name="project" value="LOCAL" />
  304 + <updated>1565332810976</updated>
  305 + </task>
  306 + <option name="localTasksCounter" value="9" />
408 <servers /> 307 <servers />
409 </component> 308 </component>
  309 + <component name="TimeTrackingManager">
  310 + <option name="totallyTimeSpent" value="21886000" />
  311 + </component>
  312 + <component name="ToolWindowManager">
  313 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  314 + <layout>
  315 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.2727882" />
  316 + <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" />
  317 + <window_info id="Designer" order="2" />
  318 + <window_info id="Image Layers" order="3" />
  319 + <window_info id="Capture Tool" order="4" />
  320 + <window_info id="UI Designer" order="5" />
  321 + <window_info id="Favorites" order="6" side_tool="true" />
  322 + <window_info id="Web" order="7" side_tool="true" />
  323 + <window_info anchor="bottom" id="Message" order="0" />
  324 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  325 + <window_info anchor="bottom" id="Run" order="2" />
  326 + <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.25354108" />
  327 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  328 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  329 + <window_info anchor="bottom" id="TODO" order="6" />
  330 + <window_info anchor="bottom" id="Spring" order="7" />
  331 + <window_info anchor="bottom" id="Terminal" order="8" />
  332 + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
  333 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.329718" />
  334 + <window_info anchor="bottom" id="Java Enterprise" order="11" />
  335 + <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
  336 + <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" />
  337 + <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
  338 + <window_info anchor="bottom" id="Database Console" order="15" weight="0.3286119" />
  339 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  340 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  341 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  342 + <window_info anchor="right" id="Maven" order="3" />
  343 + <window_info anchor="right" id="Palette" order="4" />
  344 + <window_info anchor="right" id="Capture Analysis" order="5" />
  345 + <window_info anchor="right" id="Database" order="6" weight="0.26876676" />
  346 + <window_info anchor="right" id="Palette&#9;" order="7" />
  347 + <window_info anchor="right" id="Theme Preview" order="8" />
  348 + <window_info anchor="right" id="Bean Validation" order="9" />
  349 + </layout>
  350 + </component>
410 <component name="TypeScriptGeneratedFilesManager"> 351 <component name="TypeScriptGeneratedFilesManager">
411 <option name="version" value="1" /> 352 <option name="version" value="1" />
412 </component> 353 </component>
@@ -416,18 +357,612 @@ @@ -416,18 +357,612 @@
416 <entry key="MAIN"> 357 <entry key="MAIN">
417 <value> 358 <value>
418 <State> 359 <State>
419 - <option name="COLUMN_ORDER" /> 360 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  361 + <collection />
  362 + </option>
  363 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  364 + <collection />
  365 + </option>
  366 + <option name="FILTERS">
  367 + <map>
  368 + <entry key="branch">
  369 + <value>
  370 + <list>
  371 + <option value="origin/develop" />
  372 + </list>
  373 + </value>
  374 + </entry>
  375 + </map>
  376 + </option>
  377 + <option name="COLUMN_ORDER">
  378 + <list>
  379 + <option value="0" />
  380 + <option value="1" />
  381 + <option value="2" />
  382 + <option value="3" />
  383 + </list>
  384 + </option>
420 </State> 385 </State>
421 </value> 386 </value>
422 </entry> 387 </entry>
423 </map> 388 </map>
424 </option> 389 </option>
  390 + <option name="RECENT_FILTERS">
  391 + <map>
  392 + <entry key="Branch">
  393 + <value>
  394 + <list>
  395 + <RecentGroup>
  396 + <option name="FILTER_VALUES">
  397 + <option value="origin/develop" />
  398 + </option>
  399 + </RecentGroup>
  400 + </list>
  401 + </value>
  402 + </entry>
  403 + </map>
  404 + </option>
425 </component> 405 </component>
426 <component name="VcsManagerConfiguration"> 406 <component name="VcsManagerConfiguration">
427 - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />  
428 - <MESSAGE value="添加库位、库位类型增删改查接口" />  
429 - <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />  
430 - <MESSAGE value="修改库区service" />  
431 - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" /> 407 + <MESSAGE value="用户查询修改" />
  408 + <MESSAGE value="库区设置编辑" />
  409 + <MESSAGE value="zone修改" />
  410 + <MESSAGE value="回退" />
  411 + <option name="LAST_COMMIT_MESSAGE" value="回退" />
  412 + </component>
  413 + <component name="XDebuggerManager">
  414 + <breakpoint-manager>
  415 + <breakpoints>
  416 + <line-breakpoint enabled="true" type="java-line">
  417 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url>
  418 + <line>52</line>
  419 + <properties />
  420 + <option name="timeStamp" value="11" />
  421 + </line-breakpoint>
  422 + <line-breakpoint enabled="true" type="java-line">
  423 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java</url>
  424 + <line>56</line>
  425 + <properties />
  426 + <option name="timeStamp" value="13" />
  427 + </line-breakpoint>
  428 + </breakpoints>
  429 + </breakpoint-manager>
  430 + </component>
  431 + <component name="antWorkspaceConfiguration">
  432 + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
  433 + <option name="FILTER_TARGETS" value="false" />
  434 + </component>
  435 + <component name="editorHistoryManager">
  436 + <entry file="file://$PROJECT_DIR$/pom.xml">
  437 + <provider selected="true" editor-type-id="text-editor" />
  438 + </entry>
  439 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/domain/Company.java">
  440 + <provider selected="true" editor-type-id="text-editor">
  441 + <state relative-caret-position="100">
  442 + <caret line="11" selection-start-line="11" selection-end-line="11" />
  443 + </state>
  444 + </provider>
  445 + </entry>
  446 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
  447 + <provider selected="true" editor-type-id="text-editor">
  448 + <state relative-caret-position="-2585">
  449 + <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
  450 + </state>
  451 + </provider>
  452 + </entry>
  453 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
  454 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
  455 + <provider selected="true" editor-type-id="text-editor">
  456 + <state relative-caret-position="1625">
  457 + <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
  458 + </state>
  459 + </provider>
  460 + </entry>
  461 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java">
  462 + <provider selected="true" editor-type-id="text-editor">
  463 + <state relative-caret-position="245">
  464 + <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
  465 + </state>
  466 + </provider>
  467 + </entry>
  468 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/company/company.html">
  469 + <provider selected="true" editor-type-id="text-editor">
  470 + <state relative-caret-position="-150" />
  471 + </provider>
  472 + </entry>
  473 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/mapper/MenuMapper.java">
  474 + <provider selected="true" editor-type-id="text-editor">
  475 + <state relative-caret-position="375">
  476 + <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  477 + <folding>
  478 + <element signature="imports" expanded="true" />
  479 + </folding>
  480 + </state>
  481 + </provider>
  482 + </entry>
  483 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java">
  484 + <provider selected="true" editor-type-id="text-editor">
  485 + <state relative-caret-position="250">
  486 + <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
  487 + </state>
  488 + </provider>
  489 + </entry>
  490 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/ZoneMapper.xml" />
  491 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  492 + <provider selected="true" editor-type-id="text-editor">
  493 + <state relative-caret-position="168">
  494 + <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
  495 + </state>
  496 + </provider>
  497 + </entry>
  498 + <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/lang/Integer.java">
  499 + <provider selected="true" editor-type-id="text-editor">
  500 + <state relative-caret-position="124">
  501 + <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
  502 + </state>
  503 + </provider>
  504 + </entry>
  505 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java">
  506 + <provider selected="true" editor-type-id="text-editor">
  507 + <state relative-caret-position="141">
  508 + <caret line="78" column="32" lean-forward="true" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
  509 + </state>
  510 + </provider>
  511 + </entry>
  512 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
  513 + <provider selected="true" editor-type-id="text-editor">
  514 + <state relative-caret-position="-1187">
  515 + <caret line="72" column="58" selection-start-line="72" selection-start-column="58" selection-end-line="72" selection-end-column="58" />
  516 + </state>
  517 + </provider>
  518 + </entry>
  519 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/login.js">
  520 + <provider selected="true" editor-type-id="text-editor">
  521 + <state relative-caret-position="225">
  522 + <caret line="21" column="66" selection-start-line="21" selection-start-column="62" selection-end-line="21" selection-end-column="66" />
  523 + </state>
  524 + </provider>
  525 + </entry>
  526 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml">
  527 + <provider selected="true" editor-type-id="text-editor">
  528 + <state relative-caret-position="2553">
  529 + <caret line="130" column="11" selection-start-line="130" selection-start-column="11" selection-end-line="130" selection-end-column="11" />
  530 + </state>
  531 + </provider>
  532 + </entry>
  533 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java">
  534 + <provider selected="true" editor-type-id="text-editor">
  535 + <state relative-caret-position="175">
  536 + <caret line="12" selection-start-line="12" selection-end-line="12" />
  537 + </state>
  538 + </provider>
  539 + </entry>
  540 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java">
  541 + <provider selected="true" editor-type-id="text-editor">
  542 + <state relative-caret-position="200">
  543 + <caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
  544 + </state>
  545 + </provider>
  546 + </entry>
  547 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java">
  548 + <provider selected="true" editor-type-id="text-editor">
  549 + <state relative-caret-position="200">
  550 + <caret line="12" column="91" selection-start-line="12" selection-start-column="91" selection-end-line="12" selection-end-column="91" />
  551 + </state>
  552 + </provider>
  553 + </entry>
  554 + <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">
  555 + <provider selected="true" editor-type-id="text-editor">
  556 + <state relative-caret-position="135">
  557 + <caret line="127" selection-start-line="127" selection-end-line="127" />
  558 + </state>
  559 + </provider>
  560 + </entry>
  561 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
  562 + <provider selected="true" editor-type-id="text-editor">
  563 + <state relative-caret-position="149">
  564 + <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
  565 + </state>
  566 + </provider>
  567 + </entry>
  568 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java">
  569 + <provider selected="true" editor-type-id="text-editor">
  570 + <state relative-caret-position="252">
  571 + <caret line="92" selection-start-line="92" selection-end-line="92" />
  572 + </state>
  573 + </provider>
  574 + </entry>
  575 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
  576 + <provider selected="true" editor-type-id="text-editor">
  577 + <state relative-caret-position="185">
  578 + <caret line="188" column="26" selection-start-line="188" selection-start-column="26" selection-end-line="188" selection-end-column="26" />
  579 + </state>
  580 + </provider>
  581 + </entry>
  582 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
  583 + <provider selected="true" editor-type-id="text-editor">
  584 + <state relative-caret-position="135">
  585 + <caret line="132" column="37" selection-start-line="132" selection-start-column="37" selection-end-line="132" selection-end-column="37" />
  586 + </state>
  587 + </provider>
  588 + </entry>
  589 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
  590 + <provider selected="true" editor-type-id="text-editor">
  591 + <state>
  592 + <caret line="471" column="43" selection-start-line="471" selection-start-column="43" selection-end-line="471" selection-end-column="43" />
  593 + </state>
  594 + </provider>
  595 + </entry>
  596 + <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/d0963ee7-a6e7-4e61-9f9b-2a0b4ecc4332/console.sql">
  597 + <provider selected="true" editor-type-id="text-editor" />
  598 + </entry>
  599 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  600 + <provider selected="true" editor-type-id="text-editor">
  601 + <state relative-caret-position="275">
  602 + <caret line="11" column="51" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="51" />
  603 + </state>
  604 + </provider>
  605 + </entry>
  606 + <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">
  607 + <provider selected="true" editor-type-id="text-editor">
  608 + <state relative-caret-position="133">
  609 + <caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
  610 + </state>
  611 + </provider>
  612 + </entry>
  613 + <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">
  614 + <provider selected="true" editor-type-id="text-editor">
  615 + <state relative-caret-position="158">
  616 + <caret line="198" lean-forward="true" selection-start-line="198" selection-end-line="198" />
  617 + </state>
  618 + </provider>
  619 + </entry>
  620 + <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">
  621 + <provider selected="true" editor-type-id="text-editor">
  622 + <state relative-caret-position="158">
  623 + <caret line="275" column="32" lean-forward="true" selection-start-line="275" selection-start-column="32" selection-end-line="275" selection-end-column="32" />
  624 + <folding>
  625 + <element signature="e#9323#9324#0" expanded="true" />
  626 + <element signature="e#9381#9382#0" expanded="true" />
  627 + <element signature="e#9463#9464#0" expanded="true" />
  628 + <element signature="e#9527#9528#0" expanded="true" />
  629 + </folding>
  630 + </state>
  631 + </provider>
  632 + </entry>
  633 + <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">
  634 + <provider selected="true" editor-type-id="text-editor">
  635 + <state relative-caret-position="-17">
  636 + <caret line="249" column="7" lean-forward="true" selection-start-line="249" selection-start-column="7" selection-end-line="249" selection-end-column="7" />
  637 + </state>
  638 + </provider>
  639 + </entry>
  640 + <entry file="das://e67b6455-2363-423c-bed8-503129974854/schema/wms_v2/table/zone_capacity" />
  641 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/container/container.html">
  642 + <provider selected="true" editor-type-id="text-editor">
  643 + <state relative-caret-position="450">
  644 + <caret line="24" column="90" lean-forward="true" selection-start-line="24" selection-start-column="90" selection-end-line="24" selection-end-column="90" />
  645 + </state>
  646 + </provider>
  647 + </entry>
  648 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/mapper/ZoneMapper.java">
  649 + <provider selected="true" editor-type-id="text-editor">
  650 + <state relative-caret-position="100">
  651 + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
  652 + </state>
  653 + </provider>
  654 + </entry>
  655 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneService.java">
  656 + <provider selected="true" editor-type-id="text-editor">
  657 + <state relative-caret-position="25">
  658 + <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
  659 + </state>
  660 + </provider>
  661 + </entry>
  662 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml">
  663 + <provider selected="true" editor-type-id="text-editor">
  664 + <state relative-caret-position="75">
  665 + <caret line="3" column="70" selection-start-line="3" selection-start-column="70" selection-end-line="3" selection-end-column="70" />
  666 + </state>
  667 + </provider>
  668 + </entry>
  669 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml">
  670 + <provider selected="true" editor-type-id="text-editor">
  671 + <state relative-caret-position="353">
  672 + <caret line="26" column="27" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="27" />
  673 + </state>
  674 + </provider>
  675 + </entry>
  676 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java">
  677 + <provider selected="true" editor-type-id="text-editor">
  678 + <state relative-caret-position="253">
  679 + <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
  680 + </state>
  681 + </provider>
  682 + </entry>
  683 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java">
  684 + <provider selected="true" editor-type-id="text-editor">
  685 + <state relative-caret-position="-8697">
  686 + <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
  687 + <folding>
  688 + <element signature="imports" expanded="true" />
  689 + <element signature="e#2856#2857#0" expanded="true" />
  690 + <element signature="e#2881#2882#0" expanded="true" />
  691 + <element signature="e#2918#2919#0" expanded="true" />
  692 + <element signature="e#2946#2947#0" expanded="true" />
  693 + <element signature="e#2986#2987#0" expanded="true" />
  694 + <element signature="e#3022#3023#0" expanded="true" />
  695 + <element signature="e#3080#3081#0" expanded="true" />
  696 + <element signature="e#3130#3131#0" expanded="true" />
  697 + <element signature="e#3168#3169#0" expanded="true" />
  698 + <element signature="e#3202#3203#0" expanded="true" />
  699 + <element signature="e#3256#3257#0" expanded="true" />
  700 + <element signature="e#3302#3303#0" expanded="true" />
  701 + <element signature="e#3341#3342#0" expanded="true" />
  702 + <element signature="e#3376#3377#0" expanded="true" />
  703 + <element signature="e#3432#3433#0" expanded="true" />
  704 + <element signature="e#3480#3481#0" expanded="true" />
  705 + <element signature="e#3519#3520#0" expanded="true" />
  706 + <element signature="e#3554#3555#0" expanded="true" />
  707 + <element signature="e#3610#3611#0" expanded="true" />
  708 + <element signature="e#3658#3659#0" expanded="true" />
  709 + <element signature="e#3697#3698#0" expanded="true" />
  710 + <element signature="e#3732#3733#0" expanded="true" />
  711 + <element signature="e#3788#3789#0" expanded="true" />
  712 + <element signature="e#3836#3837#0" expanded="true" />
  713 + <element signature="e#3875#3876#0" expanded="true" />
  714 + <element signature="e#3910#3911#0" expanded="true" />
  715 + <element signature="e#3966#3967#0" expanded="true" />
  716 + <element signature="e#4014#4015#0" expanded="true" />
  717 + <element signature="e#4051#4052#0" expanded="true" />
  718 + <element signature="e#4084#4085#0" expanded="true" />
  719 + <element signature="e#4136#4137#0" expanded="true" />
  720 + <element signature="e#4180#4181#0" expanded="true" />
  721 + <element signature="e#4214#4215#0" expanded="true" />
  722 + <element signature="e#4243#4244#0" expanded="true" />
  723 + <element signature="e#4288#4289#0" expanded="true" />
  724 + <element signature="e#4324#4325#0" expanded="true" />
  725 + <element signature="e#4358#4359#0" expanded="true" />
  726 + <element signature="e#4387#4388#0" expanded="true" />
  727 + <element signature="e#4432#4433#0" expanded="true" />
  728 + <element signature="e#4468#4469#0" expanded="true" />
  729 + <element signature="e#4500#4501#0" expanded="true" />
  730 + <element signature="e#4530#4531#0" expanded="true" />
  731 + <element signature="e#4574#4575#0" expanded="true" />
  732 + <element signature="e#4612#4613#0" expanded="true" />
  733 + <element signature="e#4648#4649#0" expanded="true" />
  734 + <element signature="e#4680#4681#0" expanded="true" />
  735 + <element signature="e#4730#4731#0" expanded="true" />
  736 + <element signature="e#4772#4773#0" expanded="true" />
  737 + <element signature="e#4808#4809#0" expanded="true" />
  738 + <element signature="e#4842#4843#0" expanded="true" />
  739 + <element signature="e#4894#4895#0" expanded="true" />
  740 + <element signature="e#4940#4941#0" expanded="true" />
  741 + <element signature="e#4980#4981#0" expanded="true" />
  742 + <element signature="e#5016#5017#0" expanded="true" />
  743 + <element signature="e#5074#5075#0" expanded="true" />
  744 + <element signature="e#5124#5125#0" expanded="true" />
  745 + <element signature="e#5159#5160#0" expanded="true" />
  746 + <element signature="e#5189#5190#0" expanded="true" />
  747 + <element signature="e#5236#5237#0" expanded="true" />
  748 + <element signature="e#5274#5275#0" expanded="true" />
  749 + <element signature="e#5309#5310#0" expanded="true" />
  750 + <element signature="e#5340#5341#0" expanded="true" />
  751 + <element signature="e#5388#5389#0" expanded="true" />
  752 + <element signature="e#5428#5429#0" expanded="true" />
  753 + <element signature="e#5463#5464#0" expanded="true" />
  754 + <element signature="e#5494#5495#0" expanded="true" />
  755 + <element signature="e#5542#5543#0" expanded="true" />
  756 + <element signature="e#5582#5583#0" expanded="true" />
  757 + <element signature="e#5617#5618#0" expanded="true" />
  758 + <element signature="e#5648#5649#0" expanded="true" />
  759 + <element signature="e#5696#5697#0" expanded="true" />
  760 + <element signature="e#5736#5737#0" expanded="true" />
  761 + <element signature="e#5771#5772#0" expanded="true" />
  762 + <element signature="e#5802#5803#0" expanded="true" />
  763 + <element signature="e#5850#5851#0" expanded="true" />
  764 + <element signature="e#5890#5891#0" expanded="true" />
  765 + <element signature="e#5925#5926#0" expanded="true" />
  766 + <element signature="e#5956#5957#0" expanded="true" />
  767 + <element signature="e#6004#6005#0" expanded="true" />
  768 + <element signature="e#6044#6045#0" expanded="true" />
  769 + <element signature="e#6079#6080#0" expanded="true" />
  770 + <element signature="e#6110#6111#0" expanded="true" />
  771 + <element signature="e#6158#6159#0" expanded="true" />
  772 + <element signature="e#6198#6199#0" expanded="true" />
  773 + <element signature="e#6233#6234#0" expanded="true" />
  774 + <element signature="e#6264#6265#0" expanded="true" />
  775 + <element signature="e#6312#6313#0" expanded="true" />
  776 + <element signature="e#6352#6353#0" expanded="true" />
  777 + <element signature="e#6387#6388#0" expanded="true" />
  778 + <element signature="e#6418#6419#0" expanded="true" />
  779 + <element signature="e#6466#6467#0" expanded="true" />
  780 + <element signature="e#6506#6507#0" expanded="true" />
  781 + <element signature="e#6545#6546#0" expanded="true" />
  782 + <element signature="e#6580#6581#0" expanded="true" />
  783 + <element signature="e#6636#6637#0" expanded="true" />
  784 + <element signature="e#6684#6685#0" expanded="true" />
  785 + </folding>
  786 + </state>
  787 + </provider>
  788 + </entry>
  789 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
  790 + <provider selected="true" editor-type-id="text-editor">
  791 + <state relative-caret-position="292">
  792 + <caret line="63" selection-start-line="63" selection-end-line="63" />
  793 + </state>
  794 + </provider>
  795 + </entry>
  796 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java">
  797 + <provider selected="true" editor-type-id="text-editor">
  798 + <state relative-caret-position="225">
  799 + <caret line="56" selection-start-line="56" selection-end-line="56" />
  800 + </state>
  801 + </provider>
  802 + </entry>
  803 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  804 + <provider selected="true" editor-type-id="text-editor">
  805 + <state relative-caret-position="194">
  806 + <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" />
  807 + </state>
  808 + </provider>
  809 + </entry>
  810 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html">
  811 + <provider selected="true" editor-type-id="text-editor">
  812 + <state relative-caret-position="1460">
  813 + <caret line="128" column="18" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" />
  814 + </state>
  815 + </provider>
  816 + </entry>
  817 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java">
  818 + <provider selected="true" editor-type-id="text-editor">
  819 + <state relative-caret-position="436">
  820 + <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
  821 + <folding>
  822 + <element signature="imports" expanded="true" />
  823 + </folding>
  824 + </state>
  825 + </provider>
  826 + </entry>
  827 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html">
  828 + <provider selected="true" editor-type-id="text-editor">
  829 + <state relative-caret-position="385">
  830 + <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" />
  831 + </state>
  832 + </provider>
  833 + </entry>
  834 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java">
  835 + <provider selected="true" editor-type-id="text-editor">
  836 + <state relative-caret-position="125">
  837 + <caret line="5" column="61" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" />
  838 + <folding>
  839 + <element signature="imports" expanded="true" />
  840 + </folding>
  841 + </state>
  842 + </provider>
  843 + </entry>
  844 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state relative-caret-position="200">
  847 + <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
  848 + <folding>
  849 + <element signature="imports" expanded="true" />
  850 + </folding>
  851 + </state>
  852 + </provider>
  853 + </entry>
  854 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html">
  855 + <provider selected="true" editor-type-id="text-editor">
  856 + <state relative-caret-position="268">
  857 + <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
  858 + </state>
  859 + </provider>
  860 + </entry>
  861 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java">
  862 + <provider selected="true" editor-type-id="text-editor">
  863 + <state relative-caret-position="200">
  864 + <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
  865 + <folding>
  866 + <element signature="imports" expanded="true" />
  867 + </folding>
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="350">
  874 + <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
  875 + <folding>
  876 + <element signature="imports" expanded="true" />
  877 + </folding>
  878 + </state>
  879 + </provider>
  880 + </entry>
  881 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java">
  882 + <provider selected="true" editor-type-id="text-editor">
  883 + <state relative-caret-position="358">
  884 + <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
  885 + <folding>
  886 + <element signature="imports" expanded="true" />
  887 + </folding>
  888 + </state>
  889 + </provider>
  890 + </entry>
  891 + </component>
  892 + <component name="masterDetails">
  893 + <states>
  894 + <state key="ArtifactsStructureConfigurable.UI">
  895 + <settings>
  896 + <artifact-editor />
  897 + <splitter-proportions>
  898 + <option name="proportions">
  899 + <list>
  900 + <option value="0.2" />
  901 + </list>
  902 + </option>
  903 + </splitter-proportions>
  904 + </settings>
  905 + </state>
  906 + <state key="FacetStructureConfigurable.UI">
  907 + <settings>
  908 + <last-edited>Spring</last-edited>
  909 + <splitter-proportions>
  910 + <option name="proportions">
  911 + <list>
  912 + <option value="0.2" />
  913 + </list>
  914 + </option>
  915 + </splitter-proportions>
  916 + </settings>
  917 + </state>
  918 + <state key="GlobalLibrariesConfigurable.UI">
  919 + <settings>
  920 + <splitter-proportions>
  921 + <option name="proportions">
  922 + <list>
  923 + <option value="0.2" />
  924 + </list>
  925 + </option>
  926 + </splitter-proportions>
  927 + </settings>
  928 + </state>
  929 + <state key="JdkListConfigurable.UI">
  930 + <settings>
  931 + <last-edited>1.8</last-edited>
  932 + <splitter-proportions>
  933 + <option name="proportions">
  934 + <list>
  935 + <option value="0.2" />
  936 + </list>
  937 + </option>
  938 + </splitter-proportions>
  939 + </settings>
  940 + </state>
  941 + <state key="ModuleStructureConfigurable.UI">
  942 + <settings>
  943 + <last-edited>WMSV1</last-edited>
  944 + <splitter-proportions>
  945 + <option name="proportions">
  946 + <list>
  947 + <option value="0.2" />
  948 + <option value="0.6" />
  949 + </list>
  950 + </option>
  951 + </splitter-proportions>
  952 + </settings>
  953 + </state>
  954 + <state key="ProjectLibrariesConfigurable.UI">
  955 + <settings>
  956 + <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited>
  957 + <splitter-proportions>
  958 + <option name="proportions">
  959 + <list>
  960 + <option value="0.2" />
  961 + </list>
  962 + </option>
  963 + </splitter-proportions>
  964 + </settings>
  965 + </state>
  966 + </states>
432 </component> 967 </component>
433 </project> 968 </project>
434 \ No newline at end of file 969 \ No newline at end of file
src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
  View file @93f50a0
1 package com.huaheng.pc.config.zoneCapacity.service; 1 package com.huaheng.pc.config.zoneCapacity.service;
2 2
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import com.huaheng.common.utils.StringUtils; 6 import com.huaheng.common.utils.StringUtils;
5 import com.huaheng.common.utils.security.ShiroUtils; 7 import com.huaheng.common.utils.security.ShiroUtils;
6 import com.huaheng.framework.web.domain.AjaxResult; 8 import com.huaheng.framework.web.domain.AjaxResult;
7 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity; 9 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
8 import com.huaheng.pc.config.zoneCapacity.mapper.ZoneCapacityMapper; 10 import com.huaheng.pc.config.zoneCapacity.mapper.ZoneCapacityMapper;
  11 +import com.huaheng.pc.general.material.domain.Material;
  12 +import com.huaheng.pc.general.material.service.MaterialService;
  13 +import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
10 15
11 @Service 16 @Service
12 public class ZoneCapacityServiceImpl extends ServiceImpl<ZoneCapacityMapper, ZoneCapacity> implements ZoneCapacityService { 17 public class ZoneCapacityServiceImpl extends ServiceImpl<ZoneCapacityMapper, ZoneCapacity> implements ZoneCapacityService {
  18 + @Autowired
  19 + private MaterialService materialService;
  20 +
  21 + //添加库区容量时，查找到该物料的具体信息，一并加入到库区容量中
13 @Override 22 @Override
14 public AjaxResult insertModel(ZoneCapacity zoneCapacity) { 23 public AjaxResult insertModel(ZoneCapacity zoneCapacity) {
  24 + zoneCapacity.setWarehouseCode(ShiroUtils.getWarehouseCode());
15 zoneCapacity.setCreatedBy(ShiroUtils.getLoginName()); 25 zoneCapacity.setCreatedBy(ShiroUtils.getLoginName());
16 zoneCapacity.setLastUpdatedBy(ShiroUtils.getLoginName()); 26 zoneCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
17 if(StringUtils.isEmpty(zoneCapacity.getMaterialCode())){ 27 if(StringUtils.isEmpty(zoneCapacity.getMaterialCode())){
18 return AjaxResult.error("没有输入物料编码"); 28 return AjaxResult.error("没有输入物料编码");
19 } 29 }
20 30
  31 + //查找该物料信息
  32 + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
  33 + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(zoneCapacity.getMaterialCode()),Material::getCode, zoneCapacity.getMaterialCode())
  34 + .eq(StringUtils.isNotEmpty(zoneCapacity.getWarehouseCode()),Material::getWarehouseCode, zoneCapacity.getWarehouseCode());
  35 + Material material=materialService.getOne(lambdaQueryWrapper);
  36 + if(material==null){
  37 + return AjaxResult.error("系统没有该物料");
  38 + }
  39 + zoneCapacity.setMaterialName(material.getName());
  40 + zoneCapacity.setMaterialSpec(material.getSpec());
  41 + zoneCapacity.setMaterialUnit(material.getUnit());
  42 + if(!this.save(zoneCapacity)){
  43 + return AjaxResult.error("新增库区容量失败");
  44 + }
21 return AjaxResult.success("新增库区容量成功"); 45 return AjaxResult.success("新增库区容量成功");
22 } 46 }
23 } 47 }