xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wanghaodong

Browse Source
master
xiaoning 2 years ago
parent f5d9015c11
commit 1f8dc3f0b4
23 changed files with 1915 additions and 324 deletions
Show Stats Download Patch File Download Diff File

330
.idea/workspace.xml
Unescape View File

@ -5,10 +5,199 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelSYListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmQfxqMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@ -31,47 +220,84 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RESET_MODE" value="KEEP" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2VTh8L8FuI3m4hrNyj7pp34alDh" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="TODO_SCOPE" value="All Places" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="application.passwordSafe" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "E:/runpeng/gjerp_ui",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"spring.configuration.checksum": "e66d70b2c05a7b57c5785db699821511",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\dao\sy" />
<recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\bean\request" />
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\sy" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk\impl" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk" />
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\jhgk" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\mapper\jhgk" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com.dsic.gj_erp.bean.jhgk" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.dsic.gj_erp.service.jhgk" />
<recent name="com.dsic.gj_erp.service.jhgk.impl" />
<recent name="com.dsic.gj_erp.mapper.jhgk" />
<recent name="com.dsic.gj_erp.controller.jhgk" />
<recent name="com.dsic.gj_erp.bean.jhgk" />
<recent name="com.dsic.gj_erp.dao.jhgk" />
<recent name="com.dsic.gj_erp.dao.jcsj" />
<recent name="com.dsic.gj_erp.common" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.GjErpApplication">
<configuration name="DmSygdController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdController" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.controller.jhgk.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsigj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsigj_erp.service.jhgk.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.Test" />
<module name="gj_erp" />
@ -85,6 +311,19 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.service.jhgk.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GjErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="gj_erp" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsic.gj_erp.GjErpApplication" />
@ -92,6 +331,13 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdController" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
@ -126,6 +372,22 @@
<workItem from="1695351043840" duration="2412000" />
<workItem from="1695353513521" duration="2941000" />
<workItem from="1695383415111" duration="2165000" />
<workItem from="1695802200024" duration="1611000" />
<workItem from="1695870308694" duration="2922000" />
<workItem from="1696475736363" duration="677000" />
<workItem from="1696594298875" duration="6495000" />
<workItem from="1696639837317" duration="12226000" />
<workItem from="1696679003360" duration="1876000" />
<workItem from="1696734164061" duration="6012000" />
<workItem from="1696766214791" duration="851000" />
<workItem from="1696810883365" duration="19166000" />
<workItem from="1696854193468" duration="4998000" />
<workItem from="1696896554070" duration="5484000" />
<workItem from="1696986013167" duration="18352000" />
<workItem from="1697024673176" duration="3734000" />
<workItem from="1697073780884" duration="20100000" />
<workItem from="1697112185533" duration="1226000" />
<workItem from="1697163262383" duration="2146000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -213,7 +475,6 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="finish" />
@ -227,13 +488,10 @@
<option name="LAST_COMMIT_MESSAGE" value="111&#10;&#10;This reverts commit f64a4dcb" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" type="java-exception">
<properties class="java.lang.StackOverflowError" package="java.lang" />
<option name="timeStamp" value="6" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
<configuration name="SpringBootApplicationConfigurationType">
<watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" />
</configuration>
</watches-manager>
</component>
</project>

73
src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java
Unescape View File

@ -0,0 +1,73 @@
package com.dsic.gj_erp.bean.jhgk;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author xn
* @since 2023-09-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmQfxq对象", description="")
public class DmQfxq implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "船名")
@TableField("DC_CH")
private String dcCh;
@ApiModelProperty(value = "批量")
@TableField("DC_PL")
private String dcPl;
@ApiModelProperty(value = "分段")
@TableField("DC_FD")
private String dcFd;
@ApiModelProperty(value = "配送场地")
private String pscd;
@ApiModelProperty(value = "车间主管")
private String cjzg;
@ApiModelProperty(value = "大板")
private String db;
@ApiModelProperty(value = "型材")
private String xc;
@ApiModelProperty(value = "T型材")
private String txc;
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "状态")
private String zt;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
@ApiModelProperty(value = "编制人员")
private String bzry;
@ApiModelProperty(value = "编制日期")
private String bzrq;
@ApiModelProperty(value = "审核人员")
private String shry;
@ApiModelProperty(value = "审核日期")
private String shrq;
}

269
src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java
Unescape View File

@ -1,6 +1,7 @@
package com.dsic.gj_erp.bean.jhgk;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -8,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.List;
/**
* <p>
@ -15,7 +17,7 @@ import java.io.Serializable;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -24,122 +26,235 @@ public class DmSygd implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "产品")
private String dcCh1;
@ApiModelProperty(value = "船号")
@TableField("DC_CH")
private String dcCh;
@ApiModelProperty(value = "目标船只")
private String dcCh2;
@ApiModelProperty(value = "本船只")
private String dcCh3;
@ApiModelProperty(value = "分段号")
@TableField("DC_FD")
private String dcFd;
@ApiModelProperty(value = "批量")
@ApiModelProperty(value = "批量号")
@TableField("DC_PL")
private String dcPl;
@ApiModelProperty(value = "分段")
private String dcFd;
@ApiModelProperty(value = "钢加大组结束")
private String gjjsDz;
@ApiModelProperty(value = "钢加小组结束")
private String gjjsXz;
@ApiModelProperty(value = "钢加开始")
private String gjks;
@ApiModelProperty(value = "套料图接收")
private String jsqTlt;
@ApiModelProperty(value = "板材领取表接收")
private String jsqLqb;
@ApiModelProperty(value = "订货清单号")
private String dhqd;
@ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
private String gdZt="0";
@ApiModelProperty(value = "订货板数")
private Double orderBs;
@ApiModelProperty(value = "板数")
private Double bs;
@ApiModelProperty(value = "到货板数")
private Double arrivalBs;
@ApiModelProperty(value = "到货数量")
private Double dhsl;
@ApiModelProperty(value = "套料图板数")
private int tltSl;
@ApiModelProperty(value = "在途数量")
private Double ztsl;
@ApiModelProperty(value = "上料张数")
private int slSl;
@ApiModelProperty(value = "生产下发期")
private String scxfq;
@ApiModelProperty(value = "上料时间")
private String slSj;
@ApiModelProperty(value = "抛丸数量")
private int pwSl;
@ApiModelProperty(value = "抛丸时间")
private String pwSj;
@ApiModelProperty(value = "型材抛丸")
private String xcpw;
private Double xcpwSl;
@ApiModelProperty(value = "型材抛丸时间")
private String xcpwSj;
@ApiModelProperty(value = "1跨平直大板（大组）")
private int n1ad;
@ApiModelProperty(value = "加工时间")
private String n1adSj;
@ApiModelProperty(value = "1跨平直大板（小组）")
private int n1ax;
@ApiModelProperty(value = "加工时间")
private String n1axSj;
@ApiModelProperty(value = "1跨进线板（大组）")
private int n1ld;
@ApiModelProperty(value = "加工时间")
private String n1ldSj;
@ApiModelProperty(value = "2跨超长超宽板（大组）")
private int n2bd;
@ApiModelProperty(value = "根数")
private Double gs;
@ApiModelProperty(value = "加工时间")
private String n2bdSj;
@ApiModelProperty(value = "抛丸")
private String pw;
@ApiModelProperty(value = "2跨超长超宽板（小组）")
private int n2bx;
@ApiModelProperty(value = "坡口切割结束")
private String pkjs1;
@ApiModelProperty(value = "加工时间")
private String n2bxSj;
@ApiModelProperty(value = "二垮数控板数")
private Double skbs1;
@ApiModelProperty(value = "2跨超长超宽曲板（小组）")
private int n2cx;
@ApiModelProperty(value = "数控切割开始")
private String skks1;
@ApiModelProperty(value = "加工时间")
private String n2cxSj;
@ApiModelProperty(value = "坡口长度")
private Double pkcd1;
@ApiModelProperty(value = "2跨超长超宽曲板（大组）")
private int n2cd;
@ApiModelProperty(value = "坡口切割结束")
private String pkjs2;
@ApiModelProperty(value = "加工时间")
private String n2cdSj;
@ApiModelProperty(value = "三垮数控板数")
private Double skbs2;
@ApiModelProperty(value = "2跨T型材腹板（小组）")
private int n2tx;
@ApiModelProperty(value = "数控切割开始")
private String skks2;
@ApiModelProperty(value = "加工时间")
private String n2txSj;
@ApiModelProperty(value = "坡口长度")
private Double pkcd2;
@ApiModelProperty(value = "2跨T型材腹板（大组）")
private int n2td;
@ApiModelProperty(value = "坡口切割结束")
private String pkjs3;
@ApiModelProperty(value = "加工时间")
private String n2tdSj;
@ApiModelProperty(value = "三垮平铁板数")
private Double ptbs;
@ApiModelProperty(value = "2跨激光切割板（小组）")
private int n2jx;
@ApiModelProperty(value = "平铁切割开始")
private String ptks;
@ApiModelProperty(value = "加工时间")
private String n2jxSj;
@ApiModelProperty(value = "平铁切割结束")
private String ptjs;
@ApiModelProperty(value = "2跨激光切割板（大组）")
private int n2jd;
@ApiModelProperty(value = "曲平铁转结束")
private String qptzjs;
@ApiModelProperty(value = "加工时间")
private String n2jdSj;
@ApiModelProperty(value = "曲平铁结束")
private String qptjs;
@ApiModelProperty(value = "3跨曲板（小组）")
private int n3cx;
@ApiModelProperty(value = "曲外板结束")
private String qwbjs;
@ApiModelProperty(value = "加工时间")
private String n3cxSj;
@ApiModelProperty(value = "组立")
private String zl;
@ApiModelProperty(value = "3跨曲板（大组）")
private int n3cd;
@ApiModelProperty(value = "数控 板数")
private Double skbs3;
@ApiModelProperty(value = "加工时间")
private String n3cdSj;
@ApiModelProperty(value = "数控切割开始")
private String skks3;
@ApiModelProperty(value = "3跨厚板（小组）")
private int n3hx;
@ApiModelProperty(value = "坡口长度")
private Double pkcd3;
@ApiModelProperty(value = "加工时间")
private String n3hxSj;
@ApiModelProperty(value = "坡口切割结束")
private String pkjs4;
@ApiModelProperty(value = "3跨厚板（大组）")
private int n3hd;
@ApiModelProperty(value = "面板挤边")
private String mbjb;
@ApiModelProperty(value = "加工时间")
private String n3hdSj;
@ApiModelProperty(value = "七垮型材米数")
private Double xcms;
@ApiModelProperty(value = "4跨普通板（小组）")
private int n4px;
@ApiModelProperty(value = "型材面板")
private String xcmb;
@ApiModelProperty(value = "加工时间")
private String n4pxSj;
@ApiModelProperty(value = "分段需求")
private String fdxqq;
@ApiModelProperty(value = "4跨普通板（大组）")
private int n4pd;
@ApiModelProperty(value = "光电 结束")
private String gdjs;
@ApiModelProperty(value = "加工时间")
private String n4pdSj;
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "4跨普通板（机器人）")
private int n4xx;
@ApiModelProperty(value = "加工时间")
private String n4xxSj;
@ApiModelProperty(value = "光电")
private int n8gx;
@ApiModelProperty(value = "加工时间")
private String n8gxSj;
@ApiModelProperty(value = "7跨型板（小组）")
private Double x7xx;
@ApiModelProperty(value = "加工时间")
private String x7xxSj;
@ApiModelProperty(value = "7跨型板（大组）")
private Double x7xd;
@ApiModelProperty(value = "加工时间")
private String x7xdSj;
@ApiModelProperty(value = "2跨T型材面板（小组）")
private int s2tx;
@ApiModelProperty(value = "加工时间")
private String s2txSj;
@ApiModelProperty(value = "2跨T型材面板（大组）")
private int s2td;
@ApiModelProperty(value = "加工时间")
private String s2tdSj;
@ApiModelProperty(value = "3跨平铁（小组）")
private int s3px;
@ApiModelProperty(value = "加工时间")
private String s3pxSj;
@ApiModelProperty(value = "3跨平铁（大组）")
private int s3pd;
@ApiModelProperty(value = "加工时间")
private String s3pdSj;
@ApiModelProperty(value = "3跨平铁（机器人）")
private int s3xx;
@ApiModelProperty(value = "加工时间")
private String s3xxSj;
@ApiModelProperty(value = "计划大组完成时间")
private String jhwgDz;
@ApiModelProperty(value = "计划小组完成时间")
private String jhwgXz;
@ApiModelProperty(value = "数据来源船")
private String sjlyCh;
@ApiModelProperty(value = "数据更新时间")
private String gxsj;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
@TableField(exist = false)
private List<DmSygdMx> mxList;
}

231
src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
Unescape View File

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
@ -16,7 +17,7 @@ import java.io.Serializable;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -26,188 +27,182 @@ public class DmSygdMx implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "产品")
private String dcCh1;
@ApiModelProperty(value = "目标船只")
private String dcCh2;
private String dcCh;
@ApiModelProperty(value = "本船只")
private String dcCh3;
@ApiModelProperty(value = "数据来源船")
private String dcCh1;
@ApiModelProperty(value = "批量")
private String dcPl;
@ApiModelProperty(value = "分段")
private String dcFd;
@ApiModelProperty(value = "类型")
@ApiModelProperty(value = "领取类型")
@TableField("LQLB")
private String lqlb;
@ApiModelProperty(value = "板数")
private Double bs;
@ApiModelProperty(value = "套料图号")
private String tzbh;
@ApiModelProperty(value = "集团计划期")
private String jtjhq;
@ApiModelProperty(value = "分段需求期")
private String fdxqq;
@ApiModelProperty(value = "规格")
private String wpgg;
@ApiModelProperty(value = "材质")
private String wpxh;
@ApiModelProperty(value = "到货数量")
private Double dhsl;
@ApiModelProperty(value = "在途数量")
private Double ztsl;
@ApiModelProperty(value = "生产下发期")
private String scxfq;
@ApiModelProperty(value = "划线长度(米)")
private BigDecimal hxcd;
@ApiModelProperty(value = "长度（毫米）")
private Double cd;
@ApiModelProperty(value = "切割长度（米）")
private BigDecimal qgcd;
@ApiModelProperty(value = "面积（平方米）")
private Double mj;
@ApiModelProperty(value = "曲标识")
private String qbs;
@ApiModelProperty(value = "抛丸计划完工")
private String jhwgPw;
@ApiModelProperty(value = "坡口类型")
private String pklx;
@ApiModelProperty(value = "施工单位")
@TableField("ZZCJ")
private String zzcj;
@ApiModelProperty(value = "坡口长度")
private Double pkcd;
@ApiModelProperty(value = "理料")
private String llrq;
@ApiModelProperty(value = "零件数量")
private BigDecimal ljsl;
@ApiModelProperty(value = "划线长度(米)")
private Double hxcd;
@ApiModelProperty(value = "组立")
private String zl;
@ApiModelProperty(value = "切割长度（米）")
private Double qgcd;
@ApiModelProperty(value = "加工类型")
private String lx;
@ApiModelProperty(value = "板厚（毫米）")
private Double bh;
@ApiModelProperty(value = "型材米数")
private BigDecimal xcms;
@ApiModelProperty(value = "曲标识")
private String qbs;
@ApiModelProperty(value = "跨位")
private String kw;
@ApiModelProperty(value = "坡口标识")
private String pkbs;
@ApiModelProperty(value = "上料日期")
private String slrq;
@ApiModelProperty(value = "打磨标识")
private String dmbs;
@ApiModelProperty(value = "上料人员")
private String slry;
@ApiModelProperty(value = "一垮龙门板数")
private Double lm1k;
@ApiModelProperty(value = "抛丸")
private String pw;
@ApiModelProperty(value = "一垮龙门完工")
private String wg1klm;
@ApiModelProperty(value = "抛丸人员")
private String pwry;
@ApiModelProperty(value = "一垮数控板数")
private Double lksk;
@ApiModelProperty(value = "抛丸日期")
private String pwrq;
@ApiModelProperty(value = "一垮数控完工")
private String wgLksk;
@ApiModelProperty(value = "划线设备")
private String hxsb;
@ApiModelProperty(value = "坡口长度")
private Double pkcd;
@ApiModelProperty(value = "划线人员")
private String hxry;
@ApiModelProperty(value = "坡口计划完工")
private String jhwgPk;
@ApiModelProperty(value = "划线日期")
private String hxrq;
@ApiModelProperty(value = "二垮数控板数")
private Double lm2k;
@ApiModelProperty(value = "切割设备")
private String qgsb;
@ApiModelProperty(value = "二垮数控完工")
private String wg2klm;
@ApiModelProperty(value = "切割人员")
private String qgry;
@ApiModelProperty(value = "坡口长度")
private Double pkcd2;
@ApiModelProperty(value = "切割日期")
private String qgrq;
@ApiModelProperty(value = "坡口计划完工")
private String jhwgPk2;
@ApiModelProperty(value = "打磨长度")
private Double dmcd;
@ApiModelProperty(value = "三垮数控板数")
private Double lm3k;
@ApiModelProperty(value = "打磨设备")
private String dmsb;
@ApiModelProperty(value = "三垮数控完工")
private String wg3klm;
@ApiModelProperty(value = "打磨人员")
private String dmry;
@ApiModelProperty(value = "坡口长度")
private Double pkcd3;
@ApiModelProperty(value = "打磨日期")
private String dmrq;
@ApiModelProperty(value = "坡口计划完工")
private String jhwgPk3;
@ApiModelProperty(value = "坡口设备")
private String pksb;
@ApiModelProperty(value = "三垮平铁板数")
private Double pt3k;
@ApiModelProperty(value = "坡口人员")
private String pkry;
@ApiModelProperty(value = "三垮平铁完工")
private String wg3kpt;
@ApiModelProperty(value = "坡口日期")
private String pkrq;
@ApiModelProperty(value = "零件面积")
private Double ljmj;
@ApiModelProperty(value = "抛丸设备")
private String pwsb;
@ApiModelProperty(value = "分段号")
@TableField("DC_FD")
private String dcFd;
@ApiModelProperty(value = "零件数量")
private Double ljsl;
@ApiModelProperty(value = "钢加大组结束")
private String gjjsDz;
@ApiModelProperty(value = "曲平铁转结束")
private String qptzjs;
@ApiModelProperty(value = "钢加小组结束")
private String gjjsXz;
@ApiModelProperty(value = "曲平铁结束")
private String qptjs;
@ApiModelProperty(value = "套料图接收")
private String jsqTlt;
@ApiModelProperty(value = "曲外板结束")
private String qwbjs;
@ApiModelProperty(value = "领取表接收")
private String jsqLqb;
@ApiModelProperty(value = "组立")
private String zl;
@ApiModelProperty(value = "订货清单号")
private String dhqd;
@ApiModelProperty(value = "数控 板数")
private Double skbs3;
@ApiModelProperty(value = "订货数量")
private Double orderBs;
@ApiModelProperty(value = "数控切割开始")
private String skks3;
@ApiModelProperty(value = "到货数量")
private Double arrivalBs;
@ApiModelProperty(value = "坡口长度")
private Double pkcd4;
@ApiModelProperty(value = "区域")
private String qy;
@ApiModelProperty(value = "坡口切割结束")
private String pkjs4;
@ApiModelProperty(value = "矫正标识")
private String jzbs;
@ApiModelProperty(value = "面板挤边")
private String mbjb;
@ApiModelProperty(value = "矫正设备")
private String jzsb;
@ApiModelProperty(value = "七垮型材米数")
private Double xcms;
@ApiModelProperty(value = "矫正人员")
private String jzry;
@ApiModelProperty(value = "型材面板")
private String xcmb;
@ApiModelProperty(value = "曲加工设备")
private String qjgsb;
@ApiModelProperty(value = "分段需求")
private String fdxq;
@ApiModelProperty(value = "曲加工人员")
private String qjgry;
@ApiModelProperty(value = "光电 结束")
private String gdjs;
@ApiModelProperty(value = "曲加工日期")
private String qjgrq;
@ApiModelProperty(value = "备注")
private String bz;
@ApiModelProperty(value = "本船号")
@TableField("dcCh2")
private String dcCh2;
@ApiModelProperty(value = "状态")
private String zt;
@ApiModelProperty(value = "钢加开始")
private String gjks;
@ApiModelProperty(value = "时间更新时间")
private String gxsj;
@ApiModelProperty(value = "结束时间")
private String jssj;
@ApiModelProperty(value = "矫正日期")
private String jzrq;
@ApiModelProperty(value = "划线空程长度")
private String hxcdCk;
@ApiModelProperty(value = "切割空程长度")
private String qgcdCk;
@ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
private String zt="0";
private String parentId;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
}

75
src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java
Unescape View File

@ -0,0 +1,75 @@
package com.dsic.gj_erp.bean.jhgk.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author xn
* @since 2023-09-18
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmQfxq对象", description="")
public class QfExcel implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "船名")
@ExcelProperty(index = 0)
private String dcCh;
@ApiModelProperty(value = "批量")
@ExcelProperty(index = 1)
private String dcPl;
@ApiModelProperty(value = "分段")
@ExcelProperty(index = 2)
private String dcFd;
@ApiModelProperty(value = "配送场地")
@ExcelProperty(index = 3)
private String pscd;
@ApiModelProperty(value = "车间主管")
@ExcelProperty(index = 4)
private String cjzg;
@ApiModelProperty(value = "大板")
@ExcelProperty(index = 5)
@DateTimeFormat("yyyy/MM/dd")
private String db;
@ApiModelProperty(value = "型材")
@ExcelProperty(index = 6)
@DateTimeFormat("yyyy/MM/dd")
private String xc;
@ApiModelProperty(value = "T型材")
@ExcelProperty(index = 7)
@DateTimeFormat("yyyy/MM/dd")
private String txc;
@ApiModelProperty(value = "备注")
@ExcelProperty(index = 8)
private String bz;
@ApiModelProperty(value = "状态")
private String zt;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
}

202
src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
Unescape View File

@ -0,0 +1,202 @@
package com.dsic.gj_erp.bean.jhgk.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author xn
* @since 2023-09-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmSygd对象", description="")
public class SyExcel implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "产品")
@ExcelProperty(index = 1)
private String dcCh1;
@ApiModelProperty(value = "目标船只")
@ExcelProperty(index = 2)
private String dcCh2;
@ApiModelProperty(value = "本船只")
@ExcelProperty(index = 3)
private String dcCh3;
@ApiModelProperty(value = "批量")
@ExcelProperty(index = 4)
private String dcPl;
@ApiModelProperty(value = "分段")
@ExcelProperty(index = 5)
private String dcFd;
@ApiModelProperty(value = "板数")
@ExcelProperty(index = 6)
private Double bs;
@ApiModelProperty(value = "到货数量")
@ExcelProperty(index = 7)
private Double dhsl;
@ApiModelProperty(value = "在途数量")
@ExcelProperty(index = 8)
private Double ztsl;
@ApiModelProperty(value = "生产下发期")
@ExcelProperty(index = 9)
@DateTimeFormat("yyyy/MM/dd")
private String scxfq;
@ApiModelProperty(value = "型材抛丸")
@ExcelProperty(index = 10)
private String xcpw;
@ApiModelProperty(value = "根数")
@ExcelProperty(index = 11)
private Double gs;
@ApiModelProperty(value = "抛丸")
@ExcelProperty(index = 12)
private String pw;
@ApiModelProperty(value = "坡口切割结束")
@ExcelProperty(index = 13)
@DateTimeFormat("yyyy/MM/dd")
private String pkjs1;
@ApiModelProperty(value = "二垮数控板数")
@ExcelProperty(index = 14)
private String skbs1;
@ApiModelProperty(value = "数控切割开始")
@ExcelProperty(index = 15)
@DateTimeFormat("yyyy/MM/dd")
private String skks1;
@ApiModelProperty(value = "坡口长度")
@ExcelProperty(index = 16)
private Double pkcd1;
@ApiModelProperty(value = "坡口切割结束")
@ExcelProperty(index = 17)
@DateTimeFormat("yyyy/MM/dd")
private String pkjs2;
@ApiModelProperty(value = "三垮数控板数")
@ExcelProperty(index = 18)
private String skbs2;
@ApiModelProperty(value = "数控切割开始")
@ExcelProperty(index = 19)
@DateTimeFormat("yyyy/MM/dd")
private String skks2;
@ApiModelProperty(value = "坡口长度")
@ExcelProperty(index = 20)
private Double pkcd2;
@ApiModelProperty(value = "坡口切割结束")
@ExcelProperty(index = 21)
@DateTimeFormat("yyyy/MM/dd")
private String pkjs3;
@ApiModelProperty(value = "三垮平铁板数")
@ExcelProperty(index = 22)
private String ptbs;
@ApiModelProperty(value = "平铁切割开始")
@ExcelProperty(index = 23)
@DateTimeFormat("yyyy/MM/dd")
private String ptks;
@ApiModelProperty(value = "平铁切割结束")
@ExcelProperty(index = 24)
@DateTimeFormat("yyyy/MM/dd")
private String ptjs;
@ApiModelProperty(value = "曲平铁转结束")
@ExcelProperty(index = 25)
@DateTimeFormat("yyyy/MM/dd")
private String qptzjs;
@ApiModelProperty(value = "曲平铁结束")
@ExcelProperty(index = 26)
@DateTimeFormat("yyyy/MM/dd")
private String qptjs;
@ApiModelProperty(value = "曲外板结束")
@ExcelProperty(index = 27)
@DateTimeFormat("yyyy/MM/dd")
private String qwbjs;
@ApiModelProperty(value = "组立")
@ExcelProperty(index = 28)
@DateTimeFormat("yyyy/MM/dd")
private String zl;
@ApiModelProperty(value = "数控板数")
@ExcelProperty(index = 29)
private String skbs3;
@ApiModelProperty(value = "数控切割开始")
@ExcelProperty(index = 30)
@DateTimeFormat("yyyy/MM/dd")
private String skks3;
@ApiModelProperty(value = "坡口长度")
@ExcelProperty(index = 31)
private Double pkcd3;
@ApiModelProperty(value = "坡口切割结束")
@ExcelProperty(index = 32)
@DateTimeFormat("yyyy/MM/dd")
private String pkjs4;
@ApiModelProperty(value = "面板挤边")
@ExcelProperty(index = 33)
@DateTimeFormat("yyyy/MM/dd")
private String mbjb;
@ApiModelProperty(value = "七垮型材米数")
@ExcelProperty(index = 34)
private Double xcms;
@ApiModelProperty(value = "型材面板")
@ExcelProperty(index = 35)
private String xcmb;
@ApiModelProperty(value = "分段需求")
@ExcelProperty(index = 36)
@DateTimeFormat("yyyy/MM/dd")
private String fdxqq;
@ApiModelProperty(value = "光电 结束")
@ExcelProperty(index = 37)
@DateTimeFormat("yyyy/MM/dd")
private String gdjs;
@ApiModelProperty(value = "备注")
@ExcelProperty(index = 38)
private String bz;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
}

113
src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
Unescape View File

@ -0,0 +1,113 @@
package com.dsic.gj_erp.controller.jhgk;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelQFListener;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
import com.dsic.gj_erp.service.jhgk.DmQfxqService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author xn
* @since 2023-09-18
*/
@RestController
@RequestMapping("/dmQfxq")
public class DmQfxqController {
@Autowired
DmQfxqService service;
@Autowired
DmCbxxpService cbxxpService;
//查询
@RequestMapping("/getList")
@AuthFunction
public ResultBean getList(@RequestBody DmQfxq qfxq){
List<DmQfxq> list=service.list(new QueryWrapper<DmQfxq>()
.eq(StrUtil.isNotEmpty(qfxq.getDcCh()),"DC_CH",qfxq.getDcCh())
.eq(StrUtil.isNotEmpty(qfxq.getZt()),"zt",qfxq.getZt())
.eq(StrUtil.isNotEmpty(qfxq.getDcPl()),"DC_PL",qfxq.getDcPl()));
return new ResultBean(list);
}
@RequestMapping("/getCzxx")
@AuthFunction
public ResultBean getCzxx(){
List<DmCbxxp> list= cbxxpService.list(new QueryWrapper<DmCbxxp>().select("cbbm","cbmc").orderBy(true, true, "cbbm"));
return new ResultBean(list);
}
//导入
@PostMapping("/upload")
@AuthFunction
@ResponseBody
public ResultBean uploadQf(@RequestParam("file") MultipartFile file , String czbh, HttpServletRequest req) throws Exception, CustomException {
ExcelQFListener objectListener = new ExcelQFListener();
EasyExcel.read(file.getInputStream(), QfExcel.class, objectListener).sheet(0).headRowNumber(1).doRead();
List<QfExcel> objList = objectListener.getObjectList();
service.uploadQf(objList,czbh,req);
return new ResultBean();
}
//保存
@RequestMapping("/save")
@AuthFunction
public ResultBean save(@RequestBody List<DmQfxq> qfxqs){
service.saveBatch(qfxqs);
return new ResultBean();
}
//删除
@RequestMapping("/remove")
@AuthFunction
public ResultBean remove(@RequestBody List<DmQfxq> qfxqs){
service.removeByIds(qfxqs);
return new ResultBean();
}
//提交/退回
@RequestMapping("/qfxqTJ")
@AuthFunction
public ResultBean qfxqTJ(@RequestBody List<DmQfxq> qfxqs){
qfxqs.forEach(q->{
if (q.getZt().equals("0")) {
q.setZt("1");
return;
}
if (q.getZt().equals("1")){
q.setZt("0");
}
});
service.updateBatchById(qfxqs);
return new ResultBean();
}
//审核
@RequestMapping("/qfxqSH")
@AuthFunction
public ResultBean qfxqSH(@RequestBody List<DmQfxq> qfxqs){
qfxqs.forEach(q->{
if (q.getZt().equals("1")) {
q.setZt("2");
}
});
service.updateBatchById(qfxqs);
return new ResultBean();
}
}

21
src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
Unescape View File

@ -1,20 +1,39 @@
package com.dsic.gj_erp.controller.jhgk;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.sy.SYService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@RestController
@RequestMapping("/dmSygd")
public class DmSygdController {
@Resource
DmSygdService service;
}

46
src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
Unescape View File

@ -1,20 +1,64 @@
package com.dsic.gj_erp.controller.jhgk;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.sy.SYService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* 前端控制器
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@RestController
@RequestMapping("/dmSygdMx")
public class DmSygdMxController {
@Autowired
private DmSygdMxService service;
@Resource
SYService syService;
@RequestMapping("/getList")
@AuthFunction
public ResultBean getList(@RequestBody DmSygd sygd){
String[] str=new String[50];
String[] str1=new String[50];
for (int i = 0; i < 50; i++) {
str[i]=syService.f_getpjh("DM", "SYSTEM", "BCHX");
str1[i]=syService.f_getpjh("DM", "SYSTEM", "CLDE");
}
for (String s:str){
System.out.println(s);
}
return new ResultBean();
}
@RequestMapping("/sygdPC")
@AuthFunction
public ResultBean sygdPC(){
return new ResultBean(service.sygdPC());
}
@RequestMapping("/saveByDcch")
@AuthFunction
public ResultBean saveByDcch(@RequestBody HashMap<String, List<Object>> map ){
return new ResultBean(service.saveByDcch(map));
}
}

111
src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java
Unescape View File

@ -0,0 +1,111 @@
package com.dsic.gj_erp.listeners;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.util.ObjConvertUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* Excel通用监听器
*/
public class ExcelQFListener extends AnalysisEventListener<QfExcel> {
private static final int BATCH_COUNT = 5;
List<QfExcel> objectList = new ArrayList<>();
List<Object> headList = new ArrayList<>();
private String sheetName;
List<QfExcel> datas = new ArrayList<QfExcel>();
@Override
public void invoke(QfExcel excelDemo, AnalysisContext analysisContext) {
//每解析一行数据，就会调用该方法一次
//正常在这里调用数据处理得办法
//一条数据添加到暂时存储的存储结构中
boolean b = ObjConvertUtils.checkObjAllFieldsIsNull(excelDemo);
String dcCh = excelDemo.getDcCh();
String dcpl = excelDemo.getDcPl();
String dcfd = excelDemo.getDcFd();
if(!b && StringUtils.isNotBlank(dcCh) && StringUtils.isNotBlank(dcpl) && StringUtils.isNotBlank(dcfd)){
datas.add(excelDemo);
}
// 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
if (datas.size() >= BATCH_COUNT) {
saveData();
// 存储完成清理 list
datas.clear();
}
}
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
//获取sheetName
saveData();
sheetName = context.readSheetHolder().getSheetName();
// LOGGER.info("所有数据解析完成！");
}
//获取表头
@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
//把表头数据加入到存储结构中
headList.add(headMap);
}
/**
* 入库
*/
private void saveData() {
//添加到返回的存储结构中，也可直接存储到数据库
objectList.addAll(datas);
}
public List<QfExcel> getDatas() {
return datas;
}
public void setDatas(List<QfExcel> datas) {
this.datas = datas;
}
public List<QfExcel> getObjectList() {
return objectList;
}
public void setObjectList(List<QfExcel> objectList) {
this.objectList = objectList;
}
public String getSheetName() {
return sheetName;
}
public void setSheetName(String sheetName) {
this.sheetName = sheetName;
}
public List<Object> getHeadList() {
return headList;
}
public void setHeadList(List<Object> headList) {
this.headList = headList;
}
}

107
src/main/java/com/dsic/gj_erp/listeners/ExcelSYListener.java
Unescape View File

@ -0,0 +1,107 @@
package com.dsic.gj_erp.listeners;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import com.dsic.gj_erp.util.ObjConvertUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* Excel通用监听器
*/
public class ExcelSYListener extends AnalysisEventListener<SyExcel> {
private static final int BATCH_COUNT = 5;
List<SyExcel> objectList = new ArrayList<>();
List<Object> headList = new ArrayList<>();
private String sheetName;
List<SyExcel> datas = new ArrayList<SyExcel>();
@Override
public void invoke(SyExcel excelDemo, AnalysisContext analysisContext) {
//每解析一行数据，就会调用该方法一次
//正常在这里调用数据处理得办法
//一条数据添加到暂时存储的存储结构中
boolean b = ObjConvertUtils.checkObjAllFieldsIsNull(excelDemo);
String dcCh = excelDemo.getDcCh1();
String dcpl = excelDemo.getDcPl();
// String dcfd = excelDemo.getDcFd(); && StringUtils.isNotBlank(dcfd)
if(!b && StringUtils.isNotBlank(dcCh) && StringUtils.isNotBlank(dcpl)){
datas.add(excelDemo);
}
// 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
if (datas.size() >= BATCH_COUNT) {
saveData();
// 存储完成清理 list
datas.clear();
}
}
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
//获取sheetName
saveData();
sheetName = context.readSheetHolder().getSheetName();
// LOGGER.info("所有数据解析完成！");
}
//获取表头
@Override
public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
//把表头数据加入到存储结构中
headList.add(headMap);
}
/**
* 入库
*/
private void saveData() {
//添加到返回的存储结构中，也可直接存储到数据库
objectList.addAll(datas);
}
public List<SyExcel> getDatas() {
return datas;
}
public void setDatas(List<SyExcel> datas) {
this.datas = datas;
}
public List<SyExcel> getObjectList() {
return objectList;
}
public void setObjectList(List<SyExcel> objectList) {
this.objectList = objectList;
}
public String getSheetName() {
return sheetName;
}
public void setSheetName(String sheetName) {
this.sheetName = sheetName;
}
public List<Object> getHeadList() {
return headList;
}
public void setHeadList(List<Object> headList) {
this.headList = headList;
}
}

17
src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java
Unescape View File

@ -0,0 +1,17 @@
package com.dsic.gj_erp.mapper.jhgk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
/**
* <p>
* Mapper 接口
* </p>
*
* @author xn
* @since 2023-09-18
*/
public interface DmQfxqMapper extends BaseMapper<DmQfxq> {
}

2
src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.dsic.gj_erp.bean.jhgk.DmSygd;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
public interface DmSygdMapper extends BaseMapper<DmSygd> {

2
src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
public interface DmSygdMxMapper extends BaseMapper<DmSygdMx> {

23
src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java
Unescape View File

@ -0,0 +1,23 @@
package com.dsic.gj_erp.service.jhgk;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务类
* </p>
*
* @author xn
* @since 2023-09-18
*/
public interface DmQfxqService extends IService<DmQfxq> {
Map uploadQf(List<QfExcel> list, String project, HttpServletRequest req);
}

9
src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java
Unescape View File

@ -3,14 +3,19 @@ package com.dsic.gj_erp.service.jhgk;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务类
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
public interface DmSygdMxService extends IService<DmSygdMx> {
public Map sygdPC();
public List<DmSygdMx> saveByDcch(HashMap<String, List<Object>> map);
}

10
src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java
Unescape View File

@ -1,7 +1,13 @@
package com.dsic.gj_erp.service.jhgk;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -9,8 +15,10 @@ import com.dsic.gj_erp.bean.jhgk.DmSygd;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
public interface DmSygdService extends IService<DmSygd> {
public Map getSygds();
}

50
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java
Unescape View File

@ -0,0 +1,50 @@
package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.mapper.jhgk.DmQfxqMapper;
import com.dsic.gj_erp.service.jhgk.DmQfxqService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
* 服务实现类
* </p>
*
* @author xn
* @since 2023-09-18
*/
@Service
public class DmQfxqServiceImpl extends ServiceImpl<DmQfxqMapper, DmQfxq> implements DmQfxqService {
@Override
@Transactional(rollbackFor = Exception.class)
public Map uploadQf(List<QfExcel> list, String project, HttpServletRequest req) {
List<DmQfxq> listForSave=new ArrayList<>();
for (QfExcel q:list) {
this.remove(new QueryWrapper<DmQfxq>()
.eq("DC_CH",q.getDcCh())
.eq("DC_PL",q.getDcPl())
.eq("DC_FD",q.getDcFd()));
DmQfxq a=new DmQfxq();
BeanUtil.copyProperties(q,a);
a.setBzry((String) req.getAttribute("yhms"));
a.setBzrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
listForSave.add(a);
}
this.saveBatch(listForSave);
return null;
}
}

255
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
Unescape View File

@ -1,11 +1,24 @@
package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
@ -13,9 +26,249 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@Service
public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> implements DmSygdMxService {
@Resource
private DmZrcjhMapper zrcjhMapper;
@Resource
private DmBomMapper bomMapper;
@Override
@Transactional
public Map sygdPC(){
//1.接下来3个月的 中日程 数据
// List<DmZrcjh> zrcjhs= zrcjhMapper.selectList(new QueryWrapper<DmZrcjh>()
// .select("DC_CH,DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd")
// .between("gjks",
// "(SELECT CONVERT(varchar(10),DATEADD(m,1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111))",
// "(Select CONVERT(varchar(10), eomonth(GETDATE(),3), 111))")
// .groupBy("DC_CH,DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd")
// );
// if (zrcjhs.size()<1){
// new Exception("中日程中没有未来三个月的数据！");
// }
//todo 应该用结束时间排 or
//测试
List<DmZrcjh> zrcjhs= zrcjhMapper.selectList(new QueryWrapper<DmZrcjh>()
.select("DC_CH,stuff( ( SELECT ' ' + c.DC_FD FROM dm_zrcjh c WHERE c.DC_CH=dm_zrcjh.DC_CH and c.DC_PL=dm_zrcjh.DC_PL FOR xml path ( '' ) ), 1, 1, '' ) AS dcFd," +
"DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd")
.between("gjks",
"2023/08/01",
"2023/08/31")
.groupBy("DC_CH,DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd")
);
//2.用中日程中的 船号 批量 ，在BOM中找明细
List<DmSygdMx> mxList=new ArrayList<>();
List<DmZrcjh> no_tlt=new ArrayList<>();
for (DmZrcjh zrcjh : zrcjhs) {
//②BOM中对应数据是否齐全
List<DmBom> bomList= bomMapper.selectList(new QueryWrapper<DmBom>()
.select("dcch,sjch,pl,tzbh,lqlb,zl,wpgg,wpcz,kw,hxcd,qgcd,\n" +
"pklx,pkcd,qbs,dmcd,ljsl")
.eq("dcch",zrcjh.getDcCh())
.eq("pl",zrcjh.getDcPl().length()<3?"0"+zrcjh.getDcPl():zrcjh.getDcPl())
.eq("cs",3)
.groupBy("dcch,sjch,pl,tzbh,lqlb,zl,wpgg,wpcz,kw,hxcd,qgcd,\n" +
"pklx,pkcd,qbs,dmcd,ljsl")
);
if(bomList.size()<1){
no_tlt.add(zrcjh);
}else {
bomToMx(zrcjh,bomList,mxList,"",zrcjh.getDcCh());
}
}
Map map2= new HashMap();
//根据有无套料图 分组 ，没有套料图的 获取船号list
Map<String,List<DmZrcjh>> map=no_tlt.stream().collect(Collectors.groupingBy(DmZrcjh::getDcCh));
if (map.size()>0){
List<DmSygdMx> no_tlt_ch=new ArrayList<>();
for (String s:map.keySet()){
DmSygdMx m=new DmSygdMx();
m.setDcCh(s);
no_tlt_ch.add(m);
}
//BOM中有套料图的船
List<DmBom> haveTltBoms= bomMapper.selectList(new QueryWrapper<DmBom>()
.select("dcch")
.eq("cs",3)
.groupBy("dcch"));
map2.put("no_tlt",no_tlt);
map2.put("no_tlt_ch",no_tlt_ch);
map2.put("haveTltBoms",haveTltBoms);
}else {
ypc(mxList);
}
//3.给明细排产
//4.明细数据 统计到主表中 数据返回到前端页面
map2.put("mxList",mxList);
return map2;
}
@Override
public List<DmSygdMx> saveByDcch(HashMap<String, List<Object>> map) {
List<DmZrcjh> zrcjhs = BeanUtil.copyToList(map.get("no_tlt"), DmZrcjh.class);
List<DmSygdMx> mxList= BeanUtil.copyToList(map.get("mxList"),DmSygdMx.class);
List<DmSygdMx> no_tlt_ch= BeanUtil.copyToList(map.get("no_tlt_ch"),DmSygdMx.class);
//1.
for (DmZrcjh z:zrcjhs){
for (DmSygdMx mx:no_tlt_ch){
if (z.getDcCh().equals(mx.getDcCh())){
List<DmBom> bomList= bomMapper.selectList(new QueryWrapper<DmBom>()
.select("dcch,sjch,pl,tzbh,lqlb,zl,wpgg,wpcz,kw,hxcd,qgcd,\n" +
"pklx,pkcd,qbs,dmcd,ljsl")
.eq("dcch",mx.getDcCh1())
.eq("pl",z.getDcPl().length()<3?"0"+z.getDcPl():z.getDcPl())
.eq("cs",3)
.groupBy("dcch,sjch,pl,tzbh,lqlb,zl,wpgg,wpcz,kw,hxcd,qgcd,\n" +
"pklx,pkcd,qbs,dmcd,ljsl")
);
if(bomList.size()<1){
DmSygdMx mx1=new DmSygdMx();
zrcToMx(z,mx1);
mxList.add(mx1);
}else {
bomToMx(z,bomList,mxList,mx.getDcCh1(),"");
}
}
}
}
ypc(mxList);
return mxList;
}
public void zrcToMx(DmZrcjh zrcjh, DmSygdMx m){
m.setDcCh(zrcjh.getDcCh());
m.setDcPl(zrcjh.getDcPl());
m.setDcFd(zrcjh.getDcFd());
m.setGjks(zrcjh.getGjks());
m.setGjjsDz(zrcjh.getGjjsDz());
m.setGjjsXz(zrcjh.getGjjsXz());
m.setJsqTlt(zrcjh.getJsqTlt());
m.setJsqLqb(zrcjh.getJsqLqb());
m.setDhqd(zrcjh.getDhqd());
}
public List<DmSygdMx> bomToMx(DmZrcjh zrcjh,List<DmBom> list,List<DmSygdMx> mxList,String mbch,String dcch){
for (DmBom b:list){
DmSygdMx mx=new DmSygdMx();
zrcToMx(zrcjh,mx);
mx.setZl(b.getZl());
mx.setTzbh(b.getTzbh());
mx.setLqlb(b.getLqlb());
mx.setLx(b.getTzbh().substring(4,5).equals("X")?"X":"B");
mx.setWpgg(b.getWpgg());
mx.setWpxh(b.getWpcz());
//型材米数
mx.setLjsl(b.getLjsl());
//区域
// mx.setQy();
mx.setKw(b.getKw());
//上料日期
//上料人员
//矫正标识
//矫正设备
//矫正人员
mx.setPw(b.getPw());
//抛丸设备
//抛丸人员
//抛丸日期
mx.setHxcd(b.getHxcd());
//划线空程
//划线设备
//划线人员
//划线日期
mx.setQgcd(b.getQgcd());
//切割空程
//切割设备
//切割人员
//切割日期
mx.setPklx(b.getPklx());
mx.setPkcd(b.getPkcd());
//坡口设备
//坡口人员
//坡口日期
mx.setQbs(b.getQbs());
//曲加工设备
//曲加工人员
//曲加工日期
mx.setDmcd(b.getDmcd());
//打磨设备
//打磨人员
//打磨日期
mx.setDcCh2(dcch);
mx.setDcCh1(mbch);
mx.setGxsj(DateUtil.now());
//todo
if(b.getZl().equals("1110")){
mx.setJssj(mx.getGjjsDz());
}
if(b.getZl().equals("1010")){
mx.setJssj(mx.getGjjsXz());
}
mxList.add(mx);
}
return mxList;
}
public void ypc(List<DmSygdMx> list){
//排序
list =list.stream().sorted(Comparator.comparing(DmSygdMx::getJssj,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
//上料
list.forEach(l->{
//
});
// 校平
//抛丸
//根据跨位分组
Map<String,List<DmSygdMx>> groupByKw=list.stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getKw()).orElse("0") ));
// 7 1跨平直大板
List<DmSygdMx> k1pz=groupByKw.get("7");
//排产
k1pz.forEach(k->{
//上料 校平 抛丸 理料 划线 切割 坡口 打磨
});
// 8 1跨进线板
List<DmSygdMx> k1jx=groupByKw.get("8");
// 11 2跨T型材腹板
List<DmSygdMx> k2tf=groupByKw.get("11");
// 5 2跨T型材面板
List<DmSygdMx> k2tm=groupByKw.get("5");
// 9 2跨超长超宽板
List<DmSygdMx> k2c=groupByKw.get("9");
// 10 2跨超长超宽曲板
List<DmSygdMx> k2cq=groupByKw.get("10");
// 12 2跨激光切割板
List<DmSygdMx> k2j=groupByKw.get("12");
// 14 3跨厚板
List<DmSygdMx> k3h=groupByKw.get("14");
// 6 3跨平铁
List<DmSygdMx> k3p=groupByKw.get("6");
// 13 3跨曲板
List<DmSygdMx> k3q=groupByKw.get("13");
// 15 4跨普通板
List<DmSygdMx> k4p=groupByKw.get("15");
// 16 7跨型板
List<DmSygdMx> k7x=groupByKw.get("16");
// 17 光电
List<DmSygdMx> gd=groupByKw.get("17");
System.out.println(groupByKw);
}
}

97
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java
Unescape View File

@ -1,11 +1,34 @@
package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.BeanCopier;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
import com.dsic.gj_erp.bean.sy.Dm_zhbmp;
import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.sun.el.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -13,9 +36,79 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author xn
* @since 2023-09-15
* @since 2023-10-09
*/
@Service
public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> implements DmSygdService {
@Resource
private DmSygdMapper mapper;
@Resource
private DmBclqjbpService bclqjbpService;
@Override
public Map getSygds(){
Map map= new HashMap();
return map;
}
// mx.setKwxx(b.getTzbh().substring(4,8));
// mx.setKw(b.getTzbh().substring(4,7));
// mx.setLqlb(b.getTzbh().substring(4,5).equals("N")?"1020":
// b.getTzbh().substring(4,5).equals("S")?"1010":"X");
// if (b.getTzbh().substring(7,8).equals("D")){
// //tlt.substring(7,8).equals("D")?"1110" 中大组立
// mx.setZl("1110");
// }else {
// if (b.getTzbh().substring(5,6).equals("8")){
// //tlt.substring(5,6).equals("8")?"1120" 光电
// mx.setZl("1120");
// }else if(b.getTzbh().substring(6,8).equals("XX")){
// //tlt.substring(6,8).equals("XX")?"4230" 焊接机器人肘板
// mx.setZl("4230");
// }else {
// //tlt.substring(7,8).equals("X")?"1010" 小组立
// mx.setZl("1010");
// }
// }
// Map<String,List<DmSygdMx>> kwxx = mxList.stream().collect(Collectors.groupingBy(DmSygdMx::getKwxx));
// s.setMxList(mxList);
// s.setTltSl(mxList.size());
// s.setSlSl(mxList.size());
// s.setPwSl(mxList.size());
// s.setN1ad(ObjectUtil.isNotEmpty(kwxx.get("N1AD"))?kwxx.get("N1AD").size():0);
// s.setN1ax(ObjectUtil.isNotEmpty(kwxx.get("N1AX"))?kwxx.get("N1AX").size():0);
// s.setN1ld(ObjectUtil.isNotEmpty(kwxx.get("N1LD"))?kwxx.get("N1LD").size():0);
// s.setN2bd(ObjectUtil.isNotEmpty(kwxx.get("N2BD"))?kwxx.get("N2BD").size():0);
// s.setN2bx(ObjectUtil.isNotEmpty(kwxx.get("N2BX"))?kwxx.get("N2BX").size():0);
// s.setN2cd(ObjectUtil.isNotEmpty(kwxx.get("N2CD"))?kwxx.get("N2CD").size():0);
// s.setN2cx(ObjectUtil.isNotEmpty(kwxx.get("N2CX"))?kwxx.get("N2CX").size():0);
// s.setN2jd(ObjectUtil.isNotEmpty(kwxx.get("N2JD"))?kwxx.get("N2JD").size():0);
// s.setN2jx(ObjectUtil.isNotEmpty(kwxx.get("N2JX"))?kwxx.get("N2JX").size():0);
// s.setN2td(ObjectUtil.isNotEmpty(kwxx.get("N2TD"))?kwxx.get("N2TD").size():0);
// s.setN2tx(ObjectUtil.isNotEmpty(kwxx.get("N2TX"))?kwxx.get("N2TX").size():0);
// s.setN3cd(ObjectUtil.isNotEmpty(kwxx.get("N3CD"))?kwxx.get("N3CD").size():0);
// s.setN3cx(ObjectUtil.isNotEmpty(kwxx.get("N3CX"))?kwxx.get("N3CX").size():0);
// s.setN3hd(ObjectUtil.isNotEmpty(kwxx.get("N3HD"))?kwxx.get("N3HD").size():0);
// s.setN3hx(ObjectUtil.isNotEmpty(kwxx.get("N3HX"))?kwxx.get("N3HX").size():0);
// s.setN4pd(ObjectUtil.isNotEmpty(kwxx.get("N4PD"))?kwxx.get("N4PD").size():0);
// s.setN4px(ObjectUtil.isNotEmpty(kwxx.get("N4PX"))?kwxx.get("N4PX").size():0);
// s.setN4xx(ObjectUtil.isNotEmpty(kwxx.get("N4XX"))?kwxx.get("N4XX").size():0);
// s.setS2td(ObjectUtil.isNotEmpty(kwxx.get("S2TD"))?kwxx.get("S2TD").size():0);
// s.setS2tx(ObjectUtil.isNotEmpty(kwxx.get("S2TX"))?kwxx.get("S2TX").size():0);
// s.setS3pd(ObjectUtil.isNotEmpty(kwxx.get("S3PD"))?kwxx.get("S3PD").size():0);
// s.setS3px(ObjectUtil.isNotEmpty(kwxx.get("S3PX"))?kwxx.get("S3PX").size():0);
// s.setS3xx(ObjectUtil.isNotEmpty(kwxx.get("S3XX"))?kwxx.get("S3XX").size():0);
// s.setX7xd(ObjectUtil.isNotEmpty(kwxx.get("N1AD"))?kwxx.get("N1AD").size():0);
// s.setX7xx(ObjectUtil.isNotEmpty(kwxx.get("N1AD"))?kwxx.get("N1AD").size():0);
}

20
src/main/resources/mappers/jhgk/DmQfxqMapper.xml
Unescape View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.jhgk.DmQfxqMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jhgk.DmQfxq">
<id column="id" property="id" />
<result column="DC_CH" property="dcCh" />
<result column="DC_PL" property="dcPl" />
<result column="DC_FD" property="dcFd" />
<result column="pscd" property="pscd" />
<result column="cjzg" property="cjzg" />
<result column="db" property="db" />
<result column="xc" property="xc" />
<result column="txc" property="txc" />
<result column="bz" property="bz" />
<result column="zt" property="zt" />
</resultMap>
</mapper>

112
src/main/resources/mappers/jhgk/DmSygdMapper.xml
Unescape View File

@ -5,44 +5,80 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jhgk.DmSygd">
<id column="id" property="id" />
<result column="dc_ch1" property="dcCh1" />
<result column="dc_ch2" property="dcCh2" />
<result column="dc_ch3" property="dcCh3" />
<result column="dc_pl" property="dcPl" />
<result column="dc_fd" property="dcFd" />
<result column="bs" property="bs" />
<result column="dhsl" property="dhsl" />
<result column="ztsl" property="ztsl" />
<result column="scxfq" property="scxfq" />
<result column="xcpw" property="xcpw" />
<result column="gs" property="gs" />
<result column="pw" property="pw" />
<result column="pkjs1" property="pkjs1" />
<result column="skbs1" property="skbs1" />
<result column="skks1" property="skks1" />
<result column="pkcd1" property="pkcd1" />
<result column="pkjs2" property="pkjs2" />
<result column="skbs2" property="skbs2" />
<result column="skks2" property="skks2" />
<result column="pkcd2" property="pkcd2" />
<result column="pkjs3" property="pkjs3" />
<result column="ptbs" property="ptbs" />
<result column="ptks" property="ptks" />
<result column="ptjs" property="ptjs" />
<result column="qptzjs" property="qptzjs" />
<result column="qptjs" property="qptjs" />
<result column="qwbjs" property="qwbjs" />
<result column="zl" property="zl" />
<result column="skbs3" property="skbs3" />
<result column="skks3" property="skks3" />
<result column="pkcd3" property="pkcd3" />
<result column="pkjs4" property="pkjs4" />
<result column="mbjb" property="mbjb" />
<result column="xcms" property="xcms" />
<result column="xcmb" property="xcmb" />
<result column="fdxqq" property="fdxqq" />
<result column="gdjs" property="gdjs" />
<result column="bz" property="bz" />
<result column="DC_CH" property="dcCh" />
<result column="DC_FD" property="dcFd" />
<result column="DC_PL" property="dcPl" />
<result column="gjjs_dz" property="gjjsDz" />
<result column="gjjs_xz" property="gjjsXz" />
<result column="gjks" property="gjks" />
<result column="jsq_tlt" property="jsqTlt" />
<result column="jsq_lqb" property="jsqLqb" />
<result column="dhqd" property="dhqd" />
<result column="zt" property="zt" />
<result column="order_bs" property="orderBs" />
<result column="arrival_bs" property="arrivalBs" />
<result column="tlt_sl" property="tltSl" />
<result column="sl_sl" property="slSl" />
<result column="sl_sj" property="slSj" />
<result column="pw_sl" property="pwSl" />
<result column="pw_sj" property="pwSj" />
<result column="xcpw_sl" property="xcpwSl" />
<result column="xcpw_sj" property="xcpwSj" />
<result column="n1ad" property="n1ad" />
<result column="n1ad_sj" property="n1adSj" />
<result column="n1ax" property="n1ax" />
<result column="n1ax_sj" property="n1axSj" />
<result column="n1ld" property="n1ld" />
<result column="n1ld_sj" property="n1ldSj" />
<result column="n2bd" property="n2bd" />
<result column="n2bd_sj" property="n2bdSj" />
<result column="n2bx" property="n2bx" />
<result column="n2bx_sj" property="n2bxSj" />
<result column="n2cx" property="n2cx" />
<result column="n2cx_sj" property="n2cxSj" />
<result column="n2cd" property="n2cd" />
<result column="n2cd_sj" property="n2cdSj" />
<result column="n2tx" property="n2tx" />
<result column="n2tx_sj" property="n2txSj" />
<result column="n2td" property="n2td" />
<result column="n2td_sj" property="n2tdSj" />
<result column="n2jx" property="n2jx" />
<result column="n2jx_sj" property="n2jxSj" />
<result column="n2jd" property="n2jd" />
<result column="n2jd_sj" property="n2jdSj" />
<result column="n3cx" property="n3cx" />
<result column="n3cx_sj" property="n3cxSj" />
<result column="n3cd" property="n3cd" />
<result column="n3cd_sj" property="n3cdSj" />
<result column="n3hx" property="n3hx" />
<result column="n3hx_sj" property="n3hxSj" />
<result column="n3hd" property="n3hd" />
<result column="n3hd_sj" property="n3hdSj" />
<result column="n4px" property="n4px" />
<result column="n4px_sj" property="n4pxSj" />
<result column="n4pd" property="n4pd" />
<result column="n4pd_sj" property="n4pdSj" />
<result column="n4xx" property="n4xx" />
<result column="n4xx_sj" property="n4xxSj" />
<result column="n8gx" property="n8gx" />
<result column="n8gx_sj" property="n8gxSj" />
<result column="x7xx" property="x7xx" />
<result column="x7xx_sj" property="x7xxSj" />
<result column="x7xd" property="x7xd" />
<result column="x7xd_sj" property="x7xdSj" />
<result column="s2tx" property="s2tx" />
<result column="s2tx_sj" property="s2txSj" />
<result column="s2td" property="s2td" />
<result column="s2td_sj" property="s2tdSj" />
<result column="s3px" property="s3px" />
<result column="s3px_sj" property="s3pxSj" />
<result column="s3pd" property="s3pd" />
<result column="s3pd_sj" property="s3pdSj" />
<result column="s3xx" property="s3xx" />
<result column="s3xx_sj" property="s3xxSj" />
<result column="jhwg_dz" property="jhwgDz" />
<result column="jhwg_xz" property="jhwgXz" />
<result column="sjly_ch" property="sjlyCh" />
</resultMap>
</mapper>

64
src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
Unescape View File

@ -5,65 +5,39 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jhgk.DmSygdMx">
<id column="id" property="id" />
<result column="dc_ch" property="dcCh" />
<result column="dc_ch1" property="dcCh1" />
<result column="dc_ch2" property="dcCh2" />
<result column="dc_ch3" property="dcCh3" />
<result column="dc_pl" property="dcPl" />
<result column="dc_fd" property="dcFd" />
<result column="LQLB" property="lqlb" />
<result column="bs" property="bs" />
<result column="tzbh" property="tzbh" />
<result column="jtjhq" property="jtjhq" />
<result column="fdxqq" property="fdxqq" />
<result column="wpgg" property="wpgg" />
<result column="wpxh" property="wpxh" />
<result column="dhsl" property="dhsl" />
<result column="ztsl" property="ztsl" />
<result column="scxfq" property="scxfq" />
<result column="cd" property="cd" />
<result column="mj" property="mj" />
<result column="jhwg_pw" property="jhwgPw" />
<result column="ZZCJ" property="zzcj" />
<result column="llrq" property="llrq" />
<result column="hxcd" property="hxcd" />
<result column="qgcd" property="qgcd" />
<result column="bh" property="bh" />
<result column="qbs" property="qbs" />
<result column="pkbs" property="pkbs" />
<result column="dmbs" property="dmbs" />
<result column="1klm" property="1klm" />
<result column="wg_1klm" property="wg1klm" />
<result column="lksk" property="lksk" />
<result column="wg_lksk" property="wgLksk" />
<result column="pkcd" property="pkcd" />
<result column="jhwg_pk" property="jhwgPk" />
<result column="2klm" property="2klm" />
<result column="wg_2klm" property="wg2klm" />
<result column="pkcd2" property="pkcd2" />
<result column="jhwg_pk2" property="jhwgPk2" />
<result column="3klm" property="3klm" />
<result column="wg_3klm" property="wg3klm" />
<result column="pkcd3" property="pkcd3" />
<result column="jhwg_pk3" property="jhwgPk3" />
<result column="3kpt" property="3kpt" />
<result column="wg_3kpt" property="wg3kpt" />
<result column="ljmj" property="ljmj" />
<result column="ljsl" property="ljsl" />
<result column="qptzjs" property="qptzjs" />
<result column="qptjs" property="qptjs" />
<result column="qwbjs" property="qwbjs" />
<result column="zl" property="zl" />
<result column="skbs3" property="skbs3" />
<result column="skks3" property="skks3" />
<result column="pkcd4" property="pkcd4" />
<result column="pkjs4" property="pkjs4" />
<result column="mbjb" property="mbjb" />
<result column="lx" property="lx" />
<result column="xcms" property="xcms" />
<result column="xcmb" property="xcmb" />
<result column="fdxq" property="fdxq" />
<result column="gdjs" property="gdjs" />
<result column="bz" property="bz" />
<result column="zt" property="zt" />
<result column="kw" property="kw" />
<result column="slrq" property="slrq" />
<result column="slry" property="slry" />
<result column="pw" property="pw" />
<result column="pwry" property="pwry" />
<result column="pwrq" property="pwrq" />
<result column="hxsb" property="hxsb" />
<result column="hxry" property="hxry" />
<result column="hxrq" property="hxrq" />
<result column="qgsb" property="qgsb" />
<result column="qgry" property="qgry" />
<result column="qgrq" property="qgrq" />
<result column="dmcd" property="dmcd" />
<result column="dmsb" property="dmsb" />
<result column="dmry" property="dmry" />
<result column="dmrq" property="dmrq" />
<result column="pwsb" property="pwsb" />
<result column="parent_id" property="parentId" />
</resultMap>

Write Preview
Loading…
Cancel
Save