diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 16adc83..a2e88c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,230 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_17.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_17.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_72.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_722.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_723.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_theborakompanioni_thymeleaf_extras_shiro_2_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_22.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_23.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_24.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_6_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_huaheng_soft_echarts_1_14.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_java7_2_4_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_19.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_02.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_03.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_52.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_53.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_92.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_93.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_02.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_03.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_11_3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_1_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_12.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_1_13.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_0_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_0_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_02.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_0_03.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_0_3_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_0_4_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_0_4_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE2.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE3.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_testng_testng_7_0_0_beta7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_02.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_03.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <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" />
- <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" />
- <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" />
- <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" />
- <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" />
- <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" />
+ <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="回退" />
+ <list id="560adde2-f267-4051-b179-368004a880e1" name="Revert "库区容量增加修改"" comment="Revert "库区容量增加修改" This reverts commit d12fb0d9">
+ <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" />
</list>
+ <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -232,70 +13,133 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="false" />
+ <option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
+ <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+ <item name="wms2" type="feb32156:DbDataSourceImpl" />
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+ <item name="wms2" type="feb32156:DbDataSourceImpl" />
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+ <item name="wms2" type="feb32156:DbDataSourceImpl" />
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
</expand>
<select />
</component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="165">
+ <caret line="45" selection-start-line="45" selection-end-line="45" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
+ <option value="Interface" />
<option value="Class" />
</list>
</option>
</component>
+ <component name="FindInProjectRecents">
+ <findStrings>
+ <find>zone</find>
+ </findStrings>
+ </component>
<component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
- <entry key="$PROJECT_DIR$" value="master" />
+ <entry key="$PROJECT_DIR$" value="developMain" />
</map>
</option>
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RESET_MODE" value="HARD" />
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java" />
+ </list>
+ </option>
</component>
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
- <option value="E:\code\wms2\.idea" />
+ <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" />
</set>
</option>
</component>
- <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
- <component name="ProjectLevelVcsManager">
- <ConfirmationsSetting value="2" id="Add" />
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="importAutomatically" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
+ <option name="width" value="1938" />
+ <option name="height" value="1048" />
+ </component>
+ <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" />
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <flattenPackages ProjectPane="false" />
+ <hideEmptyPackages ProjectPane="false" />
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane" />
+ <pane id="Scope" />
+ </panes>
</component>
<component name="PropertiesComponent">
- <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="mysql" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
@@ -304,19 +148,21 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
- <property name="node.js.detected.package.eslint" value="true" />
- <property name="node.js.detected.package.tslint" value="true" />
- <property name="node.js.path.for.package.eslint" value="project" />
- <property name="node.js.path.for.package.tslint" value="project" />
- <property name="node.js.selected.package.eslint" value="(autodetect)" />
- <property name="node.js.selected.package.tslint" value="(autodetect)" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" />
+ <property name="database.console.LAST_STATE" value="true" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
+ <property name="project.structure.last.edited" value="Project" />
+ <property name="project.structure.proportion" value="0.0" />
+ <property name="project.structure.side.proportion" value="0.0" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
- <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.huaheng.pc.config.zoneCapacity.controller" />
+ </key>
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" />
+ <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" />
</key>
</component>
<component name="RunDashboard">
@@ -331,25 +177,32 @@
</list>
</option>
</component>
- <component name="RunManager">
- <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <component name="RunManager" selected="Spring Boot.HuaHengApplication">
+ <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
<module name="WMSV1" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
- <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.huaheng.test.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="WMSV1" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
+ <recent_temporary>
+ <list>
+ <item itemvalue="Application.CreateCode" />
+ </list>
+ </recent_temporary>
</component>
<component name="ServiceViewManager">
<option name="allServicesViewState">
@@ -358,7 +211,7 @@
<expand>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5097fb15" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
</expand>
<select />
@@ -366,47 +219,135 @@
</serviceView>
</option>
</component>
+ <component name="StructureViewFactory">
+ <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" />
+ </component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
- <created>1565160110910</created>
+ <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
+ <created>1563950700252</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1565160110910</updated>
- <workItem from="1565160112236" duration="11971000" />
- <workItem from="1565224833241" duration="14642000" />
- <workItem from="1565242153135" duration="1476000" />
- <workItem from="1565259513116" duration="148000" />
- <workItem from="1565311988064" duration="7176000" />
- <workItem from="1565328536669" duration="797000" />
+ <updated>1563950700252</updated>
+ <workItem from="1563950701881" duration="73000" />
+ <workItem from="1565055472980" duration="9734000" />
+ <workItem from="1565078101170" duration="2642000" />
+ <workItem from="1565080771601" duration="951000" />
+ <workItem from="1565082117731" duration="348000" />
+ <workItem from="1565085916295" duration="323000" />
+ <workItem from="1565087331641" duration="170000" />
+ <workItem from="1565138504203" duration="3006000" />
+ <workItem from="1565162212626" duration="6726000" />
+ <workItem from="1565169755725" duration="2857000" />
+ <workItem from="1565242132637" duration="963000" />
+ <workItem from="1565244881255" duration="620000" />
+ <workItem from="1565245587599" duration="32000" />
+ <workItem from="1565245636976" duration="7465000" />
</task>
- <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
- <created>1565226427512</created>
+ <task id="LOCAL-00001" summary="用户查询修改">
+ <created>1565058322310</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
- <updated>1565226427512</updated>
+ <updated>1565058322310</updated>
</task>
- <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面">
- <created>1565256884822</created>
+ <task id="LOCAL-00002" summary="库区设置编辑">
+ <created>1565075790786</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
- <updated>1565256884822</updated>
+ <updated>1565075790786</updated>
</task>
- <task id="LOCAL-00003" summary="修改库区service">
- <created>1565259481656</created>
+ <task id="LOCAL-00003" summary="库区设置编辑">
+ <created>1565075857018</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
- <updated>1565259481656</updated>
+ <updated>1565075857018</updated>
+ </task>
+ <task id="LOCAL-00004" summary="库区设置编辑">
+ <created>1565075883212</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1565075883212</updated>
+ </task>
+ <task id="LOCAL-00005" summary="库区设置编辑">
+ <created>1565075915322</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1565075915322</updated>
+ </task>
+ <task id="LOCAL-00006" summary="回退">
+ <created>1565081123490</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1565081123490</updated>
+ </task>
+ <task id="LOCAL-00007" summary="zone修改">
+ <created>1565172969186</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
+ <option name="project" value="LOCAL" />
+ <updated>1565172969186</updated>
</task>
- <option name="localTasksCounter" value="4" />
+ <task id="LOCAL-00008" summary="回退">
+ <created>1565332810976</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
+ <option name="project" value="LOCAL" />
+ <updated>1565332810976</updated>
+ </task>
+ <option name="localTasksCounter" value="9" />
<servers />
</component>
+ <component name="TimeTrackingManager">
+ <option name="totallyTimeSpent" value="21886000" />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+ <layout>
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.2727882" />
+ <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" />
+ <window_info id="Designer" order="2" />
+ <window_info id="Image Layers" order="3" />
+ <window_info id="Capture Tool" order="4" />
+ <window_info id="UI Designer" order="5" />
+ <window_info id="Favorites" order="6" side_tool="true" />
+ <window_info id="Web" order="7" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.25354108" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Spring" order="7" />
+ <window_info anchor="bottom" id="Terminal" order="8" />
+ <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.329718" />
+ <window_info anchor="bottom" id="Java Enterprise" order="11" />
+ <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" />
+ <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
+ <window_info anchor="bottom" id="Database Console" order="15" weight="0.3286119" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Maven" order="3" />
+ <window_info anchor="right" id="Palette" order="4" />
+ <window_info anchor="right" id="Capture Analysis" order="5" />
+ <window_info anchor="right" id="Database" order="6" weight="0.26876676" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Bean Validation" order="9" />
+ </layout>
+ </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -416,18 +357,612 @@
<entry key="MAIN">
<value>
<State>
- <option name="COLUMN_ORDER" />
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="FILTERS">
+ <map>
+ <entry key="branch">
+ <value>
+ <list>
+ <option value="origin/develop" />
+ </list>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
</map>
</option>
+ <option name="RECENT_FILTERS">
+ <map>
+ <entry key="Branch">
+ <value>
+ <list>
+ <RecentGroup>
+ <option name="FILTER_VALUES">
+ <option value="origin/develop" />
+ </option>
+ </RecentGroup>
+ </list>
+ </value>
+ </entry>
+ </map>
+ </option>
</component>
<component name="VcsManagerConfiguration">
- <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="添加库位、库位类型增删改查接口" />
- <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
- <MESSAGE value="修改库区service" />
- <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
+ <MESSAGE value="用户查询修改" />
+ <MESSAGE value="库区设置编辑" />
+ <MESSAGE value="zone修改" />
+ <MESSAGE value="回退" />
+ <option name="LAST_COMMIT_MESSAGE" value="回退" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url>
+ <line>52</line>
+ <properties />
+ <option name="timeStamp" value="11" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java</url>
+ <line>56</line>
+ <properties />
+ <option name="timeStamp" value="13" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
+ </component>
+ <component name="antWorkspaceConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="FILTER_TARGETS" value="false" />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/domain/Company.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="100">
+ <caret line="11" selection-start-line="11" selection-end-line="11" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-2585">
+ <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1625">
+ <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="245">
+ <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/company/company.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-150" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/mapper/MenuMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="375">
+ <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="250">
+ <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/ZoneMapper.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="168">
+ <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/lang/Integer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="124">
+ <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="141">
+ <caret line="78" column="32" lean-forward="true" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1187">
+ <caret line="72" column="58" selection-start-line="72" selection-start-column="58" selection-end-line="72" selection-end-column="58" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/login.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="21" column="66" selection-start-line="21" selection-start-column="62" selection-end-line="21" selection-end-column="66" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2553">
+ <caret line="130" column="11" selection-start-line="130" selection-start-column="11" selection-end-line="130" selection-end-column="11" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="175">
+ <caret line="12" selection-start-line="12" selection-end-line="12" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="200">
+ <caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="200">
+ <caret line="12" column="91" selection-start-line="12" selection-start-column="91" selection-end-line="12" selection-end-column="91" />
+ </state>
+ </provider>
+ </entry>
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="127" selection-start-line="127" selection-end-line="127" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="149">
+ <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="252">
+ <caret line="92" selection-start-line="92" selection-end-line="92" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="185">
+ <caret line="188" column="26" selection-start-line="188" selection-start-column="26" selection-end-line="188" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="132" column="37" selection-start-line="132" selection-start-column="37" selection-end-line="132" selection-end-column="37" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <caret line="471" column="43" selection-start-line="471" selection-start-column="43" selection-end-line="471" selection-end-column="43" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/d0963ee7-a6e7-4e61-9f9b-2a0b4ecc4332/console.sql">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="275">
+ <caret line="11" column="51" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="51" />
+ </state>
+ </provider>
+ </entry>
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" />
+ </state>
+ </provider>
+ </entry>
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="158">
+ <caret line="198" lean-forward="true" selection-start-line="198" selection-end-line="198" />
+ </state>
+ </provider>
+ </entry>
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="158">
+ <caret line="275" column="32" lean-forward="true" selection-start-line="275" selection-start-column="32" selection-end-line="275" selection-end-column="32" />
+ <folding>
+ <element signature="e#9323#9324#0" expanded="true" />
+ <element signature="e#9381#9382#0" expanded="true" />
+ <element signature="e#9463#9464#0" expanded="true" />
+ <element signature="e#9527#9528#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-17">
+ <caret line="249" column="7" lean-forward="true" selection-start-line="249" selection-start-column="7" selection-end-line="249" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="das://e67b6455-2363-423c-bed8-503129974854/schema/wms_v2/table/zone_capacity" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/container/container.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="450">
+ <caret line="24" column="90" lean-forward="true" selection-start-line="24" selection-start-column="90" selection-end-line="24" selection-end-column="90" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/mapper/ZoneMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="100">
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="25">
+ <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="3" column="70" selection-start-line="3" selection-start-column="70" selection-end-line="3" selection-end-column="70" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="353">
+ <caret line="26" column="27" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="27" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="253">
+ <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-8697">
+ <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#2856#2857#0" expanded="true" />
+ <element signature="e#2881#2882#0" expanded="true" />
+ <element signature="e#2918#2919#0" expanded="true" />
+ <element signature="e#2946#2947#0" expanded="true" />
+ <element signature="e#2986#2987#0" expanded="true" />
+ <element signature="e#3022#3023#0" expanded="true" />
+ <element signature="e#3080#3081#0" expanded="true" />
+ <element signature="e#3130#3131#0" expanded="true" />
+ <element signature="e#3168#3169#0" expanded="true" />
+ <element signature="e#3202#3203#0" expanded="true" />
+ <element signature="e#3256#3257#0" expanded="true" />
+ <element signature="e#3302#3303#0" expanded="true" />
+ <element signature="e#3341#3342#0" expanded="true" />
+ <element signature="e#3376#3377#0" expanded="true" />
+ <element signature="e#3432#3433#0" expanded="true" />
+ <element signature="e#3480#3481#0" expanded="true" />
+ <element signature="e#3519#3520#0" expanded="true" />
+ <element signature="e#3554#3555#0" expanded="true" />
+ <element signature="e#3610#3611#0" expanded="true" />
+ <element signature="e#3658#3659#0" expanded="true" />
+ <element signature="e#3697#3698#0" expanded="true" />
+ <element signature="e#3732#3733#0" expanded="true" />
+ <element signature="e#3788#3789#0" expanded="true" />
+ <element signature="e#3836#3837#0" expanded="true" />
+ <element signature="e#3875#3876#0" expanded="true" />
+ <element signature="e#3910#3911#0" expanded="true" />
+ <element signature="e#3966#3967#0" expanded="true" />
+ <element signature="e#4014#4015#0" expanded="true" />
+ <element signature="e#4051#4052#0" expanded="true" />
+ <element signature="e#4084#4085#0" expanded="true" />
+ <element signature="e#4136#4137#0" expanded="true" />
+ <element signature="e#4180#4181#0" expanded="true" />
+ <element signature="e#4214#4215#0" expanded="true" />
+ <element signature="e#4243#4244#0" expanded="true" />
+ <element signature="e#4288#4289#0" expanded="true" />
+ <element signature="e#4324#4325#0" expanded="true" />
+ <element signature="e#4358#4359#0" expanded="true" />
+ <element signature="e#4387#4388#0" expanded="true" />
+ <element signature="e#4432#4433#0" expanded="true" />
+ <element signature="e#4468#4469#0" expanded="true" />
+ <element signature="e#4500#4501#0" expanded="true" />
+ <element signature="e#4530#4531#0" expanded="true" />
+ <element signature="e#4574#4575#0" expanded="true" />
+ <element signature="e#4612#4613#0" expanded="true" />
+ <element signature="e#4648#4649#0" expanded="true" />
+ <element signature="e#4680#4681#0" expanded="true" />
+ <element signature="e#4730#4731#0" expanded="true" />
+ <element signature="e#4772#4773#0" expanded="true" />
+ <element signature="e#4808#4809#0" expanded="true" />
+ <element signature="e#4842#4843#0" expanded="true" />
+ <element signature="e#4894#4895#0" expanded="true" />
+ <element signature="e#4940#4941#0" expanded="true" />
+ <element signature="e#4980#4981#0" expanded="true" />
+ <element signature="e#5016#5017#0" expanded="true" />
+ <element signature="e#5074#5075#0" expanded="true" />
+ <element signature="e#5124#5125#0" expanded="true" />
+ <element signature="e#5159#5160#0" expanded="true" />
+ <element signature="e#5189#5190#0" expanded="true" />
+ <element signature="e#5236#5237#0" expanded="true" />
+ <element signature="e#5274#5275#0" expanded="true" />
+ <element signature="e#5309#5310#0" expanded="true" />
+ <element signature="e#5340#5341#0" expanded="true" />
+ <element signature="e#5388#5389#0" expanded="true" />
+ <element signature="e#5428#5429#0" expanded="true" />
+ <element signature="e#5463#5464#0" expanded="true" />
+ <element signature="e#5494#5495#0" expanded="true" />
+ <element signature="e#5542#5543#0" expanded="true" />
+ <element signature="e#5582#5583#0" expanded="true" />
+ <element signature="e#5617#5618#0" expanded="true" />
+ <element signature="e#5648#5649#0" expanded="true" />
+ <element signature="e#5696#5697#0" expanded="true" />
+ <element signature="e#5736#5737#0" expanded="true" />
+ <element signature="e#5771#5772#0" expanded="true" />
+ <element signature="e#5802#5803#0" expanded="true" />
+ <element signature="e#5850#5851#0" expanded="true" />
+ <element signature="e#5890#5891#0" expanded="true" />
+ <element signature="e#5925#5926#0" expanded="true" />
+ <element signature="e#5956#5957#0" expanded="true" />
+ <element signature="e#6004#6005#0" expanded="true" />
+ <element signature="e#6044#6045#0" expanded="true" />
+ <element signature="e#6079#6080#0" expanded="true" />
+ <element signature="e#6110#6111#0" expanded="true" />
+ <element signature="e#6158#6159#0" expanded="true" />
+ <element signature="e#6198#6199#0" expanded="true" />
+ <element signature="e#6233#6234#0" expanded="true" />
+ <element signature="e#6264#6265#0" expanded="true" />
+ <element signature="e#6312#6313#0" expanded="true" />
+ <element signature="e#6352#6353#0" expanded="true" />
+ <element signature="e#6387#6388#0" expanded="true" />
+ <element signature="e#6418#6419#0" expanded="true" />
+ <element signature="e#6466#6467#0" expanded="true" />
+ <element signature="e#6506#6507#0" expanded="true" />
+ <element signature="e#6545#6546#0" expanded="true" />
+ <element signature="e#6580#6581#0" expanded="true" />
+ <element signature="e#6636#6637#0" expanded="true" />
+ <element signature="e#6684#6685#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="292">
+ <caret line="63" selection-start-line="63" selection-end-line="63" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="56" selection-start-line="56" selection-end-line="56" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="194">
+ <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1460">
+ <caret line="128" column="18" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="436">
+ <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="385">
+ <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="125">
+ <caret line="5" column="61" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="200">
+ <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="268">
+ <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="200">
+ <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="350">
+ <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="358">
+ <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ArtifactsStructureConfigurable.UI">
+ <settings>
+ <artifact-editor />
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="FacetStructureConfigurable.UI">
+ <settings>
+ <last-edited>Spring</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="GlobalLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="JdkListConfigurable.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ModuleStructureConfigurable.UI">
+ <settings>
+ <last-edited>WMSV1</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ <option value="0.6" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectLibrariesConfigurable.UI">
+ <settings>
+ <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java b/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
index c05a170..654975b 100644
--- a/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
@@ -1,23 +1,47 @@
package com.huaheng.pc.config.zoneCapacity.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
import com.huaheng.pc.config.zoneCapacity.mapper.ZoneCapacityMapper;
+import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.general.material.service.MaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class ZoneCapacityServiceImpl extends ServiceImpl<ZoneCapacityMapper, ZoneCapacity> implements ZoneCapacityService {
+ @Autowired
+ private MaterialService materialService;
+
+ //添加库区容量时，查找到该物料的具体信息，一并加入到库区容量中
@Override
public AjaxResult insertModel(ZoneCapacity zoneCapacity) {
+ zoneCapacity.setWarehouseCode(ShiroUtils.getWarehouseCode());
zoneCapacity.setCreatedBy(ShiroUtils.getLoginName());
zoneCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
if(StringUtils.isEmpty(zoneCapacity.getMaterialCode())){
return AjaxResult.error("没有输入物料编码");
}
+ //查找该物料信息
+ LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(StringUtils.isNotEmpty(zoneCapacity.getMaterialCode()),Material::getCode, zoneCapacity.getMaterialCode())
+ .eq(StringUtils.isNotEmpty(zoneCapacity.getWarehouseCode()),Material::getWarehouseCode, zoneCapacity.getWarehouseCode());
+ Material material=materialService.getOne(lambdaQueryWrapper);
+ if(material==null){
+ return AjaxResult.error("系统没有该物料");
+ }
+ zoneCapacity.setMaterialName(material.getName());
+ zoneCapacity.setMaterialSpec(material.getSpec());
+ zoneCapacity.setMaterialUnit(material.getUnit());
+ if(!this.save(zoneCapacity)){
+ return AjaxResult.error("新增库区容量失败");
+ }
return AjaxResult.success("新增库区容量成功");
}
}