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

三月滚动明细修改

Browse Source
master
xiaoning 2 years ago
parent 0f697c82cb
commit d4656a08b1
16 changed files with 888 additions and 214 deletions
Show Stats Download Patch File Download Diff File

412
.idea/workspace.xml
Unescape View File

@ -4,11 +4,193 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Tzjhdto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java" 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$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmXbjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmXbjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" 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/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/bean/jhgk/dto/Kwdto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Kwdto.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/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/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,53 +213,116 @@
<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.bean.jcsj" />
<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" />
<recent name="com.dsic.gj_erp.bean.jhgk.dto" />
<recent name="com.dsic.gj_erp.service.jhgk" />
<recent name="com.dsic.gj_erp.service.jhgk.impl" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.GjErpApplication">
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.Test" />
<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.*" />
<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="DmSygdMxController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdMxController" />
<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="DmSygdMxServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.service.jhgk.impl.DmSygdMxServiceImpl" />
<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="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="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>
@ -92,6 +337,15 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.DmSygdMxServiceImpl" />
<item itemvalue="Application.DmSygdMxController" />
<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,13 +380,45 @@
<workItem from="1695351043840" duration="2412000" />
<workItem from="1695353513521" duration="2941000" />
<workItem from="1695383415111" duration="2165000" />
<workItem from="1697763475514" duration="1179000" />
<workItem from="1697800899358" duration="4279000" />
<workItem from="1697852420526" duration="5738000" />
<workItem from="1697871559613" duration="9557000" />
<workItem from="1697940710591" duration="5807000" />
<workItem from="1698025517542" duration="2101000" />
<workItem from="1698135831323" duration="3744000" />
<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="4402000" />
<workItem from="1697376356587" duration="1239000" />
<workItem from="1697433453323" duration="7767000" />
<workItem from="1697456575522" duration="10388000" />
<workItem from="1697471692173" duration="4346000" />
<workItem from="1697502148306" duration="16226000" />
<workItem from="1697536555329" duration="3265000" />
<workItem from="1697592676337" duration="7156000" />
<workItem from="1697622610359" duration="2293000" />
<workItem from="1697676714084" duration="7825000" />
<workItem from="1697763354094" duration="1275000" />
<workItem from="1697849837758" duration="15276000" />
<workItem from="1697939078969" duration="10821000" />
<workItem from="1698044328749" duration="4913000" />
<workItem from="1698065487262" duration="2034000" />
<workItem from="1698125387532" duration="5837000" />
<workItem from="1698141455147" duration="5238000" />
<workItem from="1698195906238" duration="22809000" />
<workItem from="1698227702797" duration="760000" />
<workItem from="1698285803515" duration="18061000" />
<workItem from="1698372237111" duration="3874000" />
<workItem from="1698544556403" duration="7524000" />
<workItem from="1698642002749" duration="12094000" />
<workItem from="1698715707323" duration="3411000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -204,14 +490,28 @@
<option name="project" value="LOCAL" />
<updated>1695353309158</updated>
</task>
<task id="LOCAL-00011" summary="1019文档需求">
<created>1697885046984</created>
<task id="LOCAL-00011" summary="wanghaodong">
<created>1697167182055</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1697885046984</updated>
<updated>1697167182055</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="排产">
<created>1697547818761</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1697547818761</updated>
</task>
<task id="LOCAL-00013" summary="gai">
<created>1697678917555</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1697678917555</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -227,33 +527,25 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="finish" />
<MESSAGE value="Revert &quot;finish&quot;" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="TEST" />
<MESSAGE value="Revert &quot;TEST&quot;1" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
<MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
<MESSAGE value="1019文档需求" />
<option name="LAST_COMMIT_MESSAGE" value="1019文档需求" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="排产" />
<MESSAGE value="gai" />
<option name="LAST_COMMIT_MESSAGE" value="gai" />
</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>
<pin-to-top-manager>
<pinned-members>
<PinnedItemInfo parentTag="java.util.HashMap$Node" memberName="value" />
</pinned-members>
</pin-to-top-manager>
<watches-manager>
<configuration name="SpringBootApplicationConfigurationType">
<watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" />
</configuration>
</watches-manager>
</component>
</project>

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

@ -56,7 +56,7 @@ public class DmSygd implements Serializable {
@ApiModelProperty(value = "订货清单号")
private String dhqd;
@ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
@ApiModelProperty(value = "状态；0编辑 1提交 2审核 3下发 4完成 5拖期")
private String gdZt="0";
@ApiModelProperty(value = "订货板数")
@ -256,5 +256,8 @@ public class DmSygd implements Serializable {
private String id;
@TableField(exist = false)
private List<DmSygdMx> mxList;
private String beginTime;
@TableField(exist = false)
private String endTime;
}

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

@ -61,7 +61,7 @@ public class DmSygdMx implements Serializable {
private String pklx;
@ApiModelProperty(value = "坡口长度")
private Double pkcd;
private Double pkcd=1.0;
@ApiModelProperty(value = "零件数量")
private BigDecimal ljsl;
@ -199,7 +199,24 @@ public class DmSygdMx implements Serializable {
private String qgcdKc;
@ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
private String zt="0";
@ApiModelProperty(value = "根数")
private Double xcgs;
@ApiModelProperty(value = "板材领取重量")
private BigDecimal bclqzl;
@ApiModelProperty(value = "板材实耗重量")
private Double bcshzl;
@ApiModelProperty(value = "板材余料重量")
private BigDecimal bcylzl;
@ApiModelProperty(value = "板材零件套料重量")
private BigDecimal bcljtlzl;
@ApiModelProperty(value = "前批余料代")
private Double bcqpyld;
private String parentId;
@TableId(value = "id", type = IdType.ASSIGN_UUID)

24
src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java
Unescape View File

@ -0,0 +1,24 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class Dhdto {
// 船号 订货清单号 材质 厚度 宽度 长度 到货数量 需求期
private String dcCh;
private String dcPl;
private String dhqd;
private String wphd;
private String wpcd;
private String wpkd;
private String rkxh;
private Double hdsl;
private String gcxqq;
private List<DmSygdMx> mxList;
}

4
src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Kwdto.java
Unescape View File

@ -1,8 +1,10 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class Kwdto {
@ -12,4 +14,6 @@ public class Kwdto {
private int tlt_sl;
private BigDecimal hx_cd;
private BigDecimal qg_cd;
private List<DmSygdMx> mxList;
}

17
src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java
Unescape View File

@ -0,0 +1,17 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import lombok.Data;
import java.util.List;
@Data
public class Pldto extends DmCzplpNew {
private String jsq_dz_pc;
private String jsq_xz_pc;
private String gjks_pc;
private List<DmSygdMx> mxList;
}

14
src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Tzjhdto.java
Unescape View File

@ -0,0 +1,14 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmTzjh;
import lombok.Data;
import java.util.List;
@Data
public class Tzjhdto extends DmTzjh {
private String tzxqq;//图纸需求期 钢加开始时间
private List<DmSygdMx> mxList;
}

18
src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java
Unescape View File

@ -0,0 +1,18 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class Xbjhdto extends DmXbjh {
private Double plb_zl;//批量表重量
private Double zrc_zl;//中日程重量
private Double tlt_zl;//套料图重量
private List<DmSygdMx> mxList;
}

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

@ -2,21 +2,33 @@ 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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelQFListener;
import com.dsic.gj_erp.listeners.ExcelSYListener;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.sy.SYService;
import io.swagger.annotations.ApiOperation;
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 org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -36,15 +48,45 @@ public class DmSygdController {
@AuthFunction
public ResultBean getList(@RequestBody DmSygd sygd){
List<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
.eq(StrUtil.isNotEmpty(sygd.getDcCh()),"dc_ch",sygd.getDcCh())
.eq(StrUtil.isNotEmpty(sygd.getDcPl()),"dc_pl",sygd.getDcPl())
// .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"jssj",sygd.getBeginTime())
// .le(StrUtil.isNotEmpty(sygd.getEndTime()),"jssj",sygd.getEndTime())
.eq("gd_zt",sygd.getGdZt())
.ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"sl_sj",sygd.getBeginTime())
.le(StrUtil.isNotEmpty(sygd.getEndTime()),"sl_sj",sygd.getEndTime())
.orderByAsc("dc_ch,dc_pl")
);
return new ResultBean(list);
}
@PostMapping("/upload")
@AuthFunction
@ResponseBody
public ResultBean uploadSy(@RequestParam("file") MultipartFile file , HttpServletRequest req) throws Exception, CustomException {
ExcelSYListener objectListener = new ExcelSYListener();
EasyExcel.read(file.getInputStream(), SyExcel.class, objectListener).sheet(0).headRowNumber(1).doRead();
List<SyExcel> objList = objectListener.getObjectList();
service.uploadSy(objList,req);
return new ResultBean();
}
//提交
//审核
//退回
@ApiOperation(value = "批量提交/退回")
@PostMapping("/tj")
@AuthFunction
@ResponseBody
public ResultBean tj(@RequestBody List<DmSygd> list){
service.tj(list);
return new ResultBean();
}
@ApiOperation(value = "批量审核")
@PostMapping(value = "/sh")
public ResultBean sh(@RequestBody List<DmSygd> dmSygds) {
service.sh(dmSygds);
return new ResultBean();
}
}

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

@ -5,8 +5,12 @@ 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.jcsj.DmCzplpNew;
import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.bean.jcsj.EmSbjbb;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.sy.SYService;
import org.springframework.beans.factory.annotation.Autowired;
@ -18,6 +22,9 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -33,6 +40,8 @@ public class DmSygdMxController {
@Autowired
private DmSygdMxService service;
@Autowired
private EmSbcnpService emSbcnpService;
@RequestMapping("/getList")
@AuthFunction
@ -42,15 +51,10 @@ public class DmSygdMxController {
.eq(StrUtil.isNotEmpty(sygd.getDcPl()),"dc_pl",sygd.getDcPl())
.ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"jssj",sygd.getBeginTime())
.le(StrUtil.isNotEmpty(sygd.getEndTime()),"jssj",sygd.getEndTime())
.orderByAsc("dc_ch,dc_pl,jssj")
.orderByAsc("jssj,dc_ch,dc_pl")
);
return new ResultBean(list);
}
@RequestMapping("/sygdPC")
@AuthFunction
public ResultBean sygdPC(){
return new ResultBean(service.sygdPC());
}
@RequestMapping("/saveByDcch")
@AuthFunction
@ -58,10 +62,41 @@ public class DmSygdMxController {
return new ResultBean(service.saveByDcch(map));
}
@RequestMapping("/getKwList")
@RequestMapping("/symxhz")
@AuthFunction
public ResultBean symxhz(@RequestBody List<DmSygdMx> list){
Map<String,Object> map=new HashMap<>();
//线表计划
//批量信息
//图纸信息
//到货信息
//跨位生产信息
map.put("xbList",service.getXBList(list));
map.put("plList",service.getPl(list));
map.put("tzList",service.getTZList(list));
map.put("dhList",service.getDhList(list));
map.put("kwList",service.getKwList(list));
return new ResultBean(map);
}
@RequestMapping("/getCnsb")
@AuthFunction
public ResultBean getKwList(@RequestBody List<DmSygdMx> list ){
return new ResultBean(service.getKwList(list));
public ResultBean getCnsb(){
List<EmSbcnp> list= emSbcnpService.list();
Map<String,List<EmSbcnp>> map= list.stream().filter(l -> Objects.nonNull(l.getGx())).collect(Collectors.groupingBy(EmSbcnp::getGx));
return new ResultBean(map);
}
@RequestMapping("/sygdPC")
@AuthFunction
public ResultBean sygdPC(){
return new ResultBean(service.sygdPC());
}
@RequestMapping("/saveList")
@AuthFunction
public ResultBean saveList( @RequestBody List<DmSygdMx> list ){
service.saveBatch(list);
//TODO 重新排产
return new ResultBean();
}
@RequestMapping("/tqSygd")
@ -69,6 +104,5 @@ public class DmSygdMxController {
public ResultBean tqSygd( ){
return service.tqSygd();
}
}

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

@ -3,6 +3,9 @@ package com.dsic.gj_erp.mapper.jhgk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.dto.Dhdto;
import java.util.List;
/**
* <p>
@ -14,4 +17,5 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
*/
public interface DmSygdMxMapper extends BaseMapper<DmSygdMx> {
Dhdto getDhsl(Dhdto dhdto);
}

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

@ -2,9 +2,8 @@ package com.dsic.gj_erp.service.jhgk;
import com.baomidou.mybatisplus.extension.service.IService;
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.bean.jhgk.dto.Kwdto;
import com.dsic.gj_erp.bean.jhgk.dto.*;
import java.util.HashMap;
import java.util.List;
@ -22,5 +21,9 @@ public interface DmSygdMxService extends IService<DmSygdMx> {
Map sygdPC();
List<DmSygdMx> saveByDcch(HashMap<String, List<Object>> map);
List<Kwdto> getKwList(List<DmSygdMx> list);
List<Xbjhdto> getXBList(List<DmSygdMx> list);
List<Pldto> getPl(List<DmSygdMx> list);
List<Tzjhdto> getTZList(List<DmSygdMx> list);
List<Dhdto> getDhList(List<DmSygdMx> list);
ResultBean tqSygd();
}

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

@ -5,7 +5,10 @@ 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 com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import org.springframework.web.bind.annotation.RequestBody;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@ -19,6 +22,10 @@ import java.util.Map;
*/
public interface DmSygdService extends IService<DmSygd> {
public Map getSygds();
Map getSygds();
Map uploadSy(List<SyExcel> list, HttpServletRequest req);
Boolean tj(List<DmSygd> dmSygds);
Boolean sh(List<DmSygd> dmSygds);
}

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

@ -8,25 +8,26 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
import com.dsic.gj_erp.bean.jcsj.EmGcrl;
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.jhgk.dto.Kwdto;
import com.dsic.gj_erp.bean.jhgk.*;
import com.dsic.gj_erp.bean.jhgk.dto.*;
import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
import com.dsic.gj_erp.mapper.jhgk.DmSygdMapper;
import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.jhgk.DmTzjhService;
import com.dsic.gj_erp.service.jhgk.DmXbjhService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@ -48,6 +49,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
private EmGcrlMapper gcrlMapper;
@Resource
private DmSygdService sygdService;
@Resource
private DmCzplpNewService plService;
@Resource
private DmXbjhService xbService;
@Resource
private DmTzjhService tzjhService;
/**
* 中日程分解
@ -62,42 +69,63 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
//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",
// .between("gjjs_dz",
// "(SELECT CONVERT(varchar(10),DATEADD(m,1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111))",
// "(Select CONVERT(varchar(10), eomonth(GETDATE(),3), 111))").or()
// .between("gjjs_dz",
// "(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
//测试
//TODO 需测试
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",
"DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd,SUM(zl) as zl")
.between("gjjs_dz",
"2023/08/01",
"2023/08/31")
.or()
.between("gjjs_xz",
"2023/08/01",
"2023/08/31")
.groupBy("DC_CH,DC_PL,gjks,gjjs_dz,gjjs_xz,jsq_tlt,jsq_lqb,dhqd")
);
//2.如果未来3个月信息内的船号、批号，已经排产过，那么根据船号、批号删除，重新排
int i= this.count(new QueryWrapper<DmSygdMx>()
.eq("dc_ch",zrcjhs.get(0).getDcCh())
.eq("dc_pl",zrcjhs.get(0).getDcPl())
);
if (i>0){
for (DmZrcjh z:zrcjhs){
this.remove(new QueryWrapper<DmSygdMx>()
.eq("dc_ch",z.getDcCh())
.eq("dc_pl",z.getDcPl()));
}
}
if (zrcjhs.size()<1){map2.put("message","请导入中日程！");return map2;}
List<DmZrcjh> zrcjhsNew=new ArrayList<>();
//TODO 2.如果要重新排产，应当先根据 船号、批量 删除对应数父级状态为编制数据，及对应明细数据
for (DmZrcjh zrc:zrcjhs){
//有父级数据的
if (sygdService.remove(new QueryWrapper<DmSygd>()
.eq("DC_CH",zrc.getDcCh())
.eq("DC_PL",zrc.getDcPl())
.eq("gd_zt","0")//编辑
)) {
this.remove(new QueryWrapper<DmSygdMx>()
.eq("dc_ch",zrc.getDcCh())
.eq("dc_pl",zrc.getDcPl()));
zrcjhsNew.add(zrc);
}else {
//无父级数据的
this.remove(new QueryWrapper<DmSygdMx>()
.eq("dc_ch",zrc.getDcCh())
.eq("dc_pl",zrc.getDcPl())
.last("and parent_id is null"));
zrcjhsNew.add(zrc);
}
}
if(zrcjhsNew.size()<1){
map2.put("message","无可排产数据");
return map2;
}
//3.用中日程中的 船号 批量 ，在BOM中找明细
List<DmSygdMx> mxList=new ArrayList<>();
List<DmZrcjh> no_tlt=new ArrayList<>();//在BOM中没有对应数据的中日程信息
for (DmZrcjh zrcjh : zrcjhs) {
//②BOM中对应数据
for (DmZrcjh zrcjh : zrcjhsNew) {
//TODO ②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")
@ -107,6 +135,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
.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 {
@ -152,6 +181,14 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
for (DmBom b:list){
DmSygdMx mx=new DmSygdMx();
zrcToMx(zrcjh,mx);
// mx.setXcms(b.getXcshms());
// 7850 kg 密度 计算重量
String[] wpgg=b.getWpgg().split("\\*");
//立方米
Double d= Double.parseDouble(wpgg[0])*Double.parseDouble(wpgg[1])*Double.parseDouble(wpgg[2])/1000000000.0;
//密度7.85t/m3
Double c=d*7.85;
mx.setBcshzl(c);
mx.setZl(b.getZl());
mx.setTzbh(b.getTzbh());
mx.setLqlb(b.getLqlb());
@ -227,6 +264,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
m.setDcPl(zrcjh.getDcPl());
m.setDcFd(zrcjh.getDcFd());
m.setGjks(zrcjh.getGjks());
m.setBcshzl(zrcjh.getZl());
m.setGjjsDz(zrcjh.getGjjsDz());
m.setGjjsXz(zrcjh.getGjjsXz());
m.setJsqTlt(zrcjh.getJsqTlt());
@ -245,7 +283,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
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.根据选择的目标船只，查询数据，为本船只赋值
//1.根据选择的*目标船只，查询数据，为本船只赋值
for (DmZrcjh z:zrcjhs){
for (DmSygdMx mx:no_tlt_ch){
if (z.getDcCh().equals(mx.getDcCh())){
@ -279,33 +317,27 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
* @param list
*/
public void ypc(List<DmSygdMx> list){
//1.根据钢加结束时间排序，决定生产顺序
//1.根据组立结束时间排序，决定生产顺序
list =list.stream().sorted(Comparator.comparing(DmSygdMx::getJssj,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
//2.未来3个月的工厂日历信息
//2.未来工厂日历信息
List<EmGcrl> gcrlList= gcrlMapper.selectList(new QueryWrapper<EmGcrl>()
.eq("xxr","1")
.between("gl",
"2023/08/01",
"2023/08/31")
// .between("gl","2023/08/01","2023/08/31")
.gt("gl","2023/08/01")
// DateUtil.date().toString("yyyy/MM/dd"))
.orderByAsc("gl"));
//3.预排产
//TODO 假设：上料产能22张/小时，每天8小时工作时间；又套料图需当天完成
//TODO 假设：产能测算266.9；又套料图需当天完成
for (int i = 0; i < gcrlList.size(); i++) {
for (int j = 0; j < (8*22); j++) {
int index=(8*22)*i+j;
for (int j = 0; j < 266; j++) {
int index=266*i+j;
if (list.size()>index){
// if (list.get(index).getLx().equals("B")){
//1抛
list.get(index).setPwrq(gcrlList.get(i).getGl());
list.get(index).setSlrq(gcrlList.get(i).getGl());
list.get(index).setHxrq(gcrlList.get(i).getGl());
list.get(index).setQgrq(gcrlList.get(i).getGl());
// }else {
// //2抛
// }
}else {
j=(8*22);
j=266;
i=gcrlList.size();
}
}
@ -354,44 +386,11 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
}
/**
* 提取跨位信息
* @param list
* @return
*/
public List<Kwdto> getKwList(List<DmSygdMx> list){
//1.将明细信息，按照跨位分组
Map<String,List<DmSygdMx>> map=list.stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getKw()).orElse("0") ));
List<Kwdto> kwdtoList=new ArrayList<>();
//2.按照日期，统计每个跨位信息
for (String kw:map.keySet()){
//根据上料日期分组
Map<String,List<DmSygdMx>> map1=map.get(kw).stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getSlrq()).orElse("0") ));
for (String rq:map1.keySet()){
Kwdto kwdto=new Kwdto();
kwdto.setRq(rq);
kwdto.setKw(kw);
List<DmSygdMx> list1=map1.get(rq);
kwdto.setTlt_sl(list1.size());
BigDecimal hx_cd=new BigDecimal(0);
BigDecimal qg_cd=new BigDecimal(0);
for (DmSygdMx mx:list1){
hx_cd=hx_cd.add(ObjectUtil.isEmpty(mx.getHxcd())?new BigDecimal(0):mx.getHxcd());
qg_cd=qg_cd.add(ObjectUtil.isEmpty(mx.getQgcd())?new BigDecimal(0):mx.getQgcd());
}
kwdto.setHx_cd(hx_cd);
kwdto.setQg_cd(qg_cd);
kwdtoList.add(kwdto);
}
}
kwdtoList=kwdtoList.stream().sorted(Comparator.comparing(Kwdto::getRq,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
return kwdtoList;
}
/**
* 生成3月滚动计划
* @return
*/
@Transactional
public ResultBean tqSygd(){
//1.查询未来3个月明细信息
//测试
@ -567,10 +566,200 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
//1跨 板数 加工 时间
//1跨 板数 加工 时间
}
sygdService.remove(new QueryWrapper<DmSygd>().eq("DC_CH",sygd.getDcCh()).eq("DC_PL",sygd.getDcPl()));
sygdList.add(sygd);
}
sygdList = sygdList.stream().sorted(Comparator.comparing(DmSygd::getDcCh).thenComparing(DmSygd::getDcPl)).collect(Collectors.toList());
sygdService.saveBatch(sygdList);
return new ResultBean(sygdList);
}
/**
* 提取跨位信息
* @param list
* @return
*/
public List<Kwdto> getKwList(List<DmSygdMx> list){
//1.将明细信息，按照跨位分组
Map<String,List<DmSygdMx>> map=list.stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getKw()).orElse("") ));
List<Kwdto> kwdtoList=new ArrayList<>();
//2.按照日期，统计每个跨位信息
for (String kw:map.keySet()){
//TODO 根据上料日期分组
Map<String,List<DmSygdMx>> map1=map.get(kw).stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getSlrq()).orElse("无法") ));
for (String rq:map1.keySet()){
Kwdto kwdto=new Kwdto();
kwdto.setRq(rq);
kwdto.setKw(kw);
List<DmSygdMx> list1=map1.get(rq);
kwdto.setTlt_sl(list1.size());
BigDecimal hx_cd=new BigDecimal(0);
BigDecimal qg_cd=new BigDecimal(0);
for (DmSygdMx mx:list1){
hx_cd=hx_cd.add(ObjectUtil.isEmpty(mx.getHxcd())?new BigDecimal(0):mx.getHxcd());
qg_cd=qg_cd.add(ObjectUtil.isEmpty(mx.getQgcd())?new BigDecimal(0):mx.getQgcd());
}
kwdto.setHx_cd(hx_cd);
kwdto.setQg_cd(qg_cd);
kwdto.setMxList(list1);
kwdtoList.add(kwdto);
}
}
kwdtoList=kwdtoList.stream().sorted(Comparator.comparing(Kwdto::getRq,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
return kwdtoList;
}
/**
* 提取线表信息
* @param list
* @return
*/
@Override
public List<Xbjhdto> getXBList(List<DmSygdMx> list) {
//
//线表 年月 船号 重量
//批量表重量 中日程重量
//明细 按船号 月份 分组 计算重量 排产重量
//1.根据上料时间 从近到远排序
list=list.stream()
.filter(mx -> Objects.nonNull(mx.getSlrq()))
.sorted(Comparator.comparing(DmSygdMx::getSlrq,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
//2.时间范围内线表计划数据
String year=list.get(0).getSlrq().substring(0,4);
String begin=list.get(0).getSlrq().substring(5,7);
String end=list.get(list.size()-1).getSlrq().substring(5,7);
List<DmXbjh> xbjhs=xbService.list(new QueryWrapper<DmXbjh>()
.eq("nf",year)
.between("yf",begin,end));
List<Xbjhdto> xbjhdtoList= BeanUtil.copyToList(xbjhs,Xbjhdto.class);
//3.根据月份和船号分组
Map<String, List<DmSygdMx>> monthAndCh = list.stream()
.filter(mx -> Objects.nonNull(mx.getSlrq())) // group by 的字段不能有null值
.collect(Collectors.groupingBy(x-> x.getSlrq().substring(5,7)+x.getDcCh()));
//4.
xbjhdtoList.forEach(dmXbjh->{
for (String ch:monthAndCh.keySet()){
if (dmXbjh.getDcCh().equals(monthAndCh.get(ch).get(0).getDcCh())
&& dmXbjh.getYf().equals(monthAndCh.get(ch).get(0).getSlrq().substring(5,7))){
Double shzl=0.0;
for (DmSygdMx mx:monthAndCh.get(ch)){
shzl=shzl+mx.getBcshzl();
}
dmXbjh.setTlt_zl(shzl);
dmXbjh.setMxList(monthAndCh.get(ch));
}
}
});
xbjhdtoList=xbjhdtoList.stream()
.filter(xb -> Objects.nonNull(xb.getTlt_zl()))
.sorted(Comparator.comparing(Xbjhdto::getYf)).collect(Collectors.toList());
return xbjhdtoList;
}
/**
* 提取批量表信息
* @param list
* @return
*/
@Override
public List<Pldto> getPl(List<DmSygdMx> list) {
//根据船号 批量 对应
//钢加大组结束期 钢加小组结束期 钢加开始
//list 按船号 批量 分段 大小组 分组，排序
List<Pldto> list1=new ArrayList();
Map<String,List<DmSygdMx>> map= list.stream().collect(Collectors.groupingBy(mx->mx.getDcCh()+mx.getDcPl()+mx.getDcFd()));
for (String key:map.keySet()){
DmSygdMx mx=map.get(key).get(0);//TODO 测试数据
Pldto pl=new Pldto();
//小分段
DmCzplpNew czplp =plService.getOne(new QueryWrapper<DmCzplpNew>()
.select("DC_CH,DC_PL,stuff( ( SELECT ' ' + c.DC_FD FROM dm_czplp_new c WHERE c.DC_CH=dm_czplp_new.DC_CH and c.DC_PL=dm_czplp_new.DC_PL FOR xml path ( '' ) ), 1, 1, '' ) AS dcFd,dzjsq,xzjsq")
.eq("DC_CH",mx.getDcCh())
.eq("DC_PL",mx.getDcPl())
.groupBy("DC_CH,DC_PL,dzjsq,xzjsq")
);
if (ObjectUtil.isNotEmpty(czplp)){
BeanUtils.copyProperties(czplp,pl);
pl.setGjks_pc(mx.getGjks());//TODO 中日程数据
pl.setJsq_dz_pc(mx.getGjjsDz());//TODO 中日程数据
pl.setJsq_xz_pc(mx.getGjjsXz());//TODO 中日程数据
pl.setMxList(map.get(key));
list1.add(pl);
}
//大组 结束期
//小组 结束期
}
list1=list1.stream().sorted(Comparator.comparing(x->x.getDcCh()+x.getDcPl()+x.getJsq_dz_pc()+x.getJsq_xz_pc(),Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
return list1;
}
/**
* 提取图纸信息
* @param list
* @return
*/
@Override
public List<Tzjhdto> getTZList(List<DmSygdMx> list) {
//图纸计划 dmTzjh 船号 批量
List<Tzjhdto> tzjhdtos=new ArrayList<>();
Map<String,List<DmSygdMx>> map= list.stream().collect(Collectors.groupingBy(mx->mx.getDcCh()+mx.getDcPl()));
for (String key:map.keySet()){
List<DmSygdMx> list1= map.get(key).stream().sorted(Comparator.comparing(DmSygdMx::getSlrq,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
DmTzjh tzjh= tzjhService.getOne(new QueryWrapper<DmTzjh>()
.select("DC_CH,DC_PL,xfq_lqb,jsq_lqb,xfq_tlt,jsq_tlt,stuff( ( SELECT ' ' + c.DC_FD FROM dm_tzjh c WHERE c.DC_CH=dm_tzjh.DC_CH and c.DC_PL=dm_tzjh.DC_PL FOR xml path ( '' ) ), 1, 1, '' ) AS dcFd")
.eq("DC_CH",list1.get(0).getDcCh())
.eq("DC_PL",list1.get(0).getDcPl())
.groupBy("DC_CH,DC_PL,xfq_lqb,jsq_lqb,xfq_tlt,jsq_tlt"));
if (ObjectUtil.isNotEmpty(tzjh)){
Tzjhdto tzjhdto=new Tzjhdto();
BeanUtils.copyProperties(tzjh,tzjhdto);
tzjhdto.setTzxqq(list1.get(0).getSlrq());//todo 使用上料日期作为需求期
tzjhdto.setMxList(list1);
tzjhdtos.add(tzjhdto);
}
}
tzjhdtos=tzjhdtos.stream().sorted(Comparator.comparing(Tzjhdto::getTzxqq,Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
return tzjhdtos;
}
/**
* 提取到货信息
* @param list
* @return
*/
@Override
public List<Dhdto> getDhList(List<DmSygdMx> list) {
//船号 批量 订单号
Map<String,List<DmSygdMx>> map= list.stream()
.filter(mx -> Objects.nonNull(mx.getDhqd()))
.collect(Collectors.groupingBy(mx->mx.getDcCh()+mx.getDcPl()+mx.getDhqd()));
List<Dhdto> list1=new ArrayList<>();
for (String key:map.keySet()){
for (DmSygdMx mx:map.get(key)){
Dhdto dhdto=new Dhdto();
List<DmSygdMx> mxs=new ArrayList<>();
dhdto.setDcCh(mx.getDcCh());
dhdto.setDcPl(mx.getDcPl());
dhdto.setDhqd(mx.getDhqd());
String[] str= mx.getWpgg().split("\\*");
dhdto.setWphd(str[0]);
dhdto.setWpkd(str[1]);
dhdto.setWpcd(str[2]);
dhdto.setRkxh(mx.getWpxh());
dhdto.setGcxqq(mx.getSlrq());
dhdto=baseMapper.getDhsl(dhdto);
mxs.add(mx);
dhdto.setMxList(mxs);
list1.add(dhdto);
}
}
//以list为主
return list1;
}
}

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

@ -9,9 +9,12 @@ 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.DmQfxq;
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.jhgk.excel.QfExcel;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
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;
@ -24,6 +27,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -56,59 +60,40 @@ public class DmSygdServiceImpl extends ServiceImpl<DmSygdMapper, DmSygd> impleme
return map;
}
@Override
public Map uploadSy(List<SyExcel> list, HttpServletRequest req){
List<DmSygd> listForSave=new ArrayList<>();
for (SyExcel q:list) {
//TODO 处理转码字段
// this.remove(new QueryWrapper<DmSygd>()
// .eq("DC_CH1",q.getDcCh1())
// .eq("DC_PL",q.getDcPl())
// .eq("DC_FD",q.getDcFd()));
DmSygd a=new DmSygd();
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;
}
public Boolean tj(List<DmSygd> dmSygds){
dmSygds.forEach(dmSygd->{
String zt=dmSygd.getGdZt();
String setZt=zt.equals("1")?"0":"1";
dmSygd.setGdZt(setZt);
});
return this.updateBatchById(dmSygds);
}
public Boolean sh(List<DmSygd> dmSygds){
dmSygds.forEach(dmSygd->{
String setZt="2";
dmSygd.setGdZt(setZt);
});
return this.updateBatchById(dmSygds);
}
// 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);
}

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

@ -15,7 +15,7 @@
<result column="hxcd" property="hxcd" />
<result column="qgcd" property="qgcd" />
<result column="qbs" property="qbs" />
<result column="dmbs" property="dmbs" />
<!-- <result column="dmbs" property="dmbs" />-->
<result column="pkcd" property="pkcd" />
<result column="ljsl" property="ljsl" />
<result column="zl" property="zl" />
@ -41,4 +41,25 @@
<result column="parent_id" property="parentId" />
</resultMap>
<select id="getDhsl" resultType="Dhdto" parameterType="Dhdto">
select ISNULL(im_crklsz.HDSL, 0) as hdsl,
MS_DDMXP.WPHD as wphd,
MS_DDMXP.WPCD as wpcd,
MS_DDMXP.WPKD as wpkd,
MS_DDMXP.RKXH as rkxh,
#{dcCh} as dcCh,
#{dcPl} as dcPl,
#{dhqd} as dhqd,
#{gcxqq} as gcxqq
from MS_DDJBP,MS_DDMXP LEFT JOIN im_crklsz on im_crklsz.GCDDH=MS_DDMXP.dc_ch
where
RTRIM(MS_DDJBP.CGFLM) = MS_DDMXP.cgflm
and RTRIM(MS_DDJBP.DDH) = MS_DDMXP.DDH
and (MS_DDJBP.DDLX) = 'B'
and MS_DDJBP.dhqdh=#{dhqdh}
and MS_DDMXP.WPHD=#{wphd}
and MS_DDMXP.WPCD=#{wpcd}
and MS_DDMXP.WPKD=#{rkxh}
GROUP BY MS_DDMXP.WPHD,MS_DDMXP.WPCD,MS_DDMXP.WPKD,MS_DDMXP.RKXH
</select>
</mapper>

Write Preview
Loading…
Cancel
Save