wms / wms2_xinyi · Commits

Commit d9319430ac11df1ef1d76ad77a1629bf8d421ae0

Authored by wangyanxiong
1 parent 34ed17de

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop 

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 14 changed files with 132 additions and 280 deletions
.idea/workspace.xml
  View file @d931943
... ... @@ -2,228 +2,20 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 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" />
  5 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java" afterDir="false" />
220 6 <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" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" afterDir="false" />
  8 + <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" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" />
227 19 </list>
228 20 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
229 21 <option name="SHOW_DIALOG" value="false" />
... ... @@ -282,8 +74,8 @@
282 74 <file pinned="false" current-in-tab="true">
283 75 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html">
284 76 <provider selected="true" editor-type-id="text-editor">
285   - <state relative-caret-position="190">
286   - <caret line="70" column="38" lean-forward="true" selection-start-line="70" selection-start-column="38" selection-end-line="70" selection-end-column="38" />
  77 + <state relative-caret-position="171">
  78 + <caret line="69" column="65" lean-forward="true" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" />
287 79 </state>
288 80 </provider>
289 81 </entry>
... ... @@ -326,6 +118,11 @@
326 118 </set>
327 119 </option>
328 120 </component>
  121 + <component name="ProjectFrameBounds" extendedState="6">
  122 + <option name="x" value="470" />
  123 + <option name="width" value="980" />
  124 + <option name="height" value="1030" />
  125 + </component>
329 126 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
330 127 <component name="ProjectLevelVcsManager">
331 128 <ConfirmationsSetting value="2" id="Add" />
... ... @@ -588,14 +385,22 @@
588 385 <option name="project" value="LOCAL" />
589 386 <updated>1565259481656</updated>
590 387 </task>
591   - <option name="localTasksCounter" value="4" />
  388 + <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
  389 + <created>1565342188814</created>
  390 + <option name="number" value="00004" />
  391 + <option name="presentableId" value="LOCAL-00004" />
  392 + <option name="project" value="LOCAL" />
  393 + <updated>1565342188814</updated>
  394 + </task>
  395 + <option name="localTasksCounter" value="5" />
592 396 <servers />
593 397 </component>
594 398 <component name="TimeTrackingManager">
595   - <option name="totallyTimeSpent" value="196000" />
  399 + <option name="totallyTimeSpent" value="893000" />
596 400 </component>
597 401 <component name="ToolWindowManager">
598 402 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  403 + <editor active="true" />
599 404 <layout>
600 405 <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2533512" />
601 406 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
... ... @@ -672,6 +477,7 @@
672 477 <MESSAGE value="添加库位、库位类型增删改查接口" />
673 478 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
674 479 <MESSAGE value="修改库区service" />
675   - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
  480 + <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
  481 + <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
676 482 </component>
677 483 </project>
678 484 \ No newline at end of file
... ...
src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java 0 → 100644
  View file @d931943
  1 +package com.huaheng.framework.config;
  2 +
  3 +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
  4 +import org.springframework.context.annotation.Bean;
  5 +import org.springframework.context.annotation.Configuration;
  6 +import org.springframework.transaction.annotation.EnableTransactionManagement;
  7 +
  8 +@EnableTransactionManagement
  9 +@Configuration
  10 +public class MybatisPlusConfig {
  11 +
  12 + /**
  13 + * 分页插件
  14 + */
  15 + @Bean
  16 + public PaginationInterceptor paginationInterceptor() {
  17 + PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
  18 + // paginationInterceptor.setLimit(你的最大单页限制数量，默认 500 条，小于 0 如 -1 不受限制);
  19 + return paginationInterceptor;
  20 + }
  21 +}
... ...
src/main/java/com/huaheng/framework/web/controller/BaseController.java
  View file @d931943
... ... @@ -176,4 +176,16 @@ public class BaseController
176 176 {
177 177 return getUser().getLoginName();
178 178 }
  179 +
  180 + /**
  181 + * mybatis-plus响应请求分页数据
  182 + */
  183 + @SuppressWarnings({ "rawtypes", "unchecked" })
  184 + protected TableDataInfo getMpDataTable(List<?> list, Long total) {
  185 + TableDataInfo rspData = new TableDataInfo();
  186 + rspData.setCode(200);
  187 + rspData.setData(list);
  188 + rspData.setTotal(total);
  189 + return rspData;
  190 + }
179 191 }
... ...
src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
  View file @d931943
1 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 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 6 import com.huaheng.common.utils.StringUtils;
5 7 import com.huaheng.common.utils.security.ShiroUtils;
6 8 import com.huaheng.framework.web.domain.AjaxResult;
7 9 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
8 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 14 import org.springframework.stereotype.Service;
10 15  
11 16 @Service
12 17 public class ZoneCapacityServiceImpl extends ServiceImpl<ZoneCapacityMapper, ZoneCapacity> implements ZoneCapacityService {
  18 + @Autowired
  19 + private MaterialService materialService;
  20 +
  21 + //添加库区容量时，查找到该物料的具体信息，一并加入到库区容量中
13 22 @Override
14 23 public AjaxResult insertModel(ZoneCapacity zoneCapacity) {
  24 + zoneCapacity.setWarehouseCode(ShiroUtils.getWarehouseCode());
15 25 zoneCapacity.setCreatedBy(ShiroUtils.getLoginName());
16 26 zoneCapacity.setLastUpdatedBy(ShiroUtils.getLoginName());
17 27 if(StringUtils.isEmpty(zoneCapacity.getMaterialCode())){
18 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 45 return AjaxResult.success("新增库区容量成功");
22 46 }
23 47 }
... ...
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
  View file @d931943
... ... @@ -70,7 +70,7 @@ public class CompanyController extends BaseController {
70 70 */
71 71 Page<Company> page = new Page<>(pageNum, pageSize);
72 72 IPage<Company> iPage = companyService.page(page, lambdaQueryWrapper);
73   - return getDataTable(iPage.getRecords());
  73 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
74 74 } else {
75 75 List<Company> list = companyService.list(lambdaQueryWrapper);
76 76 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java
  View file @d931943
... ... @@ -76,7 +76,7 @@ public class ContainerController extends BaseController {
76 76 /*使用分页查询*/
77 77 Page<Container> page = new Page<>(pageNum, pageSize);
78 78 IPage<Container> iPage = containerService.page(page, lambdaQueryWrapper);
79   - return getDataTable(iPage.getRecords());
  79 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
80 80 } else {
81 81 List<Container> list = containerService.list(lambdaQueryWrapper);
82 82 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java
  View file @d931943
... ... @@ -75,7 +75,7 @@ public class CustomerController extends BaseController {
75 75 /*使用分页查询*/
76 76 Page<Customer> page = new Page<>(pageNum, pageSize);
77 77 IPage<Customer> iPage = customerService.page(page, lambdaQueryWrapper);
78   - return getDataTable(iPage.getRecords());
  78 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
79 79 } else {
80 80 List<Customer> list = customerService.list(lambdaQueryWrapper);
81 81 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/location/controller/LocationController.java
  View file @d931943
... ... @@ -66,7 +66,7 @@ public class LocationController extends BaseController {
66 66 .eq(StringUtils.isNotEmpty(location.getCode()), Location::getCode, location.getCode())
67 67 .eq(StringUtils.isNotEmpty(location.getName()), Location::getName,location.getName())
68 68 .eq(StringUtils.isNotEmpty(location.getContainerCode()), Location::getContainerCode, location.getContainerCode())
69   - .eq(StringUtils.isNotNull(location.getEnable()), Location::getEnable, location.getEnable())
  69 + .eq(StringUtils.isNotNull(location.getSystemCreated()), Location::getStatus, location.getStatus())
70 70 .eq(StringUtils.isNotEmpty(location.getZoneCode()), Location::getZoneCode, location.getZoneCode())
71 71 .eq(StringUtils.isNotNull(location.getIRow()), Location::getIRow, location.getIRow())
72 72 .eq(StringUtils.isNotNull(location.getIColumn()), Location::getIColumn, location.getIColumn())
... ... @@ -80,7 +80,7 @@ public class LocationController extends BaseController {
80 80 /*使用分页查询*/
81 81 Page<Location> page = new Page<>(pageNum, pageSize);
82 82 IPage<Location> iPage = locationService.page(page, lambdaQueryWrapper);
83   - return getDataTable(iPage.getRecords());
  83 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
84 84 } else {
85 85 List<Location> list = locationService.list(lambdaQueryWrapper);
86 86 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/location/domain/Location.java
  View file @d931943
... ... @@ -80,8 +80,8 @@ public class Location implements Serializable {
80 80 /**
81 81 * 状态
82 82 */
83   - @TableField(value = "enable")
84   - private Integer enable;
  83 + @TableField(value = "status")
  84 + private Integer status;
85 85  
86 86 /**
87 87 * 上次盘点日期
... ...
src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java
  View file @d931943
... ... @@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
20 20 import com.huaheng.pc.general.location.domain.Location;
21 21 import com.huaheng.pc.general.location.mapper.LocationMapper;
22 22 import com.huaheng.pc.general.location.service.LocationService;
23   -@Service
  23 +@Service("LocationService")
24 24 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService{
25 25  
26 26 @Resource
... ... @@ -65,17 +65,19 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
65 65 param.setIGrid(m);
66 66 param.setZoneCode(location.getZoneCode());
67 67 param.setLocationType(location.getLocationType());
68   - param.setEnable(location.getEnable());
69   -
70   -
  68 + param.setStatus(location.getStatus());
  69 + param.setWarehouseCode(ShiroUtils.getWarehouseCode());
  70 + param.setCreatedBy(ShiroUtils.getLoginName());
  71 + param.setLastUpdatedBy(ShiroUtils.getLoginName());
71 72 String code = MessageFormat.format("{0}{1}-{2}-{3}-{4}",
72 73 location.getLocationType(),
73   - String.format("%02d", location.getIRow()),
74   - String.format("%02d", location.getIColumn()),
75   - String.format("%02d", location.getILayer()),
76   - String.format("%02d", location.getIGrid()));
  74 + String.format("%02d", i),
  75 + String.format("%02d", j),
  76 + String.format("%02d", k),
  77 + String.format("%02d", m));
77 78 QueryWrapper<Location> queryWrapper = new QueryWrapper<>();
78   - if (locationService.list(queryWrapper.eq("code", code)) != null){
  79 + List<Location> locationList = locationService.list(queryWrapper.eq("code", code));
  80 + if (locationList.size() != 0){
79 81 return true;
80 82 } else {
81 83 param.setCode(code);
... ... @@ -89,7 +91,7 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
89 91 }
90 92 }
91 93 }
92   -
93   - return locationService.saveBatch(locations);
  94 + Boolean result = locationService.saveBatch(locations);
  95 + return result;
94 96 }
95 97 }
... ...
src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java
  View file @d931943
... ... @@ -75,7 +75,7 @@ public class SupplierController extends BaseController {
75 75 /*使用分页查询*/
76 76 Page<Supplier> page = new Page<>(pageNum, pageSize);
77 77 IPage<Supplier> iPage = supplierService.page(page, lambdaQueryWrapper);
78   - return getDataTable(iPage.getRecords());
  78 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
79 79 } else {
80 80 List<Supplier> list = supplierService.list(lambdaQueryWrapper);
81 81 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
  View file @d931943
... ... @@ -76,7 +76,7 @@ public class WareHouseController extends BaseController {
76 76 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
77 77 Page<Warehouse> page = new Page<>(pageNum, pageSize);
78 78 IPage<Warehouse> iPage = warehouseService.page(page, lambdaQueryWrapper);
79   - return getDataTable(iPage.getRecords());
  79 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
80 80 } else {
81 81 List<Warehouse> list = warehouseService.list(lambdaQueryWrapper);
82 82 return getDataTable(list);
... ...
src/main/resources/templates/general/location/addBatch.html
  View file @d931943
... ... @@ -8,32 +8,32 @@
8 8 <div class="form-group">
9 9 <label class="col-sm-3 control-label">最后行：</label>
10 10 <div class="col-sm-8">
11   - <input id="row" name="row" class="form-control" type="text">
  11 + <input id="iRow" name="iRow" class="form-control" type="text">
12 12 </div>
13 13 </div>
14 14 <div class="form-group">
15 15 <label class="col-sm-3 control-label">最后列：</label>
16 16 <div class="col-sm-8">
17   - <input id="line" name="line" class="form-control" type="text">
  17 + <input id="iColumn" name="iColumn" class="form-control" type="text">
18 18 </div>
19 19 </div>
20 20 <div class="form-group">
21 21 <label class="col-sm-3 control-label">最后层：</label>
22 22 <div class="col-sm-8">
23   - <input id="layer" name="layer" class="form-control" type="text">
  23 + <input id="iLayer" name="iLayer" class="form-control" type="text">
24 24 </div>
25 25 </div>
26 26 <div class="form-group">
27 27 <label class="col-sm-3 control-label">最后格：</label>
28 28 <div class="col-sm-8">
29   - <input id="grid" name="grid" class="form-control" type="text">
  29 + <input id="iGrid" name="iGrid" class="form-control" type="text">
30 30 </div>
31 31 </div>
32 32 <div class="form-group">
33 33 <label class="col-sm-3 control-label">库位类型：</label>
34 34 <div class="col-sm-8">
35   - <select id="type" class="form-control" th:with="locationType=${@locationType.getLocationPrefix()}">
36   - <option th:each="item : ${locationType}" th:text="${item['name']}" th:value="${item['prefix']}"></option>
  35 + <select id="locationType" class="form-control" th:with="locationType=${@locationType.getLocationPrefix()}">
  36 + <option th:each="item : ${locationType}" th:text="${item['name']}" th:value="${item['code']}"></option>
37 37 </select>
38 38 </div>
39 39 </div>
... ... @@ -46,15 +46,11 @@
46 46 </div>
47 47 </div>
48 48 <div class="form-group">
49   - <label class="col-sm-3 control-label">是否有效：</label>
  49 + <label class="col-sm-3 control-label">库位状态：</label>
50 50 <div class="col-sm-8">
51   - <div class="onoffswitch">
52   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
53   - <label class="onoffswitch-label" for="enable">
54   - <span class="onoffswitch-inner"></span>
55   - <span class="onoffswitch-switch"></span>
56   - </label>
57   - </div>
  51 + <select id="status" name="status" class="form-control" th:with="statusList=${@dict.getType('locationStatus')}">
  52 + <option th:each="item : ${statusList}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
  53 + </select>
58 54 </div>
59 55 </div>
60 56 <div class="form-group">
... ... @@ -93,13 +89,11 @@
93 89 type : "POST",
94 90 url : prefix + "/addBatchSave",
95 91 data : {
96   - "row": $("input[name='row']").val(),
97   - "line": $("input[name='line']").val(),
98   - "layer": $("input[name='layer']").val(),
99   - "grid": $("input[name='grid']").val(),
100   - "roadway": $("input[name='roadway']").val(),
101   - "type": $("#type option:selected").val(),
102   - "zoneId":$("#zone option:selected").val(),
  92 + "iRow": $("input[name='iRow']").val(),
  93 + "iColumn": $("input[name='iColumn']").val(),
  94 + "iLayer": $("input[name='iLayer']").val(),
  95 + "iGrid": $("input[name='iGrid']").val(),
  96 + "locationType": $("#locationType option:selected").val(),
103 97 "zoneCode": $("#zone option:selected").attr("code"),
104 98 "enable" : $("input[name='enable']").is(':checked'),
105 99 },
... ...
src/main/resources/templates/general/location/location.html
  View file @d931943
... ... @@ -116,24 +116,25 @@
116 116 visible : false
117 117 },
118 118 {
119   - field : 'iRow',
  119 + field : 'irow',
120 120 title : '行'
121 121 },
122 122 {
123   - field : 'iColumn',
  123 + field : 'icolumn',
124 124 title : '列'
125 125 },
126 126 {
127   - field : 'iLayer',
  127 + field : 'ilayer',
128 128 title : '层'
129 129 },
130 130 {
131   - field : 'iGrid',
  131 + field : 'igrid',
132 132 title : '格'
133 133 },
134 134 {
135 135 field : 'name',
136   - title : '名称'
  136 + title : '名称',
  137 + visible : 'false'
137 138 },
138 139 {
139 140 field : 'locationType',
... ... @@ -190,14 +191,6 @@
190 191 field : 'lastUpdatedBy',
191 192 title : '更新用户'
192 193 },
193   - {
194   - field : 'enable',
195   - title : '是否有效' ,
196   - align: 'center',
197   - formatter: function(value, row, index) {
198   - return $.table.selectDictLabel(datas, value);
199   - }
200   - },
201 194 // {
202 195 // field : 'deleted',
203 196 // title : '是否删除'
... ...