diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..f97929d --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +wms-parent \ No newline at end of file diff --git a/.idea/artifacts/wms_api_jar.xml b/.idea/artifacts/wms_api_jar.xml new file mode 100644 index 0000000..363359b --- /dev/null +++ b/.idea/artifacts/wms_api_jar.xml @@ -0,0 +1,158 @@ + + + $PROJECT_DIR$/classes/artifacts/wms_api_jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..f17c313 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml new file mode 100644 index 0000000..75c8f38 --- /dev/null +++ b/.idea/dataSources.local.xml @@ -0,0 +1,12 @@ + + + + + + master_key + true + root + *: + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..33ae531 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,19 @@ + + + + + mysql + true + com.mysql.jdbc.Driver + jdbc:mysql://47.96.183.77:3306/mt_erp + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..f35b346 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..68b641b --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,95 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_2.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_2.xml new file mode 100644 index 0000000..df5ac42 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_2.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_2.xml new file mode 100644 index 0000000..39f1535 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml new file mode 100644 index 0000000..3cd56f9 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml new file mode 100644 index 0000000..935eacc --- /dev/null +++ b/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml new file mode 100644 index 0000000..826b07d --- /dev/null +++ b/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_3.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_3.xml new file mode 100644 index 0000000..e1e9ace --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml new file mode 100644 index 0000000..49b4ec7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_9.xml new file mode 100644 index 0000000..0e50bdf --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_9.xml new file mode 100644 index 0000000..879b200 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml new file mode 100644 index 0000000..eba478b --- /dev/null +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_2_1.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_2_1.xml new file mode 100644 index 0000000..f517fae --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml new file mode 100644 index 0000000..bbd71d7 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml new file mode 100644 index 0000000..7ced7e4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml new file mode 100644 index 0000000..578b079 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mchange_c3p0_0_9_5_2.xml b/.idea/libraries/Maven__com_mchange_c3p0_0_9_5_2.xml new file mode 100644 index 0000000..35cfbfb --- /dev/null +++ b/.idea/libraries/Maven__com_mchange_c3p0_0_9_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml new file mode 100644 index 0000000..dbd8483 --- /dev/null +++ b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_4_0_2.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_4_0_2.xml new file mode 100644 index 0000000..3d2a12e --- /dev/null +++ b/.idea/libraries/Maven__com_rabbitmq_amqp_client_4_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rabbitmq_http_client_1_1_1_RELEASE.xml b/.idea/libraries/Maven__com_rabbitmq_http_client_1_1_1_RELEASE.xml new file mode 100644 index 0000000..9cd31db --- /dev/null +++ b/.idea/libraries/Maven__com_rabbitmq_http_client_1_1_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_7_5.xml b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_7_5.xml new file mode 100644 index 0000000..0ae565c --- /dev/null +++ b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml new file mode 100644 index 0000000..284ba86 --- /dev/null +++ b/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..b8581a6 --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_java6_2_3_13.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_java6_2_3_13.xml new file mode 100644 index 0000000..b092227 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_java6_2_3_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml new file mode 100644 index 0000000..27424a1 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml new file mode 100644 index 0000000..abb3fd9 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml new file mode 100644 index 0000000..706ae46 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml new file mode 100644 index 0000000..4d0a278 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml new file mode 100644 index 0000000..0813776 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml new file mode 100644 index 0000000..117d4ee --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml new file mode 100644 index 0000000..e6679b3 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml new file mode 100644 index 0000000..b1342e2 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml new file mode 100644 index 0000000..1fd5fc3 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml new file mode 100644 index 0000000..fa7a4b3 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml b/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml new file mode 100644 index 0000000..e60370e --- /dev/null +++ b/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml new file mode 100644 index 0000000..a761d2e --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_14.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_14.xml new file mode 100644 index 0000000..1722276 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml new file mode 100644 index 0000000..88d626e --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml new file mode 100644 index 0000000..6c692c8 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_oschina_likaixuan_excelutil_2_0_1.xml b/.idea/libraries/Maven__net_oschina_likaixuan_excelutil_2_0_1.xml new file mode 100644 index 0000000..0b29e0a --- /dev/null +++ b/.idea/libraries/Maven__net_oschina_likaixuan_excelutil_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml new file mode 100644 index 0000000..78cfcd3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml new file mode 100644 index 0000000..2970b5e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml new file mode 100644 index 0000000..c82bb7c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml new file mode 100644 index 0000000..a9f6e19 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_7.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_7.xml new file mode 100644 index 0000000..4e09d2a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_7.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_7.xml new file mode 100644 index 0000000..aceab1c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_7.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_7.xml new file mode 100644 index 0000000..a1c0369 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_13.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_13.xml new file mode 100644 index 0000000..808e0e4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_13.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_13.xml new file mode 100644 index 0000000..43e4ba9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_13.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_13.xml new file mode 100644 index 0000000..57bbf23 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_16.xml new file mode 100644 index 0000000..97aab57 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_16.xml new file mode 100644 index 0000000..92d54fb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_16.xml new file mode 100644 index 0000000..b43f570 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_16.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_16.xml new file mode 100644 index 0000000..daf65c9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_16.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_16.xml new file mode 100644 index 0000000..3e796cd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml new file mode 100644 index 0000000..cb0f76d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml new file mode 100644 index 0000000..36093ff --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml new file mode 100644 index 0000000..58bdc9a --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_26_incubating.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_26_incubating.xml new file mode 100644 index 0000000..5b5b563 --- /dev/null +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_26_incubating.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 0000000..78dbe45 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml new file mode 100644 index 0000000..4bd0591 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml new file mode 100644 index 0000000..09c4cf0 --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml new file mode 100644 index 0000000..6dc7a37 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml new file mode 100644 index 0000000..8c06db4 --- /dev/null +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml new file mode 100644 index 0000000..a523703 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml new file mode 100644 index 0000000..fe90c48 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml new file mode 100644 index 0000000..dc8a00a --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml new file mode 100644 index 0000000..774f47c --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml new file mode 100644 index 0000000..7ab319b --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml new file mode 100644 index 0000000..da69f6c --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml new file mode 100644 index 0000000..8503cb4 --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml new file mode 100644 index 0000000..678f5ce --- /dev/null +++ b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml new file mode 100644 index 0000000..d8b2fb5 --- /dev/null +++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml new file mode 100644 index 0000000..f86d2c8 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml new file mode 100644 index 0000000..bae9949 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml new file mode 100644 index 0000000..6073e53 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml new file mode 100644 index 0000000..a14ac63 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml new file mode 100644 index 0000000..20e8163 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_7_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_7_3_RELEASE.xml new file mode 100644 index 0000000..157a408 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_7_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_7_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_7_3_RELEASE.xml new file mode 100644 index 0000000..44cd9a9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_7_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_6_RELEASE.xml new file mode 100644 index 0000000..7de775a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml new file mode 100644 index 0000000..ababaf5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_1_5_6_RELEASE.xml new file mode 100644 index 0000000..19ee275 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_6_RELEASE.xml new file mode 100644 index 0000000..fdb29ec --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_1_5_6_RELEASE.xml new file mode 100644 index 0000000..ca2ccfc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_6_RELEASE.xml new file mode 100644 index 0000000..a8c4ad5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_1_5_6_RELEASE.xml new file mode 100644 index 0000000..ee41d66 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_6_RELEASE.xml new file mode 100644 index 0000000..918ed40 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_1_5_6_RELEASE.xml new file mode 100644 index 0000000..1d671a9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_6_RELEASE.xml new file mode 100644 index 0000000..8fbadc8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_6_RELEASE.xml new file mode 100644 index 0000000..f3968da --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_6_RELEASE.xml new file mode 100644 index 0000000..eed0d9d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_6_RELEASE.xml new file mode 100644 index 0000000..20ebb83 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_6_RELEASE.xml new file mode 100644 index 0000000..59caf06 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_6_RELEASE.xml new file mode 100644 index 0000000..f6ea3d9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_6_RELEASE.xml new file mode 100644 index 0000000..ae30a32 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_6_RELEASE.xml new file mode 100644 index 0000000..5f40815 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_1_8_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_1_8_6_RELEASE.xml new file mode 100644 index 0000000..d7869ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_1_8_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml new file mode 100644 index 0000000..fbc0452 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml new file mode 100644 index 0000000..7e6f096 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml new file mode 100644 index 0000000..bd2629e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_10_RELEASE.xml new file mode 100644 index 0000000..6e14e11 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_10_RELEASE.xml new file mode 100644 index 0000000..014e25c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_3_10_RELEASE.xml new file mode 100644 index 0000000..7e7126e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_10_RELEASE.xml new file mode 100644 index 0000000..d7b9867 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_3_10_RELEASE.xml new file mode 100644 index 0000000..9ea2a4f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_10_RELEASE.xml new file mode 100644 index 0000000..d124628 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_10_RELEASE.xml new file mode 100644 index 0000000..5725fe6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_10_RELEASE.xml new file mode 100644 index 0000000..8d5b000 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_4_3_10_RELEASE.xml new file mode 100644 index 0000000..c510755 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_3_10_RELEASE.xml new file mode 100644 index 0000000..6a4865a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_10_RELEASE.xml new file mode 100644 index 0000000..315f091 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_3_10_RELEASE.xml new file mode 100644 index 0000000..0c4a084 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_10_RELEASE.xml new file mode 100644 index 0000000..9cc6fbc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml new file mode 100644 index 0000000..20e2920 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml new file mode 100644 index 0000000..77144ff --- /dev/null +++ b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_3_4_0.xml b/.idea/libraries/Maven__tk_mybatis_mapper_3_4_0.xml new file mode 100644 index 0000000..29ba0c1 --- /dev/null +++ b/.idea/libraries/Maven__tk_mybatis_mapper_3_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..50498bb --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9313116 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/smartfox_info.xml b/.idea/smartfox_info.xml new file mode 100644 index 0000000..1c2584f --- /dev/null +++ b/.idea/smartfox_info.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..e5f7ef5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1063 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ali-Check + + + CodeSpring CoreSpring + + + Spring + + + Spring CoreSpring + + + XMLSpring CoreSpring + + + + + SpringJavaInjectionPointsAutowiringInspection + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT mappb.*,mamp.*,COUNT(mapb.process_step) process_step + FROM mt_alone_machining_product mamp + LEFT JOIN mt_alone_product_process_bom mappb ON mappb.product_id = mamp.id + LEFT JOIN mt_alone_process_bom mapb ON mapb.product_process_id = mappb.id + + + AND mamp.product_code = #{productCode} + + + AND mamp.product_name = #{productName} + + + AND mamp.specification = #{specification} + + + AND mapb.company_id = #{companyId} + + + GROUP BY mapb.product_process_id + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml new file mode 100644 index 0000000..148c549 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml new file mode 100644 index 0000000..b278e37 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsStockInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsStockInfoMapper.xml new file mode 100644 index 0000000..7059de7 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsStockInfoMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml new file mode 100644 index 0000000..6f4828c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMethodsMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMethodsMapper.xml new file mode 100644 index 0000000..d9d4524 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMethodsMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProductNameMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProductNameMapper.xml new file mode 100644 index 0000000..a0b22b0 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProductNameMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneSerialNumberMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneSerialNumberMapper.xml new file mode 100644 index 0000000..f2ad6fc --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneSerialNumberMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + UPDATE mt_alone_serial_number SET pin_counter = #{pinCounter} + WHERE id = #{id} + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtNumberConfMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtNumberConfMapper.xml new file mode 100644 index 0000000..8cecbbe --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtNumberConfMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + UPDATE mt_number_conf SET pin_serial = #{pinSerial} + WHERE id = #{id} + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtStockProvendorMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtStockProvendorMapper.xml new file mode 100644 index 0000000..f207b19 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtStockProvendorMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBatchRelatMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBatchRelatMapper.xml new file mode 100644 index 0000000..7928f2a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBatchRelatMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml new file mode 100644 index 0000000..cd41204 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO mt_alone_process_bom + (id,create_time,process_name,product_process_id,specification,process_content,process_step,process_apartment) + VALUES + + (#{item.id}, #{item.createTime}, #{item.processName}, #{item.productProcessId}, + #{item.specification},#{item.processContent}, #{item.processStep}, #{item.processApartment}) + + ON DUPLICATE KEY UPDATE + process_name = VALUES(process_name), + product_process_id = VALUES(product_process_id), + specification = VALUES(specification), + process_content = VALUES(process_content), + process_step = VALUES(process_step), + process_apartment = VALUES(process_apartment) + + + + INSERT INTO mt_alone_product_process_bom + (create_time,version,product_process_name,product_id,specification,process_content,memo,company_id) + VALUE(#{createTime},#{version},#{productProcessName},#{productId},#{specification},#{processContent},#{memo},#{companyId}) + + SELECT LAST_INSERT_ID() + + + + + INSERT INTO + mt_alone_process_bom(create_time,process_name,product_process_id,specification,process_content,process_step,memo,company_id,process_apartment) + VALUES + + ( + #{item.createTime}, + #{item.processName}, + #{item.productProcessId}, + #{item.specification}, + #{item.processContent}, + #{item.memo}, + #{item.companyId}, + #{item.processApartment} + ) + + + + + INSERT INTO + mt_alone_process_materials_bom(create_time,process_bom_id,materials_id,code,specification,dosage,memo,company_id) + VALUES + + ( + #{item.createTime}, + #{item.processBomId}, + #{item.materialsId}, + #{item.code}, + #{item.specification}, + #{item.dosage}, + #{item.memo}, + #{item.company_id} + ) + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessDetectRelatMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessDetectRelatMapper.xml new file mode 100644 index 0000000..1c71b28 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessDetectRelatMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml new file mode 100644 index 0000000..1012dd8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO mt_alone_process_materials_bom + (id,create_time,process_bom_id,materials_id,code,specification,dosage) + VALUES + + (#{item.id}, #{item.createTime}, #{item.processBomId}, #{item.materialsId}, + #{item.code},#{item.specification}, #{item.dosage}) + + ON DUPLICATE KEY UPDATE + process_bom_id = VALUES(process_bom_id), + materials_id = VALUES(materials_id), + code = VALUES(code), + specification = VALUES(specification), + dosage = VALUES(dosage) + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml new file mode 100644 index 0000000..40861e8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml new file mode 100644 index 0000000..1ec17f2 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml new file mode 100644 index 0000000..52e1b14 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml new file mode 100644 index 0000000..1bde8bb --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml new file mode 100644 index 0000000..deb4600 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml new file mode 100644 index 0000000..3aa9b06 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/QualityInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/QualityInfoMapper.xml new file mode 100644 index 0000000..823009f --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/QualityInfoMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachingProductDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachingProductDto.java new file mode 100644 index 0000000..2309594 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachingProductDto.java @@ -0,0 +1,54 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: weihongyang + * @Date: 2019/10/30 15:00 + * @Version 1.0 + */ +public class MachingProductDto extends MachiningProduct{ + private String unitName; + private String processName; + private String processApartment; + private String processContent; + private Integer processStep; + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + public String getProcessApartment() { + return processApartment; + } + + public void setProcessApartment(String processApartment) { + this.processApartment = processApartment; + } + + public String getProcessContent() { + return processContent; + } + + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + public Integer getProcessStep() { + return processStep; + } + + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProduct.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProduct.java new file mode 100644 index 0000000..3a9fd31 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProduct.java @@ -0,0 +1,558 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_machining_product") +public class MachiningProduct { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 产品编码 + */ + @Column(name = "product_code") + private String productCode; + + /** + * 产品名称 + */ + @Column(name = "product_name") + private String productName; + + /** + * 产品类型（坯布、尾单···） + */ + @Column(name = "product_type_code") + private String productTypeCode; + + /** + * 产品品种（尼龙、春亚纺···） + */ + @Column(name = "product_variety_code") + private String productVarietyCode; + + /** + * 面料 + */ + @Column(name = "shell_fabric") + private String shellFabric; + + /** + * 组织 + */ + private String tissue; + + /** + * 门幅 + */ + private Float larghezza; + + /** + * 克重 + */ + private Float grammage; + + /** + * 密度 + */ + private String density; + + /** + * 规格 + */ + private String specification; + + /** + * 加工方式 + */ + @Column(name = "processing_mode") + private String processingMode; + + /** + * 产品条形码(检测条形码） + */ + @Column(name = "product_bar_code") + private String productBarCode; + + /** + * 样品条形码 + */ + @Column(name = "specimen_bar_code") + private String specimenBarCode; + + /** + * 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品） + */ + @Column(name = "cloth_attr") + private Integer clothAttr; + + /** + * 描述信息 + */ + private String description; + + /** + * 备注 + */ + private String note; + + /** + * 关联unit表 + */ + @Column(name = "unit_id") + private Integer unitId; + + public Integer getUnitId() { + return unitId; + } + + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取产品编码 + * + * @return product_code - 产品编码 + */ + public String getProductCode() { + return productCode; + } + + /** + * 设置产品编码 + * + * @param productCode 产品编码 + */ + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + /** + * 获取产品名称 + * + * @return product_name - 产品名称 + */ + public String getProductName() { + return productName; + } + + /** + * 设置产品名称 + * + * @param productName 产品名称 + */ + public void setProductName(String productName) { + this.productName = productName; + } + + /** + * 获取产品类型（坯布、尾单···） + * + * @return product_type_code - 产品类型（坯布、尾单···） + */ + public String getProductTypeCode() { + return productTypeCode; + } + + /** + * 设置产品类型（坯布、尾单···） + * + * @param productTypeCode 产品类型（坯布、尾单···） + */ + public void setProductTypeCode(String productTypeCode) { + this.productTypeCode = productTypeCode; + } + + /** + * 获取产品品种（尼龙、春亚纺···） + * + * @return product_variety_code - 产品品种（尼龙、春亚纺···） + */ + public String getProductVarietyCode() { + return productVarietyCode; + } + + /** + * 设置产品品种（尼龙、春亚纺···） + * + * @param productVarietyCode 产品品种（尼龙、春亚纺···） + */ + public void setProductVarietyCode(String productVarietyCode) { + this.productVarietyCode = productVarietyCode; + } + + /** + * 获取面料 + * + * @return shell_fabric - 面料 + */ + public String getShellFabric() { + return shellFabric; + } + + /** + * 设置面料 + * + * @param shellFabric 面料 + */ + public void setShellFabric(String shellFabric) { + this.shellFabric = shellFabric; + } + + /** + * 获取组织 + * + * @return tissue - 组织 + */ + public String getTissue() { + return tissue; + } + + /** + * 设置组织 + * + * @param tissue 组织 + */ + public void setTissue(String tissue) { + this.tissue = tissue; + } + + /** + * 获取门幅 + * + * @return larghezza - 门幅 + */ + public Float getLarghezza() { + return larghezza; + } + + /** + * 设置门幅 + * + * @param larghezza 门幅 + */ + public void setLarghezza(Float larghezza) { + this.larghezza = larghezza; + } + + /** + * 获取克重 + * + * @return grammage - 克重 + */ + public Float getGrammage() { + return grammage; + } + + /** + * 设置克重 + * + * @param grammage 克重 + */ + public void setGrammage(Float grammage) { + this.grammage = grammage; + } + + /** + * 获取密度 + * + * @return density - 密度 + */ + public String getDensity() { + return density; + } + + /** + * 设置密度 + * + * @param density 密度 + */ + public void setDensity(String density) { + this.density = density; + } + + /** + * 获取规格 + * + * @return specification - 规格 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格 + * + * @param specification 规格 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取加工方式 + * + * @return processing_mode - 加工方式 + */ + public String getProcessingMode() { + return processingMode; + } + + /** + * 设置加工方式 + * + * @param processingMode 加工方式 + */ + public void setProcessingMode(String processingMode) { + this.processingMode = processingMode; + } + + /** + * 获取产品条形码(检测条形码） + * + * @return product_bar_code - 产品条形码(检测条形码） + */ + public String getProductBarCode() { + return productBarCode; + } + + /** + * 设置产品条形码(检测条形码） + * + * @param productBarCode 产品条形码(检测条形码） + */ + public void setProductBarCode(String productBarCode) { + this.productBarCode = productBarCode; + } + + /** + * 获取样品条形码 + * + * @return specimen_bar_code - 样品条形码 + */ + public String getSpecimenBarCode() { + return specimenBarCode; + } + + /** + * 设置样品条形码 + * + * @param specimenBarCode 样品条形码 + */ + public void setSpecimenBarCode(String specimenBarCode) { + this.specimenBarCode = specimenBarCode; + } + + /** + * 获取可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品） + * + * @return cloth_attr - 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品） + */ + public Integer getClothAttr() { + return clothAttr; + } + + /** + * 设置可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品） + * + * @param clothAttr 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品） + */ + public void setClothAttr(Integer clothAttr) { + this.clothAttr = clothAttr; + } + + /** + * 获取描述信息 + * + * @return description - 描述信息 + */ + public String getDescription() { + return description; + } + + /** + * 设置描述信息 + * + * @param description 描述信息 + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * 获取备注 + * + * @return note - 备注 + */ + public String getNote() { + return note; + } + + /** + * 设置备注 + * + * @param note 备注 + */ + public void setNote(String note) { + this.note = note; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductHaveBom.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductHaveBom.java new file mode 100644 index 0000000..6c0ebf2 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductHaveBom.java @@ -0,0 +1,30 @@ +package com.deer.wms.produce.manage.model; + +/** + * 有对应产品bom的产品信息对象类型，包括产品bom的id和加工总名称 + * @Author: hy + * @Date: 2019/10/13 15:18 + * @Version 1.0 + */ +public class MachiningProductHaveBom extends MachiningProduct { + + private Integer productProcessId; + + private String productProcessName; + + public Integer getProductProcessId() { + return productProcessId; + } + + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + public String getProductProcessName() { + return productProcessName; + } + + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductParams.java new file mode 100644 index 0000000..d2e6a9a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductParams.java @@ -0,0 +1,41 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; +import io.swagger.models.auth.In; + +/** +* Created by on 2019/09/09. +*/ +public class MachiningProductParams extends QueryParams { + + private String productCode; + + private String productName; + + private String specification; + + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSpecification() { + return specification; + } + + public void setSpecification(String specification) { + this.specification = specification; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java new file mode 100644 index 0000000..3a17e6e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java @@ -0,0 +1,27 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: 蔡翔 + * @Date: 2019/10/28 13:33 + * @Version 1.0 + */ +public class MachiningProductVo extends MachiningProduct { + private String specificationBom; + private Integer unitName; + + public String getSpecificationBom() { + return specificationBom; + } + + public void setSpecificationBom(String specificationBom) { + this.specificationBom = specificationBom; + } + + public Integer getUnitName() { + return unitName; + } + + public void setUnitName(Integer unitName) { + this.unitName = unitName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialInfoVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialInfoVo.java new file mode 100644 index 0000000..df086f2 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialInfoVo.java @@ -0,0 +1,27 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: 蔡翔 + * @Date: 2019/10/31 14:09 + * @Version 1.0 + */ +public class MaterialInfoVo extends MaterialsInfo { + private String specificationMaterilasBom; + private float dosage; + + public String getSpecificationMaterilasBom() { + return specificationMaterilasBom; + } + + public void setSpecificationMaterilasBom(String specificationMaterilasBom) { + this.specificationMaterilasBom = specificationMaterilasBom; + } + + public float getDosage() { + return dosage; + } + + public void setDosage(float dosage) { + this.dosage = dosage; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfo.java new file mode 100644 index 0000000..e0ff7a3 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfo.java @@ -0,0 +1,298 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_materials_info") +public class MaterialsInfo { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 物料名称 + */ + @Column(name = "materials_name") + private String materialsName; + + /** + * 父类物料 + */ + @Column(name = "parent_id") + private Integer parentId; + + /** + * 物料编码 + */ + private String code; + + /** + * 单位id + */ + @Column(name = "unit_id") + private Integer unitId; + + /** + * 规格 + */ + private String specification; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * 供应商id + */ + @Column(name = "supplier_id") + private Integer supplierId; + + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取物料名称 + * + * @return materials_name - 物料名称 + */ + public String getMaterialsName() { + return materialsName; + } + + /** + * 设置物料名称 + * + * @param materialsName 物料名称 + */ + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } + + /** + * 获取父类物料 + * + * @return parent_id - 父类物料 + */ + public Integer getParentId() { + return parentId; + } + + /** + * 设置父类物料 + * + * @param parentId 父类物料 + */ + public void setParentId(Integer parentId) { + this.parentId = parentId; + } + + /** + * 获取物料编码 + * + * @return code - 物料编码 + */ + public String getCode() { + return code; + } + + /** + * 设置物料编码 + * + * @param code 物料编码 + */ + public void setCode(String code) { + this.code = code; + } + + /** + * 获取单位id + * + * @return unit_id - 单位id + */ + public Integer getUnitId() { + return unitId; + } + + /** + * 设置单位id + * + * @param unitId 单位id + */ + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + /** + * 获取规格 + * + * @return specification - 规格 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格 + * + * @param specification 规格 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } + + /** + * @return supplier_id + */ + public Integer getSupplierId() { + return supplierId; + } + + /** + * @param supplierId + */ + public void setSupplierId(Integer supplierId) { + this.supplierId = supplierId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoDto.java new file mode 100644 index 0000000..467aa66 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoDto.java @@ -0,0 +1,68 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/7/21 18:08 + * @Version 1.0 + * + * 物料基础信息，集成库存、公司、供应商、单位等信息 + * + */ + + +public class MaterialsInfoDto extends MaterialsInfo{ + private String positionName; + private Float quantity; + private String companyName; + private String unitName; + private String parentName; + private String supplierName; + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getPositionName() { + return positionName; + } + + public void setPositionName(String positionName) { + this.positionName = positionName; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getParentName() { + return parentName; + } + + public void setParentName(String parentName) { + this.parentName = parentName; + } + + public Float getQuantity() { + return quantity; + } + + public void setQuantity(Float quantity) { + this.quantity = quantity; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoParams.java new file mode 100644 index 0000000..e18be07 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoParams.java @@ -0,0 +1,72 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by guo on 2019/07/18. +*/ +public class MaterialsInfoParams extends QueryParams { + /** + * 开始时间 + */ + private String begDate; + + /** + * 结束时间 + */ + private String endDate; + + /** + * 物料id + */ + private Integer materialsId; + + /** + * 物料名字 + **/ + private String materialName; + /** + * 物料code + **/ + private String materialCode; + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getBegDate() { + return begDate; + } + + public void setBegDate(String begDate) { + this.begDate = begDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public Integer getMaterialsId() { + return materialsId; + } + + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoVO.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoVO.java new file mode 100644 index 0000000..91deeed --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoVO.java @@ -0,0 +1,110 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: 蔡翔 + * @Date: 2019/10/9 13:09 + * @Version 1.0 + */ +public class MaterialsInfoVO extends MaterialsInfo { + /** + * 操作员id + */ + private Integer operatorId; + + /** + * 工序bom 的id + **/ + private Integer processBomId; + + /** + * 物料编码 + **/ + private String code; + + /** + * 规格类型 + **/ + private String specification; + + /** + * 用量 + **/ + private float dosage; + + /** + * 单位id + **/ + private Integer unitId; + + /** + * 备注 + **/ + private String memo; + + @Override + public Integer getOperatorId() { + return operatorId; + } + + @Override + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + public Integer getProcessBomId() { + return processBomId; + } + + public void setProcessBomId(Integer processBomId) { + this.processBomId = processBomId; + } + + @Override + public String getCode() { + return code; + } + + @Override + public void setCode(String code) { + this.code = code; + } + + @Override + public String getSpecification() { + return specification; + } + + @Override + public void setSpecification(String specification) { + this.specification = specification; + } + + public float getDosage() { + return dosage; + } + + public void setDosage(float dosage) { + this.dosage = dosage; + } + + @Override + public Integer getUnitId() { + return unitId; + } + + @Override + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + @Override + public String getMemo() { + return memo; + } + + @Override + public void setMemo(String memo) { + this.memo = memo; + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLog.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLog.java new file mode 100644 index 0000000..fefa6fa --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLog.java @@ -0,0 +1,277 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_materials_outgoing_log") +public class MaterialsOutgoingLog { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 状态 0：入库，1：出库 + */ + private Integer type; + + /** + * 物料id, 关联表：mt_alone_materials_info + */ + @Column(name = "materials_id") + private Integer materialsId; + + /** + * 物料名称 + */ + @Column(name = "materials_name") + private String materialsName; + + /** + * 数量 + */ + private Float quantity; + + /** + * 仓位名称 + */ + @Column(name = "position_name") + private String positionName; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取状态 0：入库，1：出库 + * + * @return type - 状态 0：入库，1：出库 + */ + public Integer getType() { + return type; + } + + /** + * 设置状态 0：入库，1：出库 + * + * @param type 状态 0：入库，1：出库 + */ + public void setType(Integer type) { + this.type = type; + } + + /** + * 获取物料id, 关联表：mt_alone_materials_info + * + * @return materials_id - 物料id, 关联表：mt_alone_materials_info + */ + public Integer getMaterialsId() { + return materialsId; + } + + /** + * 设置物料id, 关联表：mt_alone_materials_info + * + * @param materialsId 物料id, 关联表：mt_alone_materials_info + */ + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } + + /** + * 获取物料名称 + * + * @return materials_name - 物料名称 + */ + public String getMaterialsName() { + return materialsName; + } + + /** + * 设置物料名称 + * + * @param materialsName 物料名称 + */ + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } + + /** + * 获取数量 + * + * @return quantity - 数量 + */ + public Float getQuantity() { + return quantity; + } + + /** + * 设置数量 + * + * @param quantity 数量 + */ + public void setQuantity(Float quantity) { + this.quantity = quantity; + } + + /** + * 获取仓位名称 + * + * @return position_name - 仓位名称 + */ + public String getPositionName() { + return positionName; + } + + /** + * 设置仓位名称 + * + * @param positionName 仓位名称 + */ + public void setPositionName(String positionName) { + this.positionName = positionName; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogDto.java new file mode 100644 index 0000000..1d66966 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogDto.java @@ -0,0 +1,42 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/8/20 11:23 + * @Version 1.0 + */ +public class MaterialsOutgoingLogDto extends MaterialsOutgoingLog { + + private Integer materialsId; + + private String materialsName; + + private Integer unitId; + + @Override + public Integer getMaterialsId() { + return materialsId; + } + + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } + + @Override + public String getMaterialsName() { + return materialsName; + } + + @Override + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } + + public Integer getUnitId() { + return unitId; + } + + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogParams.java new file mode 100644 index 0000000..5fd6a13 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogParams.java @@ -0,0 +1,30 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.produce.manage.constant.ProduceManageConstant; +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by guo on 2019/07/21. +*/ +public class MaterialsOutgoingLogParams extends QueryParams { + + private Integer type = ProduceManageConstant.TYPE_IN;//默认为入库记录 + + private Integer materialsId; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getMaterialsId() { + return materialsId; + } + + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogVo.java new file mode 100644 index 0000000..5507632 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogVo.java @@ -0,0 +1,19 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/8/24 16:30 + * @Version 1.0 + */ +public class MaterialsOutgoingLogVo extends MaterialsOutgoingLog { + + private String userName; + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfo.java new file mode 100644 index 0000000..cd1e52b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfo.java @@ -0,0 +1,254 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_materials_stock_info") +public class MaterialsStockInfo { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 物料id, 关联表：mt_alone_materials_info + */ + @Column(name = "materials_id") + private Integer materialsId; + + /** + * 数量， 发起工序操作后数据可以为负数 + */ + private Float quantity; + + /** + * 单位id, 关联单位表：unit + */ + @Column(name = "unit_id") + private Integer unitId; + + /** + * 仓位名称 + */ + @Column(name = "position_name") + private String positionName; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取物料id, 关联表：mt_alone_materials_info + * + * @return materials_id - 物料id, 关联表：mt_alone_materials_info + */ + public Integer getMaterialsId() { + return materialsId; + } + + /** + * 设置物料id, 关联表：mt_alone_materials_info + * + * @param materialsId 物料id, 关联表：mt_alone_materials_info + */ + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } + + /** + * 获取数量， 发起工序操作后数据可以为负数 + * + * @return quantity - 数量， 发起工序操作后数据可以为负数 + */ + public Float getQuantity() { + return quantity; + } + + /** + * 设置数量， 发起工序操作后数据可以为负数 + * + * @param quantity 数量， 发起工序操作后数据可以为负数 + */ + public void setQuantity(Float quantity) { + this.quantity = quantity; + } + + /** + * 获取单位id, 关联单位表：unit + * + * @return unit_id - 单位id, 关联单位表：unit + */ + public Integer getUnitId() { + return unitId; + } + + /** + * 设置单位id, 关联单位表：unit + * + * @param unitId 单位id, 关联单位表：unit + */ + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + /** + * 获取仓位名称 + * + * @return position_name - 仓位名称 + */ + public String getPositionName() { + return positionName; + } + + /** + * 设置仓位名称 + * + * @param positionName 仓位名称 + */ + public void setPositionName(String positionName) { + this.positionName = positionName; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfoParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfoParams.java new file mode 100644 index 0000000..389bef5 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfoParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by guo on 2019/07/21. +*/ +public class MaterialsStockInfoParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsVo.java new file mode 100644 index 0000000..8567ca7 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsVo.java @@ -0,0 +1,30 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/7/28 15:52 + * @Version 1.0 + * + * 包含物料信息和库存信息共同属性的类，用于在一个界面上获取两个对象所有字段信息并存入数据库 + */ +public class MaterialsVo { + private MaterialsInfo materialsInfo; + + private MaterialsStockInfo materialsStockInfo; + + public MaterialsInfo getMaterialsInfo() { + return materialsInfo; + } + + public void setMaterialsInfo(MaterialsInfo materialsInfo) { + this.materialsInfo = materialsInfo; + } + + public MaterialsStockInfo getMaterialsStockInfo() { + return materialsStockInfo; + } + + public void setMaterialsStockInfo(MaterialsStockInfo materialsStockInfo) { + this.materialsStockInfo = materialsStockInfo; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java new file mode 100644 index 0000000..2421099 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java @@ -0,0 +1,637 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process") +public class MtAloneProcess { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序名称 + */ + @Column(name = "process_name") + private String processName; + + /** + * 产品生产过程id，关联表：mt_alone_product_process + */ + @Column(name = "product_process_id") + private Integer productProcessId; + + /** + * 工序编码，编码规则：GX+日期 + */ + private String code; + + /** + * 规格型号 + */ + private String specification; + + /** + * 工序来源：0本厂加工，1外厂协作，2外购 + */ + @Column(name = "process_source") + private Integer processSource; + + /** + * 加工价格 元 + */ + @Column(name = "process_price") + private Float processPrice; + + /** + * 加工单价 元/米 + */ + @Column(name = "process_unit_price") + private Float processUnitPrice; + + /** + * 原先长度，单位米 + */ + @Column(name = "original_len") + private Float originalLen; + + /** + * 损耗%比 + */ + private Float loss; + + /** + * 加工后长度，单位米 + */ + @Column(name = "after_len") + private Float afterLen; + + /** + * 缩率%，现有检测长度/原先长度 + */ + private Float shrinkage; + + + /** + * 加工描述内容 + */ + @Column(name = "process_content") + private String processContent; + + /** + * 加工商id，关联表供应商表：supplier_manage + */ + @Column(name = "supplier_id") + private Integer supplierId; + + /** + * 工序步骤，从第一步开始，依次增加 + */ + @Column(name = "process_step") + private Integer processStep; + + /** + * 跟单员id，关联表员工表：user_info + */ + @Column(name = "merchandiser_id") + private Integer merchandiserId; + + /** + * 产品条形码 + */ + @Column(name = "product_bar_code") + private String productBarCode; + + /** + * 工序bom关联id，关联工序bom表：mt_alone_process_bom + */ + @Column(name = "process_bom_id") + private Integer processBomId; + + /** + * 工序bom名称 + */ + @Column(name = "process_bom_name") + private String processBomName; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序名称 + * + * @return process_name - 工序名称 + */ + public String getProcessName() { + return processName; + } + + /** + * 设置工序名称 + * + * @param processName 工序名称 + */ + public void setProcessName(String processName) { + this.processName = processName; + } + + /** + * 获取产品生产过程id，关联表：mt_alone_product_process + * + * @return product_process_id - 产品生产过程id，关联表：mt_alone_product_process + */ + public Integer getProductProcessId() { + return productProcessId; + } + + /** + * 设置产品生产过程id，关联表：mt_alone_product_process + * + * @param productProcessId 产品生产过程id，关联表：mt_alone_product_process + */ + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + /** + * 获取工序编码，编码规则：GX+日期 + * + * @return code - 工序编码，编码规则：GX+日期 + */ + public String getCode() { + return code; + } + + /** + * 设置工序编码，编码规则：GX+日期 + * + * @param code 工序编码，编码规则：GX+日期 + */ + public void setCode(String code) { + this.code = code; + } + + /** + * 获取规格型号 + * + * @return specification - 规格型号 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格型号 + * + * @param specification 规格型号 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取工序来源：0本厂加工，1外厂协作，2外购 + * + * @return process_source - 工序来源：0本厂加工，1外厂协作，2外购 + */ + public Integer getProcessSource() { + return processSource; + } + + /** + * 设置工序来源：0本厂加工，1外厂协作，2外购 + * + * @param processSource 工序来源：0本厂加工，1外厂协作，2外购 + */ + public void setProcessSource(Integer processSource) { + this.processSource = processSource; + } + + /** + * 获取加工价格 元 + * + * @return process_price - 加工价格 元 + */ + public Float getProcessPrice() { + return processPrice; + } + + /** + * 设置加工价格 元 + * + * @param processPrice 加工价格 元 + */ + public void setProcessPrice(Float processPrice) { + this.processPrice = processPrice; + } + + /** + * 获取加工单价 元/米 + * + * @return process_unit_price - 加工单价 元/米 + */ + public Float getProcessUnitPrice() { + return processUnitPrice; + } + + /** + * 设置加工单价 元/米 + * + * @param processUnitPrice 加工单价 元/米 + */ + public void setProcessUnitPrice(Float processUnitPrice) { + this.processUnitPrice = processUnitPrice; + } + + /** + * 获取原先长度，单位米 + * + * @return original_len - 原先长度，单位米 + */ + public Float getOriginalLen() { + return originalLen; + } + + /** + * 设置原先长度，单位米 + * + * @param originalLen 原先长度，单位米 + */ + public void setOriginalLen(Float originalLen) { + this.originalLen = originalLen; + } + + /** + * 获取损耗%比 + * + * @return loss - 损耗%比 + */ + public Float getLoss() { + return loss; + } + + /** + * 设置损耗%比 + * + * @param loss 损耗%比 + */ + public void setLoss(Float loss) { + this.loss = loss; + } + + /** + * 获取加工后长度，单位米 + * + * @return after_len - 加工后长度，单位米 + */ + public Float getAfterLen() { + return afterLen; + } + + /** + * 设置加工后长度，单位米 + * + * @param afterLen 加工后长度，单位米 + */ + public void setAfterLen(Float afterLen) { + this.afterLen = afterLen; + } + + + /** + * 获取缩率%，现有检测长度/原先长度 + * + * @return shrinkage - 缩率%，现有检测长度/原先长度 + */ + public Float getShrinkage() { + return shrinkage; + } + + /** + * 设置缩率%，现有检测长度/原先长度 + * + * @param shrinkage 缩率%，现有检测长度/原先长度 + */ + public void setShrinkage(Float shrinkage) { + this.shrinkage = shrinkage; + } + + /** + * 获取加工描述内容 + * + * @return process_content - 加工描述内容 + */ + public String getProcessContent() { + return processContent; + } + + /** + * 设置加工描述内容 + * + * @param processContent 加工描述内容 + */ + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + /** + * 获取加工商id，关联表供应商表：supplier_manage + * + * @return supplier_id - 加工商id，关联表供应商表：supplier_manage + */ + public Integer getSupplierId() { + return supplierId; + } + + /** + * 设置加工商id，关联表供应商表：supplier_manage + * + * @param supplierId 加工商id，关联表供应商表：supplier_manage + */ + public void setSupplierId(Integer supplierId) { + this.supplierId = supplierId; + } + + /** + * 获取工序步骤，从第一步开始，依次增加 + * + * @return process_step - 工序步骤，从第一步开始，依次增加 + */ + public Integer getProcessStep() { + return processStep; + } + + /** + * 设置工序步骤，从第一步开始，依次增加 + * + * @param processStep 工序步骤，从第一步开始，依次增加 + */ + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } + + /** + * 获取跟单员id，关联表员工表：user_info + * + * @return merchandiser_id - 跟单员id，关联表员工表：user_info + */ + public Integer getMerchandiserId() { + return merchandiserId; + } + + /** + * 设置跟单员id，关联表员工表：user_info + * + * @param merchandiserId 跟单员id，关联表员工表：user_info + */ + public void setMerchandiserId(Integer merchandiserId) { + this.merchandiserId = merchandiserId; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } + + /** + * 获取产品条形码 + * + * @return product_bar_code - 产品条形码 + */ + public String getProductBarCode() { + return productBarCode; + } + + /** + * 设置产品条形码 + * + * @param productBarCode 产品条形码 + */ + public void setProductBarCode(String productBarCode) { + this.productBarCode = productBarCode; + } + + /** + * 获取工序bom关联id，关联工序bom表：mt_alone_process_bom + * + * @return process_bom_id - 工序bom关联id，关联工序bom表：mt_alone_process_bom + */ + public Integer getProcessBomId() { + return processBomId; + } + + /** + * 设置工序bom关联id，关联工序bom表：mt_alone_process_bom + * + * @param processBomId 工序bom关联id，关联工序bom表：mt_alone_process_bom + */ + public void setProcessBomId(Integer processBomId) { + this.processBomId = processBomId; + } + + /** + * 获取工序bom名称 + * + * @return process_bom_name - 工序bom名称 + */ + public String getProcessBomName() { + return processBomName; + } + + /** + * 设置工序bom名称 + * + * @param processBomName 工序bom名称 + */ + public void setProcessBomName(String processBomName) { + this.processBomName = processBomName; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethods.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethods.java new file mode 100644 index 0000000..382908b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethods.java @@ -0,0 +1,286 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_process_methods") +public class MtAloneProcessMethods { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 创建人id + */ + @Column(name = "creator_id") + private Long creatorId; + + /** + * 更新人id + */ + @Column(name = "updater_id") + private Long updaterId; + + /** + * 版本号 默认为 1 + */ + private String version; + + /** + * 状态 0处理中，1处理完成 + */ + private Integer status; + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Long companyId; + + /** + * 加工方式编码 + */ + @Column(name = "process_methods_code") + private String processMethodsCode; + + /** + * 加工方式名称 + */ + @Column(name = "process_methods_name") + private String processMethodsName; + + /** + * 备注 + */ + private String note; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取创建人id + * + * @return creator_id - 创建人id + */ + public Long getCreatorId() { + return creatorId; + } + + /** + * 设置创建人id + * + * @param creatorId 创建人id + */ + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + /** + * 获取更新人id + * + * @return updater_id - 更新人id + */ + public Long getUpdaterId() { + return updaterId; + } + + /** + * 设置更新人id + * + * @param updaterId 更新人id + */ + public void setUpdaterId(Long updaterId) { + this.updaterId = updaterId; + } + + /** + * 获取版本号 默认为 1 + * + * @return version - 版本号 默认为 1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1 + * + * @param version 版本号 默认为 1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0处理中，1处理完成 + * + * @return status - 状态 0处理中，1处理完成 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0处理中，1处理完成 + * + * @param status 状态 0处理中，1处理完成 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Long getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + /** + * 获取加工方式编码 + * + * @return process_methods_code - 加工方式编码 + */ + public String getProcessMethodsCode() { + return processMethodsCode; + } + + /** + * 设置加工方式编码 + * + * @param processMethodsCode 加工方式编码 + */ + public void setProcessMethodsCode(String processMethodsCode) { + this.processMethodsCode = processMethodsCode; + } + + /** + * 获取加工方式名称 + * + * @return process_methods_name - 加工方式名称 + */ + public String getProcessMethodsName() { + return processMethodsName; + } + + /** + * 设置加工方式名称 + * + * @param processMethodsName 加工方式名称 + */ + public void setProcessMethodsName(String processMethodsName) { + this.processMethodsName = processMethodsName; + } + + /** + * 获取备注 + * + * @return note - 备注 + */ + public String getNote() { + return note; + } + + /** + * 设置备注 + * + * @param note 备注 + */ + public void setNote(String note) { + this.note = note; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethodsParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethodsParams.java new file mode 100644 index 0000000..ff9098d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethodsParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/10/16. +*/ +public class MtAloneProcessMethodsParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java new file mode 100644 index 0000000..99f37c9 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java @@ -0,0 +1,19 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by hy on 2019/07/19. +*/ +public class MtAloneProcessParams extends QueryParams { + + private Integer productBomId; + + public Integer getProductBomId() { + return productBomId; + } + + public void setProductBomId(Integer productBomId) { + this.productBomId = productBomId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductName.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductName.java new file mode 100644 index 0000000..0a30ff8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductName.java @@ -0,0 +1,286 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_product_name") +public class MtAloneProductName { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 创建人id + */ + @Column(name = "creator_id") + private Long creatorId; + + /** + * 更新人id + */ + @Column(name = "updater_id") + private Long updaterId; + + /** + * 版本号 默认为 1 + */ + private String version; + + /** + * 状态 0处理中，1处理完成 + */ + private Integer status; + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Long companyId; + + /** + * 品名编码 + */ + @Column(name = "product_name_code") + private String productNameCode; + + /** + * 品名 + */ + @Column(name = "product_name") + private String productName; + + /** + * 备注 + */ + private String note; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取创建人id + * + * @return creator_id - 创建人id + */ + public Long getCreatorId() { + return creatorId; + } + + /** + * 设置创建人id + * + * @param creatorId 创建人id + */ + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + /** + * 获取更新人id + * + * @return updater_id - 更新人id + */ + public Long getUpdaterId() { + return updaterId; + } + + /** + * 设置更新人id + * + * @param updaterId 更新人id + */ + public void setUpdaterId(Long updaterId) { + this.updaterId = updaterId; + } + + /** + * 获取版本号 默认为 1 + * + * @return version - 版本号 默认为 1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1 + * + * @param version 版本号 默认为 1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0处理中，1处理完成 + * + * @return status - 状态 0处理中，1处理完成 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0处理中，1处理完成 + * + * @param status 状态 0处理中，1处理完成 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Long getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + /** + * 获取品名编码 + * + * @return product_name_code - 品名编码 + */ + public String getProductNameCode() { + return productNameCode; + } + + /** + * 设置品名编码 + * + * @param productNameCode 品名编码 + */ + public void setProductNameCode(String productNameCode) { + this.productNameCode = productNameCode; + } + + /** + * 获取品名 + * + * @return product_name - 品名 + */ + public String getProductName() { + return productName; + } + + /** + * 设置品名 + * + * @param productName 品名 + */ + public void setProductName(String productName) { + this.productName = productName; + } + + /** + * 获取备注 + * + * @return note - 备注 + */ + public String getNote() { + return note; + } + + /** + * 设置备注 + * + * @param note 备注 + */ + public void setNote(String note) { + this.note = note; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductNameParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductNameParams.java new file mode 100644 index 0000000..3ad19f1 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductNameParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/10/16. +*/ +public class MtAloneProductNameParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumber.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumber.java new file mode 100644 index 0000000..eaf758d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumber.java @@ -0,0 +1,353 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_serial_number") +public class MtAloneSerialNumber { + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 创建人id + */ + @Column(name = "creator_id") + private Long creatorId; + + /** + * 更新人id + */ + @Column(name = "updater_id") + private Long updaterId; + + /** + * 版本号 默认为 1 + */ + private String version; + + /** + * 状态 0处理中，1处理完成 + */ + private Integer status; + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Long companyId; + + /** + * 一级大类 + */ + @Column(name = "first_large_class") + private String firstLargeClass; + + /** + * 品名 + */ + @Column(name = "product_name") + private String productName; + + /** + * 分类名称 + */ + @Column(name = "sort_name") + private String sortName; + + /** + * 计数器 + */ + @Column(name = "pin_counter") + private Integer pinCounter; + + /** + * 备注 + */ + private String note; + + /** + * @return id + */ + public Long getId() { + return id; + } + + /** + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取创建人id + * + * @return creator_id - 创建人id + */ + public Long getCreatorId() { + return creatorId; + } + + /** + * 设置创建人id + * + * @param creatorId 创建人id + */ + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + /** + * 获取更新人id + * + * @return updater_id - 更新人id + */ + public Long getUpdaterId() { + return updaterId; + } + + /** + * 设置更新人id + * + * @param updaterId 更新人id + */ + public void setUpdaterId(Long updaterId) { + this.updaterId = updaterId; + } + + /** + * 获取版本号 默认为 1 + * + * @return version - 版本号 默认为 1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1 + * + * @param version 版本号 默认为 1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0处理中，1处理完成 + * + * @return status - 状态 0处理中，1处理完成 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0处理中，1处理完成 + * + * @param status 状态 0处理中，1处理完成 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Long getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + /** + * 获取一级大类 + * + * @return first_large_class - 一级大类 + */ + public String getFirstLargeClass() { + return firstLargeClass; + } + + /** + * 设置一级大类 + * + * @param firstLargeClass 一级大类 + */ + public void setFirstLargeClass(String firstLargeClass) { + this.firstLargeClass = firstLargeClass; + } + + /** + * 获取品名 + * + * @return product_name - 品名 + */ + public String getProductName() { + return productName; + } + + /** + * 设置品名 + * + * @param productName 品名 + */ + public void setProductName(String productName) { + this.productName = productName; + } + + /** + * 获取分类名称 + * + * @return sort_name - 分类名称 + */ + public String getSortName() { + return sortName; + } + + /** + * 设置分类名称 + * + * @param sortName 分类名称 + */ + public void setSortName(String sortName) { + this.sortName = sortName; + } + + /** + * 获取计数器 + * + * @return pin_counter - 计数器 + */ + public Integer getPinCounter() { + return pinCounter; + } + + /** + * 设置计数器 + * + * @param pinCounter 计数器 + */ + public void setPinCounter(Integer pinCounter) { + this.pinCounter = pinCounter; + } + + /** + * 获取备注 + * + * @return note - 备注 + */ + public String getNote() { + return note; + } + + /** + * 设置备注 + * + * @param note 备注 + */ + public void setNote(String note) { + this.note = note; + } + + @Override + public String toString() { + return "MtAloneSerialNumber{" + + "id=" + id + + ", operatorId=" + operatorId + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", creatorId=" + creatorId + + ", updaterId=" + updaterId + + ", version='" + version + '\'' + + ", status=" + status + + ", companyId=" + companyId + + ", firstLargeClass='" + firstLargeClass + '\'' + + ", productName='" + productName + '\'' + + ", sortName='" + sortName + '\'' + + ", pinCounter=" + pinCounter + + ", note='" + note + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumberParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumberParams.java new file mode 100644 index 0000000..1afd677 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumberParams.java @@ -0,0 +1,38 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/10/17. +*/ +public class MtAloneSerialNumberParams extends QueryParams { + private String firstLargeClass; + + private String productName; + + private String sortName; + + public String getFirstLargeClass() { + return firstLargeClass; + } + + public void setFirstLargeClass(String firstLargeClass) { + this.firstLargeClass = firstLargeClass; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSortName() { + return sortName; + } + + public void setSortName(String sortName) { + this.sortName = sortName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConf.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConf.java new file mode 100644 index 0000000..bed5764 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConf.java @@ -0,0 +1,271 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_number_conf") +public class MtNumberConf { + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 创建人id + */ + @Column(name = "creator_id") + private Long creatorId; + + /** + * 更新人id + */ + @Column(name = "updater_id") + private Long updaterId; + + /** + * 版本号 默认为 1 + */ + private String version; + + /** + * 状态 0处理中，1处理完成 + */ + private Integer status; + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Long companyId; + + /** + * 品号序号，初始值为5000，每次增加1，然后存储 + */ + @Column(name = "pin_serial") + private Integer pinSerial; + + private String remark; + + /** + * @return id + */ + public Long getId() { + return id; + } + + /** + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取创建人id + * + * @return creator_id - 创建人id + */ + public Long getCreatorId() { + return creatorId; + } + + /** + * 设置创建人id + * + * @param creatorId 创建人id + */ + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + /** + * 获取更新人id + * + * @return updater_id - 更新人id + */ + public Long getUpdaterId() { + return updaterId; + } + + /** + * 设置更新人id + * + * @param updaterId 更新人id + */ + public void setUpdaterId(Long updaterId) { + this.updaterId = updaterId; + } + + /** + * 获取版本号 默认为 1 + * + * @return version - 版本号 默认为 1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1 + * + * @param version 版本号 默认为 1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0处理中，1处理完成 + * + * @return status - 状态 0处理中，1处理完成 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0处理中，1处理完成 + * + * @param status 状态 0处理中，1处理完成 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Long getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + /** + * 获取品号序号，初始值为5000，每次增加1，然后存储 + * + * @return pin_serial - 品号序号，初始值为5000，每次增加1，然后存储 + */ + public Integer getPinSerial() { + return pinSerial; + } + + /** + * 设置品号序号，初始值为5000，每次增加1，然后存储 + * + * @param pinSerial 品号序号，初始值为5000，每次增加1，然后存储 + */ + public void setPinSerial(Integer pinSerial) { + this.pinSerial = pinSerial; + } + + /** + * @return remark + */ + public String getRemark() { + return remark; + } + + /** + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } + + @Override + public String toString() { + return "MtNumberConf{" + + "id=" + id + + ", operatorId=" + operatorId + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", creatorId=" + creatorId + + ", updaterId=" + updaterId + + ", version='" + version + '\'' + + ", status=" + status + + ", companyId=" + companyId + + ", pinSerial=" + pinSerial + + ", remark='" + remark + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConfParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConfParams.java new file mode 100644 index 0000000..14e1512 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConfParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/10/17. +*/ +public class MtNumberConfParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendor.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendor.java new file mode 100644 index 0000000..cd2b1bc --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendor.java @@ -0,0 +1,489 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_stock_provendor") +public class MtStockProvendor { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 创建人id + */ + @Column(name = "creator_id") + private Long creatorId; + + /** + * 更新人id + */ + @Column(name = "updater_id") + private Long updaterId; + + /** + * 版本号 默认为 1 + */ + private String version; + + /** + * 状态 0处理中，1处理完成 + */ + private Integer status; + + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Long companyId; + + /** + * 供应商类型，1表示公司，2个人 + */ + @Column(name = "provendor_type") + private Integer provendorType; + + /** + * 供应商编码 + */ + @Column(name = "customer_code") + private String customerCode; + + /** + * 供应商名称 + */ + @Column(name = "provendor_name") + private String provendorName; + + /** + * 供货类型，一级大类下拉框 + */ + @Column(name = "first_large_class") + private String firstLargeClass; + + /** + * 传真 + */ + private String fax; + + /** + * 联系人名称 + */ + @Column(name = "contact_name") + private String contactName; + + /** + * 联系人电话 + */ + private String tel; + + /** + * 单位职务 + */ + private String position; + + /** + * 性别，单选框 + */ + private String gender; + + /** + * 联系地址，详细地址 + */ + private String address; + + /** + * 描述信息，描述供应商一般性信息 + */ + private String description; + + private String remark; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取创建人id + * + * @return creator_id - 创建人id + */ + public Long getCreatorId() { + return creatorId; + } + + /** + * 设置创建人id + * + * @param creatorId 创建人id + */ + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + /** + * 获取更新人id + * + * @return updater_id - 更新人id + */ + public Long getUpdaterId() { + return updaterId; + } + + /** + * 设置更新人id + * + * @param updaterId 更新人id + */ + public void setUpdaterId(Long updaterId) { + this.updaterId = updaterId; + } + + /** + * 获取版本号 默认为 1 + * + * @return version - 版本号 默认为 1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1 + * + * @param version 版本号 默认为 1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0处理中，1处理完成 + * + * @return status - 状态 0处理中，1处理完成 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0处理中，1处理完成 + * + * @param status 状态 0处理中，1处理完成 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取绑定公司id + * + * @return company_id - 绑定公司id + */ + public Long getCompanyId() { + return companyId; + } + + /** + * 设置绑定公司id + * + * @param companyId 绑定公司id + */ + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + /** + * 获取供应商类型，1表示公司，2个人 + * + * @return provendor_type - 供应商类型，1表示公司，2个人 + */ + public Integer getProvendorType() { + return provendorType; + } + + /** + * 设置供应商类型，1表示公司，2个人 + * + * @param provendorType 供应商类型，1表示公司，2个人 + */ + public void setProvendorType(Integer provendorType) { + this.provendorType = provendorType; + } + + /** + * 获取供应商编码 + * + * @return customer_code - 供应商编码 + */ + public String getCustomerCode() { + return customerCode; + } + + /** + * 设置供应商编码 + * + * @param customerCode 供应商编码 + */ + public void setCustomerCode(String customerCode) { + this.customerCode = customerCode; + } + + /** + * 获取供应商名称 + * + * @return provendor_name - 供应商名称 + */ + public String getProvendorName() { + return provendorName; + } + + /** + * 设置供应商名称 + * + * @param provendorName 供应商名称 + */ + public void setProvendorName(String provendorName) { + this.provendorName = provendorName; + } + + /** + * 获取供货类型，一级大类下拉框 + * + * @return first_large_class - 供货类型，一级大类下拉框 + */ + public String getFirstLargeClass() { + return firstLargeClass; + } + + /** + * 设置供货类型，一级大类下拉框 + * + * @param firstLargeClass 供货类型，一级大类下拉框 + */ + public void setFirstLargeClass(String firstLargeClass) { + this.firstLargeClass = firstLargeClass; + } + + /** + * 获取传真 + * + * @return fax - 传真 + */ + public String getFax() { + return fax; + } + + /** + * 设置传真 + * + * @param fax 传真 + */ + public void setFax(String fax) { + this.fax = fax; + } + + /** + * 获取联系人名称 + * + * @return contact_name - 联系人名称 + */ + public String getContactName() { + return contactName; + } + + /** + * 设置联系人名称 + * + * @param contactName 联系人名称 + */ + public void setContactName(String contactName) { + this.contactName = contactName; + } + + /** + * 获取联系人电话 + * + * @return tel - 联系人电话 + */ + public String getTel() { + return tel; + } + + /** + * 设置联系人电话 + * + * @param tel 联系人电话 + */ + public void setTel(String tel) { + this.tel = tel; + } + + /** + * 获取单位职务 + * + * @return position - 单位职务 + */ + public String getPosition() { + return position; + } + + /** + * 设置单位职务 + * + * @param position 单位职务 + */ + public void setPosition(String position) { + this.position = position; + } + + /** + * 获取性别，单选框 + * + * @return gender - 性别，单选框 + */ + public String getGender() { + return gender; + } + + /** + * 设置性别，单选框 + * + * @param gender 性别，单选框 + */ + public void setGender(String gender) { + this.gender = gender; + } + + /** + * 获取联系地址，详细地址 + * + * @return address - 联系地址，详细地址 + */ + public String getAddress() { + return address; + } + + /** + * 设置联系地址，详细地址 + * + * @param address 联系地址，详细地址 + */ + public void setAddress(String address) { + this.address = address; + } + + /** + * 获取描述信息，描述供应商一般性信息 + * + * @return description - 描述信息，描述供应商一般性信息 + */ + public String getDescription() { + return description; + } + + /** + * 设置描述信息，描述供应商一般性信息 + * + * @param description 描述信息，描述供应商一般性信息 + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return remark + */ + public String getRemark() { + return remark; + } + + /** + * @param remark + */ + public void setRemark(String remark) { + this.remark = remark; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendorParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendorParams.java new file mode 100644 index 0000000..1e57484 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendorParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/10/17. +*/ +public class MtStockProvendorParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelat.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelat.java new file mode 100644 index 0000000..69265a6 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelat.java @@ -0,0 +1,350 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_process_batch_relat") +public class ProcessBatchRelat { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 批次id，关联产品加工批次表：mt_alone_product_process_batch + */ + @Column(name = "batch_id") + private Integer batchId; + + /** + * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 批次号 + */ + @Column(name = "batch_code") + private String batchCode; + + /** + * 原先提供长度，单位米 + */ + private Float len; + + /** + * 配送长度，单位米 + */ + @Column(name = "delivery_len") + private Float deliveryLen; + + /** + * 现有检测长度 + */ + @Column(name = "detection_len") + private Float detectionLen; + + /** + * 缩率%，现有检测长度/原先长度 + */ + private String shrinkage; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取批次id，关联产品加工批次表：mt_alone_product_process_batch + * + * @return batch_id - 批次id，关联产品加工批次表：mt_alone_product_process_batch + */ + public Integer getBatchId() { + return batchId; + } + + /** + * 设置批次id，关联产品加工批次表：mt_alone_product_process_batch + * + * @param batchId 批次id，关联产品加工批次表：mt_alone_product_process_batch + */ + public void setBatchId(Integer batchId) { + this.batchId = batchId; + } + + /** + * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取批次号 + * + * @return batch_code - 批次号 + */ + public String getBatchCode() { + return batchCode; + } + + /** + * 设置批次号 + * + * @param batchCode 批次号 + */ + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + /** + * 获取原先提供长度，单位米 + * + * @return len - 原先提供长度，单位米 + */ + public Float getLen() { + return len; + } + + /** + * 设置原先提供长度，单位米 + * + * @param len 原先提供长度，单位米 + */ + public void setLen(Float len) { + this.len = len; + } + + /** + * 获取配送长度，单位米 + * + * @return delivery_len - 配送长度，单位米 + */ + public Float getDeliveryLen() { + return deliveryLen; + } + + /** + * 设置配送长度，单位米 + * + * @param deliveryLen 配送长度，单位米 + */ + public void setDeliveryLen(Float deliveryLen) { + this.deliveryLen = deliveryLen; + } + + /** + * 获取现有检测长度 + * + * @return detection_len - 现有检测长度 + */ + public Float getDetectionLen() { + return detectionLen; + } + + /** + * 设置现有检测长度 + * + * @param detectionLen 现有检测长度 + */ + public void setDetectionLen(Float detectionLen) { + this.detectionLen = detectionLen; + } + + /** + * 获取缩率%，现有检测长度/原先长度 + * + * @return shrinkage - 缩率%，现有检测长度/原先长度 + */ + public String getShrinkage() { + return shrinkage; + } + + /** + * 设置缩率%，现有检测长度/原先长度 + * + * @param shrinkage 缩率%，现有检测长度/原先长度 + */ + public void setShrinkage(String shrinkage) { + this.shrinkage = shrinkage; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelatParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelatParams.java new file mode 100644 index 0000000..9ae5c5b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelatParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/09/09. +*/ +public class ProcessBatchRelatParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBom.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBom.java new file mode 100644 index 0000000..36543e5 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBom.java @@ -0,0 +1,347 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process_bom") +public class ProcessBom { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private Integer version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序名称 + */ + @Column(name = "process_name") + private String processName; + + /** + * 产品生产bom的id，关联表：mt_alone_product_process_bom + */ + @Column(name = "product_process_id") + private Integer productProcessId; + + /** + * 规格型号 + */ + private String specification; + + /** + * 加工描述内容 + */ + @Column(name = "process_content") + private String processContent; + + /** + * 工序步骤，从第一步开始，依次增加 + */ + @Column(name = "process_step") + private Integer processStep; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + private String processNum; + + + private String processApartment; + + public String getProcessNum() { + return processNum; + } + + public void setProcessNum(String processNum) { + this.processNum = processNum; + } + + public String getProcessApartment() { + return processApartment; + } + + public void setProcessApartment(String processApartment) { + this.processApartment = processApartment; + } + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public Integer getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(Integer version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序名称 + * + * @return process_name - 工序名称 + */ + public String getProcessName() { + return processName; + } + + /** + * 设置工序名称 + * + * @param processName 工序名称 + */ + public void setProcessName(String processName) { + this.processName = processName; + } + + /** + * 获取产品生产bom的id，关联表：mt_alone_product_process_bom + * + * @return product_process_id - 产品生产bom的id，关联表：mt_alone_product_process_bom + */ + public Integer getProductProcessId() { + return productProcessId; + } + + /** + * 设置产品生产bom的id，关联表：mt_alone_product_process_bom + * + * @param productProcessId 产品生产bom的id，关联表：mt_alone_product_process_bom + */ + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + /** + * 获取规格型号 + * + * @return specification - 规格型号 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格型号 + * + * @param specification 规格型号 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取加工描述内容 + * + * @return process_content - 加工描述内容 + */ + public String getProcessContent() { + return processContent; + } + + /** + * 设置加工描述内容 + * + * @param processContent 加工描述内容 + */ + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + /** + * 获取工序步骤，从第一步开始，依次增加 + * + * @return process_step - 工序步骤，从第一步开始，依次增加 + */ + public Integer getProcessStep() { + return processStep; + } + + /** + * 设置工序步骤，从第一步开始，依次增加 + * + * @param processStep 工序步骤，从第一步开始，依次增加 + */ + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomDto.java new file mode 100644 index 0000000..9cc1dd1 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomDto.java @@ -0,0 +1,53 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/8/25 13:01 + * @Version 1.0 + */ +public class ProcessBomDto extends ProcessBom{ + + private Integer productProcessId; + + private String productProcessName; + + private String companyName; + + private List processMaterialsBomDtoList; + + public List getProcessMaterialsBomDtoList() { + return processMaterialsBomDtoList; + } + + public void setProcessMaterialsBomDtoList(List processMaterialsBomDtoList) { + this.processMaterialsBomDtoList = processMaterialsBomDtoList; + } + + @Override + public Integer getProductProcessId() { + return productProcessId; + } + + @Override + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + public String getProductProcessName() { + return productProcessName; + } + + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomParams.java new file mode 100644 index 0000000..458d47b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomParams.java @@ -0,0 +1,189 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +import java.util.Date; +import java.util.List; + +/** +* Created by guo on 2019/07/18. +*/ +public class ProcessBomParams extends QueryParams { + /** + *产品生产bom的id + */ + private Integer productProcessId; + + /** + *产品id + */ + private Integer productId; + + /** + * 产品表中的id + */ + private Integer id; + /** + * 添加时间 + */ + private Date createTime; + /** + * 产品加工总名称 + */ + private String productProcessName; + /** + * 加工规格型号 + */ + private String specification; + /** + * 加工描述内容 + */ + private String processContent; + /** + * 备注 + */ + private String memo; + /** + * 工序步骤 + */ + private Integer processStep; + /** + * 工序执行部门 + */ + private String processApartment; + /** + * 工序名称 + */ + private String processName; + + /** + * 物料bom表 + * @return + */ + private List processMaterialsBomParamsList; + + @Override + public String toString() { + return "ProcessBomParams{" + + "productProcessId=" + productProcessId + + ", productId=" + productId + + ", id=" + id + + ", createTime=" + createTime + + ", productProcessName='" + productProcessName + '\'' + + ", specification='" + specification + '\'' + + ", processContent='" + processContent + '\'' + + ", memo='" + memo + '\'' + + ", processStep=" + processStep + + ", processApartment='" + processApartment + '\'' + + ", processName='" + processName + '\'' + + ", processMaterialsBomParamsList=" + processMaterialsBomParamsList + + ", processBomVoList=" + processBomVoList + + '}'; + } + + public List getProcessMaterialsBomParamsList() { + return processMaterialsBomParamsList; + } + + public void setProcessMaterialsBomParamsList(List processMaterialsBomParamsList) { + this.processMaterialsBomParamsList = processMaterialsBomParamsList; + } + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + private List processBomVoList; + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getProductProcessName() { + return productProcessName; + } + + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } + + public String getSpecification() { + return specification; + } + + public void setSpecification(String specification) { + this.specification = specification; + } + + public String getProcessContent() { + return processContent; + } + + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + public Integer getProductProcessId() { + return productProcessId; + } + + public Integer getProcessStep() { + return processStep; + } + + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } + + public String getProcessApartment() { + return processApartment; + } + + public void setProcessApartment(String processApartment) { + this.processApartment = processApartment; + } + + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + public List getProcessBomVoList() { + return processBomVoList; + } + + public void setProcessBomVoList(List processBomVoList) { + this.processBomVoList = processBomVoList; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomVo.java new file mode 100644 index 0000000..2c3c98c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomVo.java @@ -0,0 +1,21 @@ +package com.deer.wms.produce.manage.model; + +import java.util.List; + +/** + * @Author: weihongyang + * @Date: 2019/10/9 9:57 + * @Version 1.0 + */ +public class ProcessBomVo extends ProcessBom{ + + private List list; + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelat.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelat.java new file mode 100644 index 0000000..cae0a26 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelat.java @@ -0,0 +1,232 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process_detect_relat") +public class ProcessDetectRelat { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 产品条码code + */ + @Column(name = "product_bar_code") + private String productBarCode; + + /** + * 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 + */ + @Column(name = "product_bar_det_code") + private String productBarDetCode; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取产品条码code + * + * @return product_bar_code - 产品条码code + */ + public String getProductBarCode() { + return productBarCode; + } + + /** + * 设置产品条码code + * + * @param productBarCode 产品条码code + */ + public void setProductBarCode(String productBarCode) { + this.productBarCode = productBarCode; + } + + /** + * 获取产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 + * + * @return product_bar_det_code - 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 + */ + public String getProductBarDetCode() { + return productBarDetCode; + } + + /** + * 设置产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 + * + * @param productBarDetCode 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 + */ + public void setProductBarDetCode(String productBarDetCode) { + this.productBarDetCode = productBarDetCode; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelatParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelatParams.java new file mode 100644 index 0000000..a007bd1 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelatParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by guo on 2019/07/21. +*/ +public class ProcessDetectRelatParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java new file mode 100644 index 0000000..ee3d4a6 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java @@ -0,0 +1,372 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process_materials") +public class ProcessMaterials { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private Integer version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序id，关联工序表：mt_alone_process + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 物料bom的id，关联物料表：mt_alone_process_materials_bom + */ + @Column(name = "materials_bom_id") + private Integer materialsBomId; + + /** + * 物料名称 + */ + @Column(name = "materials_name") + private String materialsName; + + /** + * 物料编码 + */ + private String code; + + /** + * 规格类型 + */ + private String specification; + + /** + * 用量 + */ + private Float dosage; + + /** + * 单位id + */ + @Column(name = "unit_id") + private Integer unitId; + + /** + * 单位名称 + */ + @Column(name = "unit_name") + private String unitName; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public Integer getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(Integer version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序id，关联工序表：mt_alone_process + * + * @return process_id - 工序id，关联工序表：mt_alone_process + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process + * + * @param processId 工序id，关联工序表：mt_alone_process + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取物料bom的id，关联物料表：mt_alone_process_materials_bom + * + * @return materials_bom_id - 物料bom的id，关联物料表：mt_alone_process_materials_bom + */ + public Integer getMaterialsBomId() { + return materialsBomId; + } + + /** + * 设置物料bom的id，关联物料表：mt_alone_process_materials_bom + * + * @param materialsBomId 物料bom的id，关联物料表：mt_alone_process_materials_bom + */ + public void setMaterialsBomId(Integer materialsBomId) { + this.materialsBomId = materialsBomId; + } + + /** + * 获取物料名称 + * + * @return materials_name - 物料名称 + */ + public String getMaterialsName() { + return materialsName; + } + + /** + * 设置物料名称 + * + * @param materialsName 物料名称 + */ + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } + + /** + * 获取物料编码 + * + * @return code - 物料编码 + */ + public String getCode() { + return code; + } + + /** + * 设置物料编码 + * + * @param code 物料编码 + */ + public void setCode(String code) { + this.code = code; + } + + /** + * 获取规格类型 + * + * @return specification - 规格类型 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格类型 + * + * @param specification 规格类型 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取用量 + * + * @return dosage - 用量 + */ + public Float getDosage() { + return dosage; + } + + /** + * 设置用量 + * + * @param dosage 用量 + */ + public void setDosage(Float dosage) { + this.dosage = dosage; + } + + /** + * 获取单位id + * + * @return unit_id - 单位id + */ + public Integer getUnitId() { + return unitId; + } + + /** + * 设置单位id + * + * @param unitId 单位id + */ + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + /** + * 获取单位名称 + * + * @return unit_name - 单位名称 + */ + public String getUnitName() { + return unitName; + } + + /** + * 设置单位名称 + * + * @param unitName 单位名称 + */ + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBom.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBom.java new file mode 100644 index 0000000..f0cf21f --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBom.java @@ -0,0 +1,324 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process_materials_bom") +public class ProcessMaterialsBom { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private Integer version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序bom的id，关联工序表：mt_alone_process_bom + */ + @Column(name = "process_bom_id") + private Integer processBomId; + + /** + * 物料id，关联物料表：mt_alone_materials_info + */ + @Column(name = "materials_id") + private Integer materialsId; + + /** + * 物料编码 + */ + private String code; + + /** + * 规格类型 + */ + private String specification; + + /** + * 用量 + */ + private Float dosage; + + /** + * 单位id + */ + @Column(name = "unit_id") + private Integer unitId; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public Integer getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(Integer version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序bom的id，关联工序表：mt_alone_process_bom + * + * @return process_bom_id - 工序bom的id，关联工序表：mt_alone_process_bom + */ + public Integer getProcessBomId() { + return processBomId; + } + + /** + * 设置工序bom的id，关联工序表：mt_alone_process_bom + * + * @param processBomId 工序bom的id，关联工序表：mt_alone_process_bom + */ + public void setProcessBomId(Integer processBomId) { + this.processBomId = processBomId; + } + + /** + * 获取物料id，关联物料表：mt_alone_materials_info + * + * @return materials_id - 物料id，关联物料表：mt_alone_materials_info + */ + public Integer getMaterialsId() { + return materialsId; + } + + /** + * 设置物料id，关联物料表：mt_alone_materials_info + * + * @param materialsId 物料id，关联物料表：mt_alone_materials_info + */ + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } + + /** + * 获取物料编码 + * + * @return code - 物料编码 + */ + public String getCode() { + return code; + } + + /** + * 设置物料编码 + * + * @param code 物料编码 + */ + public void setCode(String code) { + this.code = code; + } + + /** + * 获取规格类型 + * + * @return specification - 规格类型 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置规格类型 + * + * @param specification 规格类型 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取用量 + * + * @return dosage - 用量 + */ + public Float getDosage() { + return dosage; + } + + /** + * 设置用量 + * + * @param dosage 用量 + */ + public void setDosage(Float dosage) { + this.dosage = dosage; + } + + /** + * 获取单位id + * + * @return unit_id - 单位id + */ + public Integer getUnitId() { + return unitId; + } + + /** + * 设置单位id + * + * @param unitId 单位id + */ + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomDto.java new file mode 100644 index 0000000..93ac02b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomDto.java @@ -0,0 +1,69 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/8/25 13:05 + * @Version 1.0 + */ +public class ProcessMaterialsBomDto extends ProcessMaterialsBom { + + private Integer productProcessId; + + private String productProcessName; + + private Integer processId; + + private String processName; + + private String materialsName; + + private String companyName; + + public Integer getProductProcessId() { + return productProcessId; + } + + public void setProductProcessId(Integer productProcessId) { + this.productProcessId = productProcessId; + } + + public String getProductProcessName() { + return productProcessName; + } + + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } + + public Integer getProcessId() { + return processId; + } + + public void setProcessId(Integer processId) { + this.processId = processId; + } + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getMaterialsName() { + return materialsName; + } + + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomParams.java new file mode 100644 index 0000000..d68a8a3 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomParams.java @@ -0,0 +1,126 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** + * 通过产品或者产品bom的id查询 +* Created by hy on 2019/07/19. +*/ +public class ProcessMaterialsBomParams extends QueryParams { + + /** + * ID + * + */ + private Integer id; + /** + * 工序bom的id + */ + private Integer processBomId; + + private Integer productId; + + private Integer productBomId; + + /** + * 物料id + * @return + */ + private Integer materialsId; + + /** + * 物料编码 + * @return + */ + private String code; + + /** + * 规格类型 + * @return + */ + private String specification; + + /** + * 用量 + * @return + */ + private Double dosage; + + @Override + public String toString() { + return "ProcessMaterialsBomParams{" + + "id=" + id + + ", processBomId=" + processBomId + + ", productId=" + productId + + ", productBomId=" + productBomId + + ", materialsId=" + materialsId + + ", code='" + code + '\'' + + ", specification='" + specification + '\'' + + ", dosage=" + dosage + + '}'; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getSpecification() { + return specification; + } + + public void setSpecification(String specification) { + this.specification = specification; + } + + public Double getDosage() { + return dosage; + } + + public void setDosage(Double dosage) { + this.dosage = dosage; + } + + public Integer getMaterialsId() { + return materialsId; + } + + public void setMaterialsId(Integer materialsId) { + this.materialsId = materialsId; + } + + public Integer getProcessBomId() { + return processBomId; + } + + public void setProcessBomId(Integer processBomId) { + this.processBomId = processBomId; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Integer getProductBomId() { + return productBomId; + } + + public void setProductBomId(Integer productBomId) { + this.productBomId = productBomId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java new file mode 100644 index 0000000..84dd37e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java @@ -0,0 +1,83 @@ +package com.deer.wms.produce.manage.model; + +/** + * 新建加工单时下方展示的材料信息， + * 涉及mt_alone_materials_info，mt_alone_materials_stock_info， + * mt_alone_process_bom，mt_alone_process_materials_bom + * @Author: hy + * @Date: 2019/10/7 12:25 + * @Version 1.0 + */ +public class ProcessMaterialsBomVo extends ProcessMaterialsBom { + private String processName;//工序名称 + + private Integer processStep;//工序步骤 + + private String unitName;//单位名称 + + private String materialsName;//物料名称 + + private Float quantity;//库存数量 + + private Float stockDeduct;//库存抵扣数量 + + private Float remain;//剩余数量 + + + + public String getProcessName() { + return processName; + } + + public void setProcessName(String processName) { + this.processName = processName; + } + + public Integer getProcessStep() { + return processStep; + } + + public void setProcessStep(Integer processStep) { + this.processStep = processStep; + } + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getMaterialsName() { + return materialsName; + } + + public void setMaterialsName(String materialsName) { + this.materialsName = materialsName; + } + + public Float getQuantity() { + return quantity; + } + + public void setQuantity(Float quantity) { + this.quantity = quantity; + } + + public Float getStockDeduct() { + return stockDeduct; + } + + public void setStockDeduct(Float stockDeduct) { + this.stockDeduct = stockDeduct; + } + + public Float getRemain() { + return remain; + } + + public void setRemain(Float remain) { + this.remain = remain; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsParams.java new file mode 100644 index 0000000..e171e98 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by hy on 2019/07/19. +*/ +public class ProcessMaterialsParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessParams.java new file mode 100644 index 0000000..236b3fb --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by hy on 2019/07/19. +*/ +public class ProcessParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfo.java new file mode 100644 index 0000000..a2fb48e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfo.java @@ -0,0 +1,303 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_process_quality_info") +public class ProcessQualityInfo { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private Integer version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序id，关联工序表：mt_alone_process + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 完成百分比，% + */ + @Column(name = "complete_ratio") + private String completeRatio; + + /** + * 质量信息描述 + */ + @Column(name = "quality_info") + private String qualityInfo; + + /** + * 完成匹数 + */ + @Column(name = "completed_num") + private Integer completedNum; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + /** + * 备注 + */ + private String memo; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public Integer getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(Integer version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序id，关联工序表：mt_alone_process + * + * @return process_id - 工序id，关联工序表：mt_alone_process + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process + * + * @param processId 工序id，关联工序表：mt_alone_process + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取完成百分比，% + * + * @return complete_ratio - 完成百分比，% + */ + public String getCompleteRatio() { + return completeRatio; + } + + /** + * 设置完成百分比，% + * + * @param completeRatio 完成百分比，% + */ + public void setCompleteRatio(String completeRatio) { + this.completeRatio = completeRatio; + } + + /** + * 获取质量信息描述 + * + * @return quality_info - 质量信息描述 + */ + public String getQualityInfo() { + return qualityInfo; + } + + /** + * 设置质量信息描述 + * + * @param qualityInfo 质量信息描述 + */ + public void setQualityInfo(String qualityInfo) { + this.qualityInfo = qualityInfo; + } + + /** + * 获取完成匹数 + * + * @return completed_num - 完成匹数 + */ + public Integer getCompletedNum() { + return completedNum; + } + + /** + * 设置完成匹数 + * + * @param completedNum 完成匹数 + */ + public void setCompletedNum(Integer completedNum) { + this.completedNum = completedNum; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfoParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfoParams.java new file mode 100644 index 0000000..b3af2c3 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfoParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by hy on 2019/07/19. +*/ +public class ProcessQualityInfoParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java new file mode 100644 index 0000000..7bac6f8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java @@ -0,0 +1,279 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_product_batch_detect") +public class ProductBatchDetect { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det + */ + @Column(name = "batch_det_code") + private String batchDetCode; + + /** + * 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成 + */ + @Column(name = "product_det_barcode") + private String productDetBarcode; + + /** + * 等级，1为一等品，2：二等品，3：等品。。。 + */ + private Integer grade; + + /** + * 打卷机id，关联表：mt_alone_winding_machine + */ + @Column(name = "winding_machine_id") + private Integer windingMachineId; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det + * + * @return batch_det_code - 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det + */ + public String getBatchDetCode() { + return batchDetCode; + } + + /** + * 设置卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det + * + * @param batchDetCode 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det + */ + public void setBatchDetCode(String batchDetCode) { + this.batchDetCode = batchDetCode; + } + + /** + * 获取明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成 + * + * @return product_det_barcode - 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成 + */ + public String getProductDetBarcode() { + return productDetBarcode; + } + + /** + * 设置明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成 + * + * @param productDetBarcode 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成 + */ + public void setProductDetBarcode(String productDetBarcode) { + this.productDetBarcode = productDetBarcode; + } + + /** + * 获取等级，1为一等品，2：二等品，3：等品。。。 + * + * @return grade - 等级，1为一等品，2：二等品，3：等品。。。 + */ + public Integer getGrade() { + return grade; + } + + /** + * 设置等级，1为一等品，2：二等品，3：等品。。。 + * + * @param grade 等级，1为一等品，2：二等品，3：等品。。。 + */ + public void setGrade(Integer grade) { + this.grade = grade; + } + + /** + * 获取打卷机id，关联表：mt_alone_winding_machine + * + * @return winding_machine_id - 打卷机id，关联表：mt_alone_winding_machine + */ + public Integer getWindingMachineId() { + return windingMachineId; + } + + /** + * 设置打卷机id，关联表：mt_alone_winding_machine + * + * @param windingMachineId 打卷机id，关联表：mt_alone_winding_machine + */ + public void setWindingMachineId(Integer windingMachineId) { + this.windingMachineId = windingMachineId; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java new file mode 100644 index 0000000..c826a0c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java @@ -0,0 +1,279 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_product_batch_detect_det") +public class ProductBatchDetectDet { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + @Column(name = "process_id") + private Integer processId; + + /** + * 卷码code，作为扫描编码 + */ + @Column(name = "product_det_barcode") + private String productDetBarcode; + + /** + * 检测位置 + */ + private Float position; + + /** + * 检测瑕疵点id，关联表：mt_alone_fabric_defect + */ + @Column(name = "defect_id") + private Integer defectId; + + /** + * 瑕疵点名称 + */ + @Column(name = "defect_name") + private String defectName; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public Integer getProcessId() { + return processId; + } + + /** + * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + * + * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测 + */ + public void setProcessId(Integer processId) { + this.processId = processId; + } + + /** + * 获取卷码code，作为扫描编码 + * + * @return product_det_barcode - 卷码code，作为扫描编码 + */ + public String getProductDetBarcode() { + return productDetBarcode; + } + + /** + * 设置卷码code，作为扫描编码 + * + * @param productDetBarcode 卷码code，作为扫描编码 + */ + public void setProductDetBarcode(String productDetBarcode) { + this.productDetBarcode = productDetBarcode; + } + + /** + * 获取检测位置 + * + * @return position - 检测位置 + */ + public Float getPosition() { + return position; + } + + /** + * 设置检测位置 + * + * @param position 检测位置 + */ + public void setPosition(Float position) { + this.position = position; + } + + /** + * 获取检测瑕疵点id，关联表：mt_alone_fabric_defect + * + * @return defect_id - 检测瑕疵点id，关联表：mt_alone_fabric_defect + */ + public Integer getDefectId() { + return defectId; + } + + /** + * 设置检测瑕疵点id，关联表：mt_alone_fabric_defect + * + * @param defectId 检测瑕疵点id，关联表：mt_alone_fabric_defect + */ + public void setDefectId(Integer defectId) { + this.defectId = defectId; + } + + /** + * 获取瑕疵点名称 + * + * @return defect_name - 瑕疵点名称 + */ + public String getDefectName() { + return defectName; + } + + /** + * 设置瑕疵点名称 + * + * @param defectName 瑕疵点名称 + */ + public void setDefectName(String defectName) { + this.defectName = defectName; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetParams.java new file mode 100644 index 0000000..16a463d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/09/09. +*/ +public class ProductBatchDetectDetParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java new file mode 100644 index 0000000..f2a8ddd --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/09/09. +*/ +public class ProductBatchDetectParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java new file mode 100644 index 0000000..e155d7c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java @@ -0,0 +1,948 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_product_process") +public class ProductProcess { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 销售单号 + */ + @Column(name = "sales_number") + private String salesNumber; + + /** + * 加工单号 + */ + @Column(name = "work_order_code") + private String workOrderCode; + + /** + * 工单名称 + */ + @Column(name = "work_order_name") + private String workOrderName; + + /** + * 单据编号 + */ + @Column(name = "delivery_code") + private String deliveryCode; + + /** + * 计划完成时间 + */ + @Column(name = "plan_finish_time") + private Date planFinishTime; + + /** + * 计划开始时间 + */ + @Column(name = "plan_begin_time") + private Date planBeginTime; + + /** + * 实际完成时间 + */ + @Column(name = "actual_finish_time") + private Date actualFinishTime; + + /** + * 实际开始时间 + */ + @Column(name = "actual_begin_time") + private Date actualBeginTime; + + /** + * 客户id，关联客户表 + */ + @Column(name = "client_id") + private Integer clientId; + + /** + * 客户名称，如果是自己生产，客户为自营 + */ + @Column(name = "client_name") + private String clientName; + + /** + * 合同编码 + */ + @Column(name = "contract_code") + private String contractCode; + + /** + * 合同名称，合同可以作为附件添加到附件列表中 + */ + @Column(name = "contract_name") + private String contractName; + + /** + * 产品编码 + */ + @Column(name = "product_process_code") + private String productProcessCode; + + /** + * 产品别名 + */ + @Column(name = "product_process_name0") + private String productProcessName0; + + /** + * 完成时间 + */ + @Column(name = "finish_time") + private Date finishTime; + + /** + * 选出产品bom表直接关联id，关联表：mt_alone_product_process_bom + */ + @Column(name = "product_bom_id") + private Integer productBomId; + + /** + * 加工规格型号 + */ + private String specification; + + /** + * 加工价格，加工所需要的总费用 + */ + @Column(name = "process_price") + private Float processPrice; + + /** + * 原先长度，单位米 + */ + private Float len; + + /** + * 加工后长度，单位米 + */ + @Column(name = "delivery_len") + private Float deliveryLen; + + /** + * 现有检测长度 + */ + @Column(name = "detection_len") + private Float detectionLen; + + /** + * 批次号，可以作为扫描生成编码 + */ + @Column(name = "batch_code") + private String batchCode; + + /** + * 批次单据号，用户手动填写 + */ + @Column(name = "batch_order_code") + private String batchOrderCode; + + /** + * 缩率%，现有检测长度/原先长度 + */ + private String shrinkage; + + /** + * 总匹数 + */ + @Column(name = "pi_num") + private Integer piNum; + + /** + * 加工描述内容 + */ + @Column(name = "process_content") + private String processContent; + + /** + * 跟单员id，关联表员工表：user_info + */ + @Column(name = "merchandiser_id") + private Integer merchandiserId; + + /** + * 跟单员名称，关联表员工表：user_info + */ + @Column(name = "merchandiser_name") + private String merchandiserName; + + /** + * 备注 + */ + private String memo; + + /** + * 审核状态 0等待审核，1审核通过，2审核失败 + */ + @Column(name = "review_status") + private Integer reviewStatus; + + /** + * 审核时间 + */ + @Column(name = "review_time") + private Date reviewTime; + + /** + * 审核人id，关联表：user_info + */ + @Column(name = "reviewer_id") + private Integer reviewerId; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取销售单号 + * + * @return sales_number - 销售单号 + */ + public String getSalesNumber() { + return salesNumber; + } + + /** + * 设置销售单号 + * + * @param salesNumber 销售单号 + */ + public void setSalesNumber(String salesNumber) { + this.salesNumber = salesNumber; + } + + /** + * 获取工单号 + * + * @return work_order_code - 工单号 + */ + public String getWorkOrderCode() { + return workOrderCode; + } + + /** + * 设置工单号 + * + * @param workOrderCode 工单号 + */ + public void setWorkOrderCode(String workOrderCode) { + this.workOrderCode = workOrderCode; + } + + /** + * 获取工单名称 + * + * @return work_order_name - 工单名称 + */ + public String getWorkOrderName() { + return workOrderName; + } + + /** + * 设置工单名称 + * + * @param workOrderName 工单名称 + */ + public void setWorkOrderName(String workOrderName) { + this.workOrderName = workOrderName; + } + + /** + * 获取单据编号 + * + * @return delivery_code - 单据编号 + */ + public String getDeliveryCode() { + return deliveryCode; + } + + /** + * 设置单据编号 + * + * @param deliveryCode 单据编号 + */ + public void setDeliveryCode(String deliveryCode) { + this.deliveryCode = deliveryCode; + } + + /** + * 获取计划完成时间 + * + * @return plan_finish_time - 计划完成时间 + */ + public Date getPlanFinishTime() { + return planFinishTime; + } + + /** + * 设置计划完成时间 + * + * @param planFinishTime 计划完成时间 + */ + public void setPlanFinishTime(Date planFinishTime) { + this.planFinishTime = planFinishTime; + } + + /** + * 获取计划开始时间 + * + * @return plan_begin_time - 计划开始时间 + */ + public Date getPlanBeginTime() { + return planBeginTime; + } + + /** + * 设置计划开始时间 + * + * @param planBeginTime 计划开始时间 + */ + public void setPlanBeginTime(Date planBeginTime) { + this.planBeginTime = planBeginTime; + } + + /** + * 获取实际完成时间 + * + * @return actual_finish_time - 实际完成时间 + */ + public Date getActualFinishTime() { + return actualFinishTime; + } + + /** + * 设置实际完成时间 + * + * @param actualFinishTime 实际完成时间 + */ + public void setActualFinishTime(Date actualFinishTime) { + this.actualFinishTime = actualFinishTime; + } + + /** + * 获取实际开始时间 + * + * @return actual_begin_time - 实际开始时间 + */ + public Date getActualBeginTime() { + return actualBeginTime; + } + + /** + * 设置实际开始时间 + * + * @param actualBeginTime 实际开始时间 + */ + public void setActualBeginTime(Date actualBeginTime) { + this.actualBeginTime = actualBeginTime; + } + + /** + * 获取客户id，关联客户表 + * + * @return client_id - 客户id，关联客户表 + */ + public Integer getClientId() { + return clientId; + } + + /** + * 设置客户id，关联客户表 + * + * @param clientId 客户id，关联客户表 + */ + public void setClientId(Integer clientId) { + this.clientId = clientId; + } + + /** + * 获取客户名称，如果是自己生产，客户为自营 + * + * @return client_name - 客户名称，如果是自己生产，客户为自营 + */ + public String getClientName() { + return clientName; + } + + /** + * 设置客户名称，如果是自己生产，客户为自营 + * + * @param clientName 客户名称，如果是自己生产，客户为自营 + */ + public void setClientName(String clientName) { + this.clientName = clientName; + } + + /** + * 获取合同编码 + * + * @return contract_code - 合同编码 + */ + public String getContractCode() { + return contractCode; + } + + /** + * 设置合同编码 + * + * @param contractCode 合同编码 + */ + public void setContractCode(String contractCode) { + this.contractCode = contractCode; + } + + /** + * 获取合同名称，合同可以作为附件添加到附件列表中 + * + * @return contract_name - 合同名称，合同可以作为附件添加到附件列表中 + */ + public String getContractName() { + return contractName; + } + + /** + * 设置合同名称，合同可以作为附件添加到附件列表中 + * + * @param contractName 合同名称，合同可以作为附件添加到附件列表中 + */ + public void setContractName(String contractName) { + this.contractName = contractName; + } + + /** + * 获取产品加工编码 + * + * @return product_process_code - 产品加工编码 + */ + public String getProductProcessCode() { + return productProcessCode; + } + + /** + * 设置产品加工编码 + * + * @param productProcessCode 产品加工编码 + */ + public void setProductProcessCode(String productProcessCode) { + this.productProcessCode = productProcessCode; + } + + /** + * 获取产品别名 + * + * @return product_process_name0 - 产品别名 + */ + public String getProductProcessName0() { + return productProcessName0; + } + + /** + * 设置产品别名 + * + * @param productProcessName0 产品别名 + */ + public void setProductProcessName0(String productProcessName0) { + this.productProcessName0 = productProcessName0; + } + + /** + * 获取完成时间 + * + * @return finish_time - 完成时间 + */ + public Date getFinishTime() { + return finishTime; + } + + /** + * 设置完成时间 + * + * @param finishTime 完成时间 + */ + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + /** + * 获取选出产品bom表直接关联id，关联表：mt_alone_product_process_bom + * + * @return product_bom_id - 选出产品bom表直接关联id，关联表：mt_alone_product_process_bom + */ + public Integer getProductBomId() { + return productBomId; + } + + /** + * 设置选出产品bom表直接关联id，关联表：mt_alone_product_process_bom + * + * @param productBomId 选出产品bom表直接关联id，关联表：mt_alone_product_process_bom + */ + public void setProductBomId(Integer productBomId) { + this.productBomId = productBomId; + } + + /** + * 获取加工规格型号 + * + * @return specification - 加工规格型号 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置加工规格型号 + * + * @param specification 加工规格型号 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取加工价格，加工所需要的总费用 + * + * @return process_price - 加工价格，加工所需要的总费用 + */ + public Float getProcessPrice() { + return processPrice; + } + + /** + * 设置加工价格，加工所需要的总费用 + * + * @param processPrice 加工价格，加工所需要的总费用 + */ + public void setProcessPrice(Float processPrice) { + this.processPrice = processPrice; + } + + /** + * 获取原先长度，单位米 + * + * @return len - 原先长度，单位米 + */ + public Float getLen() { + return len; + } + + /** + * 设置原先长度，单位米 + * + * @param len 原先长度，单位米 + */ + public void setLen(Float len) { + this.len = len; + } + + /** + * 获取加工后长度，单位米 + * + * @return delivery_len - 加工后长度，单位米 + */ + public Float getDeliveryLen() { + return deliveryLen; + } + + /** + * 设置加工后长度，单位米 + * + * @param deliveryLen 加工后长度，单位米 + */ + public void setDeliveryLen(Float deliveryLen) { + this.deliveryLen = deliveryLen; + } + + /** + * 获取现有检测长度 + * + * @return detection_len - 现有检测长度 + */ + public Float getDetectionLen() { + return detectionLen; + } + + /** + * 设置现有检测长度 + * + * @param detectionLen 现有检测长度 + */ + public void setDetectionLen(Float detectionLen) { + this.detectionLen = detectionLen; + } + + /** + * 获取批次号，可以作为扫描生成编码 + * + * @return batch_code - 批次号，可以作为扫描生成编码 + */ + public String getBatchCode() { + return batchCode; + } + + /** + * 设置批次号，可以作为扫描生成编码 + * + * @param batchCode 批次号，可以作为扫描生成编码 + */ + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + /** + * 获取批次单据号 + * + * @return batch_order_code - 批次单据号 + */ + public String getBatchOrderCode() { + return batchOrderCode; + } + + /** + * 设置批次单据号 + * + * @param batchOrderCode 批次单据号 + */ + public void setBatchOrderCode(String batchOrderCode) { + this.batchOrderCode = batchOrderCode; + } + + /** + * 获取缩率%，现有检测长度/原先长度 + * + * @return shrinkage - 缩率%，现有检测长度/原先长度 + */ + public String getShrinkage() { + return shrinkage; + } + + /** + * 设置缩率%，现有检测长度/原先长度 + * + * @param shrinkage 缩率%，现有检测长度/原先长度 + */ + public void setShrinkage(String shrinkage) { + this.shrinkage = shrinkage; + } + + /** + * 获取总匹数 + * + * @return pi_num - 总匹数 + */ + public Integer getPiNum() { + return piNum; + } + + /** + * 设置总匹数 + * + * @param piNum 总匹数 + */ + public void setPiNum(Integer piNum) { + this.piNum = piNum; + } + + /** + * 获取加工描述内容 + * + * @return process_content - 加工描述内容 + */ + public String getProcessContent() { + return processContent; + } + + /** + * 设置加工描述内容 + * + * @param processContent 加工描述内容 + */ + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + /** + * 获取跟单员id，关联表员工表：user_info + * + * @return merchandiser_id - 跟单员id，关联表员工表：user_info + */ + public Integer getMerchandiserId() { + return merchandiserId; + } + + /** + * 设置跟单员id，关联表员工表：user_info + * + * @param merchandiserId 跟单员id，关联表员工表：user_info + */ + public void setMerchandiserId(Integer merchandiserId) { + this.merchandiserId = merchandiserId; + } + + /** + * 获取跟单员名称，关联表员工表：user_info + * + * @return merchandiser_name - 跟单员名称 + */ + public String getMerchandiserName() { + return merchandiserName; + } + + /** + * 设置跟单员名称，关联表员工表：user_info + * + * @param merchandiserName 跟单员名称 + */ + public void setMerchandiserName(String merchandiserName) { + this.merchandiserName = merchandiserName; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * 获取审核状态 0等待审核，1审核通过，2审核失败 + * + * @return review_status - 审核状态 0等待审核，1审核通过，2审核失败 + */ + public Integer getReviewStatus() { + return reviewStatus; + } + + /** + * 设置审核状态 0等待审核，1审核通过，2审核失败 + * + * @param reviewStatus 审核状态 0等待审核，1审核通过，2审核失败 + */ + public void setReviewStatus(Integer reviewStatus) { + this.reviewStatus = reviewStatus; + } + + /** + * 获取审核时间 + * + * @return review_time - 审核时间 + */ + public Date getReviewTime() { + return reviewTime; + } + + /** + * 设置审核时间 + * + * @param reviewTime 审核时间 + */ + public void setReviewTime(Date reviewTime) { + this.reviewTime = reviewTime; + } + + /** + * 获取审核人id，关联表：user_info + * + * @return reviewer_id - 审核人id，关联表：user_info + */ + public Integer getReviewerId() { + return reviewerId; + } + + /** + * 设置审核人id，关联表：user_info + * + * @param reviewerId 审核人id，关联表：user_info + */ + public void setReviewerId(Integer reviewerId) { + this.reviewerId = reviewerId; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDet.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDet.java new file mode 100644 index 0000000..84d0bb4 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDet.java @@ -0,0 +1,446 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "mt_alone_product_process_batch_det") +public class ProductProcessBatchDet { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private String version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 批次号 + */ + @Column(name = "batch_code") + private String batchCode; + + /** + * 配送单据编号 + */ + @Column(name = "delivery_code") + private String deliveryCode; + + /** + * 产品加工编码 + */ + @Column(name = "product_process_code") + private String productProcessCode; + + /** + * 卷号，根据配送码单上有卷号 + */ + @Column(name = "volume_num") + private String volumeNum; + + /** + * 卷码code，作为扫描编码 + */ + @Column(name = "batch_det_code") + private String batchDetCode; + + /** + * 原先提供长度，单位米 + */ + private Float len; + + /** + * 配送长度，单位米 + */ + @Column(name = "delivery_len") + private Float deliveryLen; + + /** + * 现有检测长度 + */ + @Column(name = "detection_len") + private Float detectionLen; + + /** + * 缩率%，现有检测长度/原先长度 + */ + private String shrinkage; + + /** + * 缸号 + */ + @Column(name = "dyelot_num") + private String dyelotNum; + + /** + * 缸序 + */ + @Column(name = "dyelot_order") + private String dyelotOrder; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public String getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取批次号 + * + * @return batch_code - 批次号 + */ + public String getBatchCode() { + return batchCode; + } + + /** + * 设置批次号 + * + * @param batchCode 批次号 + */ + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + /** + * 获取配送单据编号 + * + * @return delivery_code - 配送单据编号 + */ + public String getDeliveryCode() { + return deliveryCode; + } + + /** + * 设置配送单据编号 + * + * @param deliveryCode 配送单据编号 + */ + public void setDeliveryCode(String deliveryCode) { + this.deliveryCode = deliveryCode; + } + + /** + * 获取产品加工编码 + * + * @return product_process_code - 产品加工编码 + */ + public String getProductProcessCode() { + return productProcessCode; + } + + /** + * 设置产品加工编码 + * + * @param productProcessCode 产品加工编码 + */ + public void setProductProcessCode(String productProcessCode) { + this.productProcessCode = productProcessCode; + } + + /** + * 获取卷号，根据配送码单上有卷号 + * + * @return volume_num - 卷号，根据配送码单上有卷号 + */ + public String getVolumeNum() { + return volumeNum; + } + + /** + * 设置卷号，根据配送码单上有卷号 + * + * @param volumeNum 卷号，根据配送码单上有卷号 + */ + public void setVolumeNum(String volumeNum) { + this.volumeNum = volumeNum; + } + + /** + * 获取卷码code，作为扫描编码 + * + * @return batch_det_code - 卷码code，作为扫描编码 + */ + public String getBatchDetCode() { + return batchDetCode; + } + + /** + * 设置卷码code，作为扫描编码 + * + * @param batchDetCode 卷码code，作为扫描编码 + */ + public void setBatchDetCode(String batchDetCode) { + this.batchDetCode = batchDetCode; + } + + /** + * 获取原先提供长度，单位米 + * + * @return len - 原先提供长度，单位米 + */ + public Float getLen() { + return len; + } + + /** + * 设置原先提供长度，单位米 + * + * @param len 原先提供长度，单位米 + */ + public void setLen(Float len) { + this.len = len; + } + + /** + * 获取配送长度，单位米 + * + * @return delivery_len - 配送长度，单位米 + */ + public Float getDeliveryLen() { + return deliveryLen; + } + + /** + * 设置配送长度，单位米 + * + * @param deliveryLen 配送长度，单位米 + */ + public void setDeliveryLen(Float deliveryLen) { + this.deliveryLen = deliveryLen; + } + + /** + * 获取现有检测长度 + * + * @return detection_len - 现有检测长度 + */ + public Float getDetectionLen() { + return detectionLen; + } + + /** + * 设置现有检测长度 + * + * @param detectionLen 现有检测长度 + */ + public void setDetectionLen(Float detectionLen) { + this.detectionLen = detectionLen; + } + + /** + * 获取缩率%，现有检测长度/原先长度 + * + * @return shrinkage - 缩率%，现有检测长度/原先长度 + */ + public String getShrinkage() { + return shrinkage; + } + + /** + * 设置缩率%，现有检测长度/原先长度 + * + * @param shrinkage 缩率%，现有检测长度/原先长度 + */ + public void setShrinkage(String shrinkage) { + this.shrinkage = shrinkage; + } + + /** + * 获取缸号 + * + * @return dyelot_num - 缸号 + */ + public String getDyelotNum() { + return dyelotNum; + } + + /** + * 设置缸号 + * + * @param dyelotNum 缸号 + */ + public void setDyelotNum(String dyelotNum) { + this.dyelotNum = dyelotNum; + } + + /** + * 获取缸序 + * + * @return dyelot_order - 缸序 + */ + public String getDyelotOrder() { + return dyelotOrder; + } + + /** + * 设置缸序 + * + * @param dyelotOrder 缸序 + */ + public void setDyelotOrder(String dyelotOrder) { + this.dyelotOrder = dyelotOrder; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java new file mode 100644 index 0000000..97de9ad --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBatchDetParams.java @@ -0,0 +1,9 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by on 2019/09/09. +*/ +public class ProductProcessBatchDetParams extends QueryParams { +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBom.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBom.java new file mode 100644 index 0000000..885a181 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBom.java @@ -0,0 +1,326 @@ +package com.deer.wms.produce.manage.model; + +import javax.persistence.*; +import java.util.Date; + +@Table(name = "mt_alone_product_process_bom") +public class ProductProcessBom { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 操作员id + */ + @Column(name = "operator_id") + private Integer operatorId; + + /** + * 添加时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 修改时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 默认为 1.1 + */ + private Integer version; + + /** + * 状态 0使用，1禁用 + */ + private Integer status; + + /** + * 产品加工总名称 + */ + @Column(name = "product_process_name") + private String productProcessName; + + /** + * 完成时间 + */ + @Column(name = "finish_time") + private Date finishTime; + + /** + * 产品id，关联表：mt_alone_product + */ + @Column(name = "product_id") + private Integer productId; + + /** + * 加工规格型号 + */ + private String specification; + + /** + * 加工描述内容 + */ + @Column(name = "process_content") + private String processContent; + + /** + * 备注 + */ + private String memo; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + @Column(name = "product_annex_code") + private String productAnnexCode; + + @Column(name = "company_id") + private Integer companyId; + + /** + * @return id + */ + public Integer getId() { + return id; + } + + /** + * @param id + */ + public void setId(Integer id) { + this.id = id; + } + + /** + * 获取操作员id + * + * @return operator_id - 操作员id + */ + public Integer getOperatorId() { + return operatorId; + } + + /** + * 设置操作员id + * + * @param operatorId 操作员id + */ + public void setOperatorId(Integer operatorId) { + this.operatorId = operatorId; + } + + /** + * 获取添加时间 + * + * @return create_time - 添加时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 设置添加时间 + * + * @param createTime 添加时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 获取修改时间 + * + * @return update_time - 修改时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 设置修改时间 + * + * @param updateTime 修改时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取版本号 默认为 1.1 + * + * @return version - 版本号 默认为 1.1 + */ + public Integer getVersion() { + return version; + } + + /** + * 设置版本号 默认为 1.1 + * + * @param version 版本号 默认为 1.1 + */ + public void setVersion(Integer version) { + this.version = version; + } + + /** + * 获取状态 0使用，1禁用 + * + * @return status - 状态 0使用，1禁用 + */ + public Integer getStatus() { + return status; + } + + /** + * 设置状态 0使用，1禁用 + * + * @param status 状态 0使用，1禁用 + */ + public void setStatus(Integer status) { + this.status = status; + } + + /** + * 获取产品加工总名称 + * + * @return product_process_name - 产品加工总名称 + */ + public String getProductProcessName() { + return productProcessName; + } + + /** + * 设置产品加工总名称 + * + * @param productProcessName 产品加工总名称 + */ + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } + + /** + * 获取完成时间 + * + * @return finish_time - 完成时间 + */ + public Date getFinishTime() { + return finishTime; + } + + /** + * 设置完成时间 + * + * @param finishTime 完成时间 + */ + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + /** + * 获取产品id，关联表：mt_alone_product + * + * @return product_id - 产品id，关联表：mt_alone_product + */ + public Integer getProductId() { + return productId; + } + + /** + * 设置产品id，关联表：mt_alone_product + * + * @param productId 产品id，关联表：mt_alone_product + */ + public void setProductId(Integer productId) { + this.productId = productId; + } + + /** + * 获取加工规格型号 + * + * @return specification - 加工规格型号 + */ + public String getSpecification() { + return specification; + } + + /** + * 设置加工规格型号 + * + * @param specification 加工规格型号 + */ + public void setSpecification(String specification) { + this.specification = specification; + } + + /** + * 获取加工描述内容 + * + * @return process_content - 加工描述内容 + */ + public String getProcessContent() { + return processContent; + } + + /** + * 设置加工描述内容 + * + * @param processContent 加工描述内容 + */ + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + /** + * @return company_id + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * @param companyId + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomDto.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomDto.java new file mode 100644 index 0000000..d5e703a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomDto.java @@ -0,0 +1,100 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/8/25 13:00 + * @Version 1.0 + */ +public class ProductProcessBomDto extends ProductProcessBom{ + + /** + * 产品编号 + */ + private String productCode; + /** + * 产品名称 + */ + private String productName; + /** + * 规格型号 + */ + private String specification; + /** + * 工序数 + */ + private String processStep; + /** + * 加工规格型号 + */ + private String workSpecification; + /** + * 加工描述内容 + */ + private String processContent; + + /** + * 计量单位 + * @return + */ + private String unitName; + + public String getUnitName() { + return unitName; + } + + public void setUnitName(String unitName) { + this.unitName = unitName; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + @Override + public String getSpecification() { + return specification; + } + + @Override + public void setSpecification(String specification) { + this.specification = specification; + } + + public String getProcessStep() { + return processStep; + } + + public void setProcessStep(String processStep) { + this.processStep = processStep; + } + + public String getWorkSpecification() { + return workSpecification; + } + + public void setWorkSpecification(String workSpecification) { + this.workSpecification = workSpecification; + } + + @Override + public String getProcessContent() { + return processContent; + } + + @Override + public void setProcessContent(String processContent) { + this.processContent = processContent; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java new file mode 100644 index 0000000..77d743e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java @@ -0,0 +1,151 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +import java.util.Date; +import java.util.List; + +/** +* Created by guo on 2019/07/18. +*/ +public class ProductProcessBomParams extends QueryParams { + + /** + * 产品id + */ + private Integer productId; + + private String productBomId; + + private String productName; + + private String productCode; + + /** + * 加工规格型号 + */ + private String specification; + + private String productNum; + + + /** + *添加时间 + * @return + */ + private Date createTime; + + /** + * 加工描述内容 + * @return + */ + private String processContent; + + /** + * 工序表集合 + * @return + */ + private List processBomParamsList; + + /** + * id + * @return + */ + private Integer id; + + @Override + public String toString() { + return "ProductProcessBomParams{" + + "productId=" + productId + + ", productBomId='" + productBomId + '\'' + + ", productName='" + productName + '\'' + + ", productCode='" + productCode + '\'' + + ", specification='" + specification + '\'' + + ", productNum='" + productNum + '\'' + + ", createTime=" + createTime + + ", processContent='" + processContent + '\'' + + ", processBomParamsList=" + processBomParamsList + + ", id=" + id + + '}'; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public List getProcessBomParamsList() { + return processBomParamsList; + } + + public void setProcessBomParamsList(List processBomParamsList) { + this.processBomParamsList = processBomParamsList; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getProcessContent() { + return processContent; + } + + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getSpecification() { + return specification; + } + + public void setSpecification(String specification) { + this.specification = specification; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductNum() { + return productNum; + } + + public void setProductNum(String productNum) { + this.productNum = productNum; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public String getProductBomId() { + return productBomId; + } + + public void setProductBomId(String productBomId) { + this.productBomId = productBomId; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomVO.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomVO.java new file mode 100644 index 0000000..1b3836e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomVO.java @@ -0,0 +1,156 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; + +/** + * @Author: 蔡翔 + * @Date: 2019/9/29 14:16 + * @Version 1.0 + */ +public class ProductProcessBomVO extends MachiningProduct { + + + /** + * 产品加工总名称 + */ + private String productProcessName; + + /** + * 完成时间 + */ + private Date finishTime; + + /** + * 产品id，关联表：mt_alone_machining_product + */ + private Integer productId; + + + /** + * 加工描述内容 + */ + private String processContent; + + /** + * 备注 + */ + private String memo; + + /** + * 附件code，关联附件表：mt_alone_accessory + */ + private String productAnnexCode; + + /** + * 获取产品加工总名称 + * + * @return product_process_name - 产品加工总名称 + */ + public String getProductProcessName() { + return productProcessName; + } + + /** + * 设置产品加工总名称 + * + * @param productProcessName 产品加工总名称 + */ + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } + + /** + * 获取完成时间 + * + * @return finish_time - 完成时间 + */ + public Date getFinishTime() { + return finishTime; + } + + /** + * 设置完成时间 + * + * @param finishTime 完成时间 + */ + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + /** + * 获取产品id，关联表：mt_alone_machining_product + * + * @return product_id - 产品id，关联表：mt_alone_machining_product + */ + public Integer getProductId() { + return productId; + } + + /** + * 设置产品id，关联表：mt_alone_machining_product + * + * @param productId 产品id，关联表：mt_alone_machining_product + */ + public void setProductId(Integer productId) { + this.productId = productId; + } + + + + + /** + * 获取加工描述内容 + * + * @return process_content - 加工描述内容 + */ + public String getProcessContent() { + return processContent; + } + + /** + * 设置加工描述内容 + * + * @param processContent 加工描述内容 + */ + public void setProcessContent(String processContent) { + this.processContent = processContent; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * 获取附件code，关联附件表：mt_alone_accessory + * + * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory + */ + public String getProductAnnexCode() { + return productAnnexCode; + } + + /** + * 设置附件code，关联附件表：mt_alone_accessory + * + * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory + */ + public void setProductAnnexCode(String productAnnexCode) { + this.productAnnexCode = productAnnexCode; + } + + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessDtoSpare.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessDtoSpare.java new file mode 100644 index 0000000..8870fb7 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessDtoSpare.java @@ -0,0 +1,64 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/9/5 21:22 + * @Version 1.0 + * + * 新建生产加工页面对应的结构，集成生产加工单、生产工序、生产物料等信息，备用！！！！ + * + */ + +public class ProductProcessDtoSpare extends ProductProcess { + private ProcessMaterialsBomVo processMaterialsBomVo;//所有bom信息 + + private MtAloneProcess[] mtAloneProcess;//产品工序 + + private ProcessMaterials[] processMaterials;//工序所用物料 + + private ProductProcessBom productProcessBom; + + private ProcessBom[] processBom; + + private ProcessMaterialsBom[] processMaterialsBom; + + public MtAloneProcess[] getMtAloneProcess() { + return mtAloneProcess; + } + + public void setMtAloneProcess(MtAloneProcess[] mtAloneProcess) { + this.mtAloneProcess = mtAloneProcess; + } + + public ProcessMaterials[] getProcessMaterials() { + return processMaterials; + } + + public void setProcessMaterials(ProcessMaterials[] processMaterials) { + this.processMaterials = processMaterials; + } + + public ProductProcessBom getProductProcessBom() { + return productProcessBom; + } + + public void setProductProcessBom(ProductProcessBom productProcessBom) { + this.productProcessBom = productProcessBom; + } + + public ProcessBom[] getProcessBom() { + return processBom; + } + + public void setProcessBom(ProcessBom[] processBom) { + this.processBom = processBom; + } + + public ProcessMaterialsBomVo getProcessMaterialsBomVo() { + return processMaterialsBomVo; + } + + public void setProcessMaterialsBomVo(ProcessMaterialsBomVo processMaterialsBomVo) { + this.processMaterialsBomVo = processMaterialsBomVo; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java new file mode 100644 index 0000000..2f5b46b --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java @@ -0,0 +1,21 @@ +package com.deer.wms.produce.manage.model; + +import java.util.ArrayList; + +/** + * 从前端同时获取批次产品加工信息和工序信息 + * @Author: hy + * @Date: 2019/10/30 22:52 + * @Version 1.0 + */ +public class ProductProcessHaveProcess extends ProductProcess { + private static MtAloneProcess[] processes; + + public static MtAloneProcess[] getProcesses() { + return processes; + } + + public void setProcesses(MtAloneProcess[] processes) { + this.processes = processes; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java new file mode 100644 index 0000000..7980c1f --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java @@ -0,0 +1,10 @@ +package com.deer.wms.produce.manage.model; + +import com.deer.wms.project.seed.core.service.QueryParams; + +/** +* Created by guo on 2019/09/24. +*/ +public class ProductProcessParams extends QueryParams { + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java new file mode 100644 index 0000000..dd7c0a7 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java @@ -0,0 +1,54 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author: hy + * @Date: 2019/10/22 22:18 + * @Version 1.0 + * + * 用于生产加工页面列表展示 + */ +public class ProductProcessVo extends ProductProcess { + + private String productName;//产品名称，关联产品表 + + private Boolean isFinish = false;//是否已完成 + + private Float schedule;//进度，计算所得 + + private String productProcessName;//产品Bom名称 + + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public Boolean getFinish() { + return isFinish; + } + + public void setFinish(Boolean finish) { + isFinish = finish; + } + + public Float getSchedule() { + return schedule; + } + + public void setSchedule(Float schedule) { + this.schedule = schedule; + } + + + public String getProductProcessName() { + return productProcessName; + } + + + public void setProductProcessName(String productProcessName) { + this.productProcessName = productProcessName; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/SupplierManage.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/SupplierManage.java new file mode 100644 index 0000000..3449764 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/SupplierManage.java @@ -0,0 +1,320 @@ +package com.deer.wms.produce.manage.model; + +import java.util.Date; +import javax.persistence.*; + +@Table(name = "supplier_manage") +public class SupplierManage { + /** + * 供应商ID + */ + @Id + @Column(name = "supplier_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer supplierId; + + /** + * 供应商编码 + */ + @Column(name = "supplier_code") + private String supplierCode; + + /** + * 供应商名字 + */ + @Column(name = "supplier_name") + private String supplierName; + + /** + * 供应商代号 + */ + @Column(name = "supplier_codename") + private String supplierCodeName; + + /** + * 供应商类型 + */ + @Column(name = "supplier_type") + private String supplierType; + + /** + * 供应商联系人 + */ + @Column(name = "supplier_contacts") + private String supplierContacts; + + /** + * 供应商联系电话 + */ + @Column(name = "supplier_phone") + private String supplierPhone; + + /** + * 供应商地址 + */ + @Column(name = "supplier_site") + private String supplierSite; + + /** + * 供应商邮箱 + */ + @Column(name = "supplier_email") + private String supplierEmail; + + /** + * 供应商传真 + */ + @Column(name = "supplier_fax") + private String supplierFax; + + /** + * 备注 + */ + private String memo; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private String createTime; + + /** + * 公司ID + */ + @Column(name = "company_id") + private Integer companyId; + + /** + * 获取供应商ID + * + * @return supplier_id - 供应商ID + */ + public Integer getSupplierId() { + return supplierId; + } + + /** + * 设置供应商ID + * + * @param supplierId 供应商ID + */ + public void setSupplierId(Integer supplierId) { + this.supplierId = supplierId; + } + + /** + * 获取供应商编码 + * + * @return supplier_code - 供应商编码 + */ + public String getSupplierCode() { + return supplierCode; + } + + /** + * 设置供应商编码 + * + * @param supplierCode 供应商编码 + */ + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + /** + * 获取供应商名字 + * + * @return supplier_name - 供应商名字 + */ + public String getSupplierName() { + return supplierName; + } + + /** + * 设置供应商名字 + * + * @param supplierName 供应商名字 + */ + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + /** + * 获取供应商代号 + * + * @return supplier_codename - 供应商代号 + */ + public String getSupplierCodeName() { + return supplierCodeName; + } + + /** + * 设置供应商代号 + * + * @param supplierCodeName 供应商代号 + */ + public void setSupplierCodeName(String supplierCodeName) { + this.supplierCodeName = supplierCodeName; + } + + /** + * 获取供应商类型 + * + * @return supplier_type - 供应商类型 + */ + public String getSupplierType() { + return supplierType; + } + + /** + * 设置供应商类型 + * + * @param supplierType 供应商类型 + */ + public void setSupplierType(String supplierType) { + this.supplierType = supplierType; + } + + /** + * 获取供应商联系人 + * + * @return supplier_contacts - 供应商联系人 + */ + public String getSupplierContacts() { + return supplierContacts; + } + + /** + * 设置供应商联系人 + * + * @param supplierContacts 供应商联系人 + */ + public void setSupplierContacts(String supplierContacts) { + this.supplierContacts = supplierContacts; + } + + /** + * 获取供应商联系电话 + * + * @return supplier_phone - 供应商联系电话 + */ + public String getSupplierPhone() { + return supplierPhone; + } + + /** + * 设置供应商联系电话 + * + * @param supplierPhone 供应商联系电话 + */ + public void setSupplierPhone(String supplierPhone) { + this.supplierPhone = supplierPhone; + } + + /** + * 获取供应商地址 + * + * @return supplier_site - 供应商地址 + */ + public String getSupplierSite() { + return supplierSite; + } + + /** + * 设置供应商地址 + * + * @param supplierSite 供应商地址 + */ + public void setSupplierSite(String supplierSite) { + this.supplierSite = supplierSite; + } + + /** + * 获取供应商邮箱 + * + * @return supplier_email - 供应商邮箱 + */ + public String getSupplierEmail() { + return supplierEmail; + } + + /** + * 设置供应商邮箱 + * + * @param supplierEmail 供应商邮箱 + */ + public void setSupplierEmail(String supplierEmail) { + this.supplierEmail = supplierEmail; + } + + /** + * 获取供应商传真 + * + * @return supplier_fax - 供应商传真 + */ + public String getSupplierFax() { + return supplierFax; + } + + /** + * 设置供应商传真 + * + * @param supplierFax 供应商传真 + */ + public void setSupplierFax(String supplierFax) { + this.supplierFax = supplierFax; + } + + /** + * 获取备注 + * + * @return memo - 备注 + */ + public String getMemo() { + return memo; + } + + /** + * 设置备注 + * + * @param memo 备注 + */ + public void setMemo(String memo) { + this.memo = memo; + } + + /** + * 获取创建时间 + * + * @return create_time - 创建时间 + */ + public String getCreateTime() { + return createTime; + } + + /** + * 设置创建时间 + * + * @param createTime 创建时间 + */ + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + /** + * 获取公司ID + * + * @return company_id - 公司ID + */ + public Integer getCompanyId() { + return companyId; + } + + /** + * 设置公司ID + * + * @param companyId 公司ID + */ + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } +} \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MachiningProductService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MachiningProductService.java new file mode 100644 index 0000000..c3a6766 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MachiningProductService.java @@ -0,0 +1,28 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MachingProductDto; +import com.deer.wms.produce.manage.model.MachiningProduct; +import com.deer.wms.produce.manage.model.MachiningProductHaveBom; +import com.deer.wms.produce.manage.model.MachiningProductParams; + +import com.deer.wms.produce.manage.model.MachiningProductVo; +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +public interface MachiningProductService extends Service { + + + List findList(MachiningProductParams params) ; + + List findProductList(MachiningProductParams params); + + List findProductHaveBomList(MachiningProductParams params); + + List findListByClothAttr(MachiningProduct mtAloneMachiningProduct); + + List findProductListBom(MachiningProductParams mtAloneMachiningProduct); + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java new file mode 100644 index 0000000..f099fdc --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java @@ -0,0 +1,23 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MaterialsInfo; +import com.deer.wms.produce.manage.model.MaterialsInfoDto; +import com.deer.wms.produce.manage.model.MaterialsInfoParams; + +import com.deer.wms.produce.manage.model.MaterialsInfoVO; +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by guo on 2019/07/18. + */ +public interface MaterialsInfoService extends Service { + List findList(MaterialsInfoParams params); + + MaterialsInfoDto findDetailById(MaterialsInfoParams params); + + List findMaterialByNameAndNum(MaterialsInfoParams params); + + List findMaterialsByKeyWords(MaterialsInfoParams params); + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java new file mode 100644 index 0000000..de9c694 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java @@ -0,0 +1,22 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.MaterialsOutgoingLog; +import com.deer.wms.produce.manage.model.MaterialsOutgoingLogDto; +import com.deer.wms.produce.manage.model.MaterialsOutgoingLogParams; +import com.deer.wms.produce.manage.model.MaterialsOutgoingLogVo; +import com.deer.wms.project.seed.core.service.Service; + + +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +public interface MaterialsOutgoingLogService extends Service { + + + List findListByOneMaterial(MaterialsOutgoingLogParams params) ; + + void save(MaterialsOutgoingLogDto materialsOutgoingLogDto, CurrentUser currentUser); +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsStockInfoService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsStockInfoService.java new file mode 100644 index 0000000..e77856e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsStockInfoService.java @@ -0,0 +1,21 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MaterialsInfoParams; +import com.deer.wms.produce.manage.model.MaterialsStockInfo; +import com.deer.wms.produce.manage.model.MaterialsStockInfoParams; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +public interface MaterialsStockInfoService extends Service { + + + List findList(MaterialsStockInfoParams params); + + Float getStockQuantityByMaId(MaterialsInfoParams params); + + String getStockPositionByMaId(MaterialsInfoParams params); +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessMethodsService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessMethodsService.java new file mode 100644 index 0000000..f8563fe --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessMethodsService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtAloneProcessMethods; +import com.deer.wms.produce.manage.model.MtAloneProcessMethodsParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/10/16. + */ +public interface MtAloneProcessMethodsService extends Service { + + + List findList(MtAloneProcessMethodsParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java new file mode 100644 index 0000000..1190679 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java @@ -0,0 +1,19 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtAloneProcess; +import com.deer.wms.produce.manage.model.MtAloneProcessParams; +import com.deer.wms.produce.manage.model.ProcessBomParams; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +public interface MtAloneProcessService extends Service { + List findProcessListByProductBom(ProcessBomParams params); + + + //List findList(MtAloneProcessParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProductNameService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProductNameService.java new file mode 100644 index 0000000..c553542 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProductNameService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtAloneProductName; +import com.deer.wms.produce.manage.model.MtAloneProductNameParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/10/16. + */ +public interface MtAloneProductNameService extends Service { + + + List findList(MtAloneProductNameParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneSerialNumberService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneSerialNumberService.java new file mode 100644 index 0000000..68d4547 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneSerialNumberService.java @@ -0,0 +1,19 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtAloneSerialNumber; +import com.deer.wms.produce.manage.model.MtAloneSerialNumberParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +public interface MtAloneSerialNumberService extends Service { + + + List findList(MtAloneSerialNumberParams params) ; + + void updatePinCounter(MtAloneSerialNumber mtAloneSerialNumber); + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtNumberConfService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtNumberConfService.java new file mode 100644 index 0000000..ad2322d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtNumberConfService.java @@ -0,0 +1,18 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtNumberConf; +import com.deer.wms.produce.manage.model.MtNumberConfParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +public interface MtNumberConfService extends Service { + + + List findList(MtNumberConfParams params) ; + + void updatePinSerial(MtNumberConf mtNumberConf); +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtStockProvendorService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtStockProvendorService.java new file mode 100644 index 0000000..7061182 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtStockProvendorService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.MtStockProvendor; +import com.deer.wms.produce.manage.model.MtStockProvendorParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +public interface MtStockProvendorService extends Service { + + + List findList(MtStockProvendorParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBatchRelatService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBatchRelatService.java new file mode 100644 index 0000000..060dbef --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBatchRelatService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProcessBatchRelat; +import com.deer.wms.produce.manage.model.ProcessBatchRelatParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +public interface ProcessBatchRelatService extends Service { + + + List findList(ProcessBatchRelatParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBomService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBomService.java new file mode 100644 index 0000000..123e234 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBomService.java @@ -0,0 +1,24 @@ +package com.deer.wms.produce.manage.service; + + + import com.deer.wms.produce.manage.model.ProcessBom; + import com.deer.wms.produce.manage.model.ProcessBomDto; + import com.deer.wms.produce.manage.model.ProcessBomParams; + import com.deer.wms.project.seed.core.service.Service; + import java.util.List; + +/** + * Created by guo on 2019/07/18. + */ +public interface ProcessBomService extends Service { + List findList(ProcessBomParams params); + + List findListById(ProcessBomParams params); + + void addProcessToProduct(ProcessBomParams params); + + List findListByProductBom(ProcessBomParams params); + + List findListByProductNameId(ProcessBomParams params); + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessDetectRelatService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessDetectRelatService.java new file mode 100644 index 0000000..0293748 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessDetectRelatService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProcessDetectRelat; +import com.deer.wms.produce.manage.model.ProcessDetectRelatParams; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +public interface ProcessDetectRelatService extends Service { + + + List findList(ProcessDetectRelatParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java new file mode 100644 index 0000000..d01eae4 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java @@ -0,0 +1,22 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +public interface ProcessMaterialsBomService extends Service { + + List findProcMatBomVoListByProId(ProcessMaterialsBomParams params); + + List findListByProcessBomId(ProcessMaterialsBomParams params); + + List findMaterilaListByProcessBomId(ProcessBom processBom); + + + //List findList(ProcessMaterialsBomParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java new file mode 100644 index 0000000..5843e27 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProcessMaterials; +import com.deer.wms.produce.manage.model.ProcessMaterialsParams; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +public interface ProcessMaterialsService extends Service { + + + //List findList(ProcessMaterialsParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessQualityInfoService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessQualityInfoService.java new file mode 100644 index 0000000..9237839 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessQualityInfoService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProcessQualityInfo; +import com.deer.wms.produce.manage.model.ProcessQualityInfoParams; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +public interface ProcessQualityInfoService extends Service { + + + //List findList(ProcessQualityInfoParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java new file mode 100644 index 0000000..fb1dba5 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectDetService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProductBatchDetectDet; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +public interface ProductBatchDetectDetService extends Service { + + + List findList(ProductBatchDetectDetParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java new file mode 100644 index 0000000..faf69f5 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductBatchDetectService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProductBatchDetect; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +public interface ProductBatchDetectService extends Service { + + + List findList(ProductBatchDetectParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java new file mode 100644 index 0000000..8107c12 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBatchDetService.java @@ -0,0 +1,17 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProductProcessBatchDet; +import com.deer.wms.produce.manage.model.ProductProcessBatchDetParams; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +public interface ProductProcessBatchDetService extends Service { + + + List findList(ProductProcessBatchDetParams params) ; + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java new file mode 100644 index 0000000..dd31aa2 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java @@ -0,0 +1,28 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.produce.manage.model.ProductProcessBom; +import com.deer.wms.produce.manage.model.ProductProcessBomDto; +import com.deer.wms.produce.manage.model.ProductProcessBomParams; +import com.deer.wms.produce.manage.model.ProductProcessBomVO; +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; + +/** + * Created by guo on 2019/07/18. + */ +public interface ProductProcessBomService extends Service { + List findProBomAndProList(ProductProcessBomParams params); + + List findListByTerm(ProductProcessBomParams params); + + List findListById(ProductProcessBomParams params); + + List findByProductNameAndProductNum(ProductProcessBomParams mtAloneProductProcessBomParams); + + + void addProductProcessBom(ProductProcessBomParams params); + + void updateProductProcessBom(ProductProcessBomParams params); + //static Integer getProductBomIdByProductId() { + //} +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java new file mode 100644 index 0000000..b2dde1c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java @@ -0,0 +1,21 @@ +package com.deer.wms.produce.manage.service; + +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProductProcess; +import com.deer.wms.produce.manage.model.ProductProcessHaveProcess; +import com.deer.wms.produce.manage.model.ProductProcessParams; +import com.deer.wms.produce.manage.model.ProductProcessVo; +import com.deer.wms.project.seed.core.service.Service; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +public interface ProductProcessService extends Service { + List findList(ProductProcessParams params); + + void save(ProductProcess productProcess, CurrentUser currentUser); + + void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser); +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MachiningProductServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MachiningProductServiceImpl.java new file mode 100644 index 0000000..e4ac498 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MachiningProductServiceImpl.java @@ -0,0 +1,55 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MachiningProductMapper; +import com.deer.wms.produce.manage.model.MachingProductDto; +import com.deer.wms.produce.manage.model.MachiningProduct; +import com.deer.wms.produce.manage.model.MachiningProductHaveBom; +import com.deer.wms.produce.manage.model.MachiningProductParams; +import com.deer.wms.produce.manage.model.MachiningProductVo; +import com.deer.wms.produce.manage.service.MachiningProductService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +@Service +@Transactional +public class MachiningProductServiceImpl extends AbstractService implements MachiningProductService { + + @Autowired + private MachiningProductMapper machiningProductMapper; + + + @Override + public List findList(MachiningProductParams params) { + return machiningProductMapper.findList(params); + } + + @Override + public List findProductList(MachiningProductParams params) { + return machiningProductMapper.findProductList(params); + } + + @Override + public List findProductHaveBomList(MachiningProductParams params) { + return machiningProductMapper.findProductHaveBomList(params); + } + + @Override + public List findListByClothAttr(MachiningProduct mtAloneMachiningProduct) { + + return machiningProductMapper.findListByClothAttr(mtAloneMachiningProduct); + } + + @Override + public List findProductListBom(MachiningProductParams mtAloneMachiningProduct) { + return machiningProductMapper.findProductListBom(mtAloneMachiningProduct); + } + + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java new file mode 100644 index 0000000..750eb0a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java @@ -0,0 +1,48 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MaterialsInfoMapper; +import com.deer.wms.produce.manage.model.MaterialsInfo; +import com.deer.wms.produce.manage.model.MaterialsInfoDto; +import com.deer.wms.produce.manage.model.MaterialsInfoParams; +import com.deer.wms.produce.manage.model.MaterialsInfoVO; +import com.deer.wms.produce.manage.service.MaterialsInfoService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/07/18. + */ +@Service +@Transactional +public class MaterialsInfoServiceImpl extends AbstractService implements MaterialsInfoService { + + @Autowired + private MaterialsInfoMapper materialsInfoMapper; + + + @Override + public List findList(MaterialsInfoParams params) { + return materialsInfoMapper.findList(params); + } + + @Override + public MaterialsInfoDto findDetailById(MaterialsInfoParams params) { + return materialsInfoMapper.findDetailById(params); + } + + @Override + public List findMaterialByNameAndNum(MaterialsInfoParams params) { + return materialsInfoMapper.findMaterialByNameOrNum(params); + } + + @Override + public List findMaterialsByKeyWords(MaterialsInfoParams params) { + return materialsInfoMapper.findMaterialsByKeyWords(params); + } + + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java new file mode 100644 index 0000000..6b05283 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java @@ -0,0 +1,99 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.constant.ProduceManageConstant; +import com.deer.wms.produce.manage.dao.MaterialsOutgoingLogMapper; +import com.deer.wms.produce.manage.dao.MaterialsStockInfoMapper; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.MaterialsOutgoingLogService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +@Service +@Transactional +public class MaterialsOutgoingLogServiceImpl extends AbstractService implements MaterialsOutgoingLogService { + + @Autowired + private MaterialsOutgoingLogMapper materialsOutgoingLogMapper; + + @Autowired + private MaterialsStockInfoMapper materialsStockInfoMapper; + + + @Override + public List findListByOneMaterial(MaterialsOutgoingLogParams params) { + return materialsOutgoingLogMapper.findListByOneMaterial(params); + } + + @Override + public void save(MaterialsOutgoingLogDto materialsOutgoingLogDto, CurrentUser currentUser) { + Date date = new Date(); + + MaterialsOutgoingLog materialsOutgoingLog = new MaterialsOutgoingLog(); + materialsOutgoingLog.setOperatorId(currentUser.getUserId()); + materialsOutgoingLog.setCreateTime(date); + materialsOutgoingLog.setMaterialsId(materialsOutgoingLogDto.getMaterialsId()); + materialsOutgoingLog.setMaterialsName(materialsOutgoingLogDto.getMaterialsName()); + materialsOutgoingLog.setType(materialsOutgoingLogDto.getType()); + materialsOutgoingLog.setQuantity(materialsOutgoingLogDto.getQuantity()); + materialsOutgoingLog.setPositionName(materialsOutgoingLogDto.getPositionName()); + materialsOutgoingLog.setCompanyId(currentUser.getCompanyId()); + materialsOutgoingLogMapper.insert(materialsOutgoingLog); + + /**使用物料id（非stock主键）查询的写法**/ + MaterialsStockInfo tempStock = new MaterialsStockInfo(); + tempStock.setMaterialsId(materialsOutgoingLogDto.getMaterialsId()); + MaterialsStockInfo stock = materialsStockInfoMapper.selectOne(tempStock); + + if(stock==null){//如果是新的物料，库存表中没有该物料信息，则新增一条库存记录 + stock = new MaterialsStockInfo(); + stock.setOperatorId(currentUser.getUserId()); + stock.setMaterialsId(materialsOutgoingLogDto.getMaterialsId()); + stock.setUnitId(materialsOutgoingLogDto.getUnitId()); + stock.setCreateTime(date); + if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_OUT) { + stock.setQuantity(0-materialsOutgoingLogDto.getQuantity());//新建物料的出库仓储数量为负数 + }else if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_IN) { + stock.setQuantity(materialsOutgoingLogDto.getQuantity());//新建物料的入库仓储数量为正数 + } + + stock.setPositionName(materialsOutgoingLogDto.getPositionName()); + stock.setCompanyId(currentUser.getCompanyId()); + + materialsStockInfoMapper.insert(stock); + }else{//如果库存表中有该物料信息，则更新对应的库存记录 + stock.setCreateTime(date);//日期取最新更新的日期 + MaterialsInfoParams params = new MaterialsInfoParams();//查询条件赋值 + params.setMaterialsId(materialsOutgoingLogDto.getMaterialsId()); + params.setCompanyId(currentUser.getCompanyId()); + + //设置库存数量：已有库存数量+入库数量（或已有库存数量-出库数量） + Float totalQuantity = materialsStockInfoMapper.getStockQuantityByMaId(params); + if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_OUT) { + totalQuantity -= materialsOutgoingLog.getQuantity(); + }else if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_IN) { + totalQuantity += materialsOutgoingLog.getQuantity(); + } + stock.setQuantity(totalQuantity); + + //设置库存位置：已有库存仓库,出入库记录对应仓库 + String inAndOutLogPosition = materialsOutgoingLog.getPositionName(); + String stockPosition = materialsStockInfoMapper.getStockPositionByMaId(params); + if(stockPosition!=null && !stockPosition.trim().equals("")) { + stock.setPositionName(stockPosition + "," +inAndOutLogPosition); + }else{ + stock.setPositionName(inAndOutLogPosition); + } + + materialsStockInfoMapper.updateByPrimaryKey(stock); + } + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsStockInfoServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsStockInfoServiceImpl.java new file mode 100644 index 0000000..fa87be6 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsStockInfoServiceImpl.java @@ -0,0 +1,42 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MaterialsStockInfoMapper; +import com.deer.wms.produce.manage.model.MaterialsInfoParams; +import com.deer.wms.produce.manage.model.MaterialsStockInfo; +import com.deer.wms.produce.manage.model.MaterialsStockInfoParams; +import com.deer.wms.produce.manage.service.MaterialsStockInfoService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +@Service +@Transactional +public class MaterialsStockInfoServiceImpl extends AbstractService implements MaterialsStockInfoService { + + @Autowired + private MaterialsStockInfoMapper materialsStockInfoMapper; + + + @Override + public List findList(MaterialsStockInfoParams params) { + return materialsStockInfoMapper.findList(params); + } + + @Override + public Float getStockQuantityByMaId(MaterialsInfoParams params) { + return materialsStockInfoMapper.getStockQuantityByMaId(params); + } + + @Override + public String getStockPositionByMaId(MaterialsInfoParams params) { + return materialsStockInfoMapper.getStockPositionByMaId(params); + } + + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessMethodsServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessMethodsServiceImpl.java new file mode 100644 index 0000000..a673f87 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessMethodsServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtAloneProcessMethodsMapper; +import com.deer.wms.produce.manage.model.MtAloneProcessMethods; +import com.deer.wms.produce.manage.model.MtAloneProcessMethodsParams; +import com.deer.wms.produce.manage.service.MtAloneProcessMethodsService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/10/16. + */ +@Service +@Transactional +public class MtAloneProcessMethodsServiceImpl extends AbstractService implements MtAloneProcessMethodsService { + + @Autowired + private MtAloneProcessMethodsMapper mtAloneProcessMethodsMapper; + + + @Override + public List findList(MtAloneProcessMethodsParams params) { + return mtAloneProcessMethodsMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java new file mode 100644 index 0000000..85355ec --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java @@ -0,0 +1,59 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtAloneProcessMapper; +import com.deer.wms.produce.manage.model.MtAloneProcess; +import com.deer.wms.produce.manage.model.MtAloneProcessParams; +import com.deer.wms.produce.manage.model.ProcessBom; +import com.deer.wms.produce.manage.model.ProcessBomParams; +import com.deer.wms.produce.manage.service.MtAloneProcessService; +import com.deer.wms.produce.manage.service.ProcessBomService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +@Service +@Transactional +public class MtAloneProcessServiceImpl extends AbstractService implements MtAloneProcessService { + + @Autowired + private MtAloneProcessMapper mtAloneProcessMapper; + + @Autowired + private ProcessBomService processBomService; + + @Override + public List findProcessListByProductBom(ProcessBomParams params) { + //通过产品bom获取工序bom + List processBomList = processBomService.findListByProductBom(params); + List processList = new ArrayList(); + + if(processBomList!=null && processBomList.size()!=0){ + //循环工序bom给工序初步赋值，先不保存 + for (ProcessBom processBom : processBomList) { + MtAloneProcess process = new MtAloneProcess(); + process.setProcessName(processBom.getProcessName()); + process.setProcessContent(processBom.getProcessContent()); + process.setProcessStep(processBom.getProcessStep()); + process.setProcessBomId(processBom.getId()); + process.setProcessBomName(processBom.getProcessName()); + process.setSpecification(processBom.getSpecification()); + processList.add(process); + } + } + + return processList; + } + + + //@Override + //public List findList(MtAloneProcessParams params) { + // return mtAloneProcessMapper.findList(params); + //} +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProductNameServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProductNameServiceImpl.java new file mode 100644 index 0000000..ea9d0a8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProductNameServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtAloneProductNameMapper; +import com.deer.wms.produce.manage.model.MtAloneProductName; +import com.deer.wms.produce.manage.model.MtAloneProductNameParams; +import com.deer.wms.produce.manage.service.MtAloneProductNameService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/10/16. + */ +@Service +@Transactional +public class MtAloneProductNameServiceImpl extends AbstractService implements MtAloneProductNameService { + + @Autowired + private MtAloneProductNameMapper mtAloneProductNameMapper; + + + @Override + public List findList(MtAloneProductNameParams params) { + return mtAloneProductNameMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneSerialNumberServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneSerialNumberServiceImpl.java new file mode 100644 index 0000000..ab1503a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneSerialNumberServiceImpl.java @@ -0,0 +1,34 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtAloneSerialNumberMapper; +import com.deer.wms.produce.manage.model.MtAloneSerialNumber; +import com.deer.wms.produce.manage.model.MtAloneSerialNumberParams; +import com.deer.wms.produce.manage.service.MtAloneSerialNumberService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +@Service +@Transactional +public class MtAloneSerialNumberServiceImpl extends AbstractService implements MtAloneSerialNumberService { + + @Autowired + private MtAloneSerialNumberMapper mtAloneSerialNumberMapper; + + + @Override + public List findList(MtAloneSerialNumberParams params) { + return mtAloneSerialNumberMapper.findList(params); + } + + @Override + public void updatePinCounter(MtAloneSerialNumber mtAloneSerialNumber) { + mtAloneSerialNumberMapper.updatePinCounter(mtAloneSerialNumber); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtNumberConfServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtNumberConfServiceImpl.java new file mode 100644 index 0000000..43e62c4 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtNumberConfServiceImpl.java @@ -0,0 +1,35 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtNumberConfMapper; +import com.deer.wms.produce.manage.model.MtNumberConf; +import com.deer.wms.produce.manage.model.MtNumberConfParams; +import com.deer.wms.produce.manage.service.MtNumberConfService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +@Service +@Transactional +public class MtNumberConfServiceImpl extends AbstractService implements MtNumberConfService { + + @Autowired + private MtNumberConfMapper mtNumberConfMapper; + + + @Override + public List findList(MtNumberConfParams params) { + return mtNumberConfMapper.findList(params); + } + + @Override + public void updatePinSerial(MtNumberConf mtNumberConf) { + mtNumberConfMapper.updatePinSerial(mtNumberConf); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtStockProvendorServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtStockProvendorServiceImpl.java new file mode 100644 index 0000000..bbd5113 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtStockProvendorServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.MtStockProvendorMapper; +import com.deer.wms.produce.manage.model.MtStockProvendor; +import com.deer.wms.produce.manage.model.MtStockProvendorParams; +import com.deer.wms.produce.manage.service.MtStockProvendorService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/10/17. + */ +@Service +@Transactional +public class MtStockProvendorServiceImpl extends AbstractService implements MtStockProvendorService { + + @Autowired + private MtStockProvendorMapper mtStockProvendorMapper; + + + @Override + public List findList(MtStockProvendorParams params) { + return mtStockProvendorMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBatchRelatServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBatchRelatServiceImpl.java new file mode 100644 index 0000000..b313135 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBatchRelatServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessBatchRelatMapper; +import com.deer.wms.produce.manage.model.ProcessBatchRelat; +import com.deer.wms.produce.manage.model.ProcessBatchRelatParams; +import com.deer.wms.produce.manage.service.ProcessBatchRelatService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +@Service +@Transactional +public class ProcessBatchRelatServiceImpl extends AbstractService implements ProcessBatchRelatService { + + @Autowired + private ProcessBatchRelatMapper processBatchRelatMapper; + + + @Override + public List findList(ProcessBatchRelatParams params) { + return processBatchRelatMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java new file mode 100644 index 0000000..e2d32a3 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java @@ -0,0 +1,65 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessBomMapper; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProcessBomService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Created by guo on 2019/07/18. + */ +@Service +@Transactional +public class ProcessBomServiceImpl extends AbstractService implements ProcessBomService { + + @Autowired + private ProcessBomMapper processBomMapper; + + + @Override + public List findList(ProcessBomParams params) { + return processBomMapper.findList(params); + } + + @Override + public List findListById(ProcessBomParams params) { + return processBomMapper.findListById(params); + } + + @Override + public void addProcessToProduct(ProcessBomParams params) { + Integer productProcessId = processBomMapper.insertProductProcessBom(params); + List list = params.getProcessBomVoList(); + for (ProcessBomVo processBomVo:list) { + processBomVo.setProductProcessId(productProcessId); + } + processBomMapper.insertProcessBom(list); + List processMaterialsBomList = new ArrayList<>(); + for (ProcessBomVo processBomVo:list) { + for (ProcessMaterialsBom processMaterialsBom:processBomVo.getList()) { + processMaterialsBom.setProcessBomId(processBomVo.getId()); + processMaterialsBomList.add(processMaterialsBom); + } + } + processBomMapper.insertProcessMaterialsBom(processMaterialsBomList); + } + + @Override + public List findListByProductBom(ProcessBomParams params) { + return processBomMapper.findListByProductBom(params); + } + + + @Override + public List findListByProductNameId(ProcessBomParams params) { + return processBomMapper.findListByProductNameId(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessDetectRelatServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessDetectRelatServiceImpl.java new file mode 100644 index 0000000..8776d24 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessDetectRelatServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessDetectRelatMapper; +import com.deer.wms.produce.manage.model.ProcessDetectRelat; +import com.deer.wms.produce.manage.model.ProcessDetectRelatParams; +import com.deer.wms.produce.manage.service.ProcessDetectRelatService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by guo on 2019/07/21. + */ +@Service +@Transactional +public class ProcessDetectRelatServiceImpl extends AbstractService implements ProcessDetectRelatService { + + @Autowired + private ProcessDetectRelatMapper processDetectRelatMapper; + + + @Override + public List findList(ProcessDetectRelatParams params) { + return processDetectRelatMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java new file mode 100644 index 0000000..2e82f05 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java @@ -0,0 +1,43 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessMaterialsBomMapper; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProcessMaterialsBomService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +@Service +@Transactional +public class ProcessMaterialsBomServiceImpl extends AbstractService implements ProcessMaterialsBomService { + + @Autowired + private ProcessMaterialsBomMapper processMaterialsBomMapper; + + @Override + public List findProcMatBomVoListByProId(ProcessMaterialsBomParams params) { + return processMaterialsBomMapper.findProcMatBomVoListByProId(params); + } + + @Override + public List findListByProcessBomId(ProcessMaterialsBomParams params) { + return processMaterialsBomMapper.findListByProcessBomId(params); + } + + @Override + public List findMaterilaListByProcessBomId(ProcessBom processBom) { + return processMaterialsBomMapper.findMaterilaListByProcessBomId(processBom); + } + + + //@Override + //public List findList(ProcessMaterialsBomParams params) { + // return processMaterialsBomMapper.findList(params); + //} +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsServiceImpl.java new file mode 100644 index 0000000..08cb787 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessMaterialsMapper; +import com.deer.wms.produce.manage.model.ProcessMaterials; +import com.deer.wms.produce.manage.model.ProcessMaterialsParams; +import com.deer.wms.produce.manage.service.ProcessMaterialsService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +@Service +@Transactional +public class ProcessMaterialsServiceImpl extends AbstractService implements ProcessMaterialsService { + + @Autowired + private ProcessMaterialsMapper processMaterialsMapper; + + + //@Override + //public List findList(ProcessMaterialsParams params) { + // return processMaterialsMapper.findList(params); + //} +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessQualityInfoServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessQualityInfoServiceImpl.java new file mode 100644 index 0000000..050f922 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessQualityInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessQualityInfoMapper; +import com.deer.wms.produce.manage.model.ProcessQualityInfo; +import com.deer.wms.produce.manage.model.ProcessQualityInfoParams; +import com.deer.wms.produce.manage.service.ProcessQualityInfoService; +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * Created by hy on 2019/07/19. + */ +@Service +@Transactional +public class ProcessQualityInfoServiceImpl extends AbstractService implements ProcessQualityInfoService { + + @Autowired + private ProcessQualityInfoMapper processQualityInfoMapper; + + + //@Override + //public List findList(ProcessQualityInfoParams params) { + // return processQualityInfoMapper.findList(params); + //} +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java new file mode 100644 index 0000000..2e56a83 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectDetServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProductBatchDetectDetMapper; +import com.deer.wms.produce.manage.model.ProductBatchDetectDet; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; +import com.deer.wms.produce.manage.service.ProductBatchDetectDetService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +@Service +@Transactional +public class ProductBatchDetectDetServiceImpl extends AbstractService implements ProductBatchDetectDetService { + + @Autowired + private ProductBatchDetectDetMapper productBatchDetectDetMapper; + + + @Override + public List findList(ProductBatchDetectDetParams params) { + return productBatchDetectDetMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java new file mode 100644 index 0000000..d81d7d8 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductBatchDetectServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProductBatchDetectMapper; +import com.deer.wms.produce.manage.model.ProductBatchDetect; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; +import com.deer.wms.produce.manage.service.ProductBatchDetectService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +@Service +@Transactional +public class ProductBatchDetectServiceImpl extends AbstractService implements ProductBatchDetectService { + + @Autowired + private ProductBatchDetectMapper productBatchDetectMapper; + + + @Override + public List findList(ProductBatchDetectParams params) { + return productBatchDetectMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java new file mode 100644 index 0000000..c92d842 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java @@ -0,0 +1,29 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProductProcessBatchDetMapper; +import com.deer.wms.produce.manage.model.ProductProcessBatchDet; +import com.deer.wms.produce.manage.model.ProductProcessBatchDetParams; +import com.deer.wms.produce.manage.service.ProductProcessBatchDetService; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +/** + * Created by on 2019/09/09. + */ +@Service +@Transactional +public class ProductProcessBatchDetServiceImpl extends AbstractService implements ProductProcessBatchDetService { + + @Autowired + private ProductProcessBatchDetMapper productProcessBatchDetMapper; + + + @Override + public List findList(ProductProcessBatchDetParams params) { + return productProcessBatchDetMapper.findList(params); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java new file mode 100644 index 0000000..9beed59 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java @@ -0,0 +1,137 @@ +package com.deer.wms.produce.manage.service.impl; + +import com.deer.wms.produce.manage.dao.ProcessBomMapper; +import com.deer.wms.produce.manage.dao.ProcessMaterialsBomMapper; +import com.deer.wms.produce.manage.dao.ProductProcessBomMapper; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProductProcessBomService; + + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Created by guo on 2019/07/18. + */ +@Service +@Transactional +public class ProductProcessBomServiceImpl extends AbstractService implements ProductProcessBomService { + + @Autowired + private ProductProcessBomMapper productProcessBomMapper; + + @Autowired + private ProcessBomMapper processBomMapper; + + @Autowired + private ProcessMaterialsBomMapper processMaterialsBomMapper; + + + @Override + public List findProBomAndProList(ProductProcessBomParams params) { + return productProcessBomMapper.findProBomAndProList(params); + } + + @Override + public List findListByTerm(ProductProcessBomParams params) { + return productProcessBomMapper.findListByTerm(params); + } + + @Override + public List findListById(ProductProcessBomParams params) { + return productProcessBomMapper.findListById(params); + } + + @Override + public List findByProductNameAndProductNum(ProductProcessBomParams mtAloneProductProcessBomParams) { + return productProcessBomMapper.findByProductNameAndProductNum(mtAloneProductProcessBomParams); + } + + @Override + public void addProductProcessBom(ProductProcessBomParams params) { + ProductProcessBom productProcessBom = new ProductProcessBom(); + productProcessBom.setCreateTime(params.getCreateTime()); + productProcessBom.setCompanyId(params.getCompanyId()); + productProcessBom.setSpecification(params.getSpecification()); + productProcessBom.setProductId(params.getProductId()); + productProcessBom.setProcessContent(params.getProcessContent()); + productProcessBomMapper.insert(productProcessBom); + for (ProcessBomParams processBomParams:params.getProcessBomParamsList()) { + ProcessBom processBom = new ProcessBom(); + processBom.setCreateTime(new Date()); + processBom.setProcessName(processBomParams.getProcessName()); + processBom.setProductProcessId(productProcessBom.getId()); + processBom.setSpecification(params.getSpecification()); + processBom.setProcessContent(params.getProcessContent()); + processBom.setProcessStep(processBomParams.getProcessStep()); + processBom.setMemo(processBomParams.getMemo()); + processBom.setCompanyId(params.getCompanyId()); + processBom.setProcessApartment(processBomParams.getProcessApartment()); + processBomMapper.insert(processBom); + for (ProcessMaterialsBomParams processMaterialsBomParams:processBomParams.getProcessMaterialsBomParamsList()) { + processMaterialsBomParams.setProcessBomId(processBom.getId()); + } + } + List processMaterialsBomList = new ArrayList<>(); + for (int i=0;i processBomList = new ArrayList<>(); + for (ProcessBomParams processBomParams:params.getProcessBomParamsList()) { + ProcessBom processBom = new ProcessBom(); + processBom.setId(processBomParams.getId()); + processBom.setCreateTime(processBomParams.getCreateTime()); + processBom.setProcessName(processBomParams.getProcessName()); + processBom.setProductProcessId(processBomParams.getProductProcessId()); + processBom.setSpecification(processBomParams.getSpecification()); + processBom.setProcessContent(processBomParams.getProcessContent()); + processBom.setProcessStep(processBomParams.getProcessStep()); + processBom.setProcessApartment(processBomParams.getProcessApartment()); + processBomList.add(processBom); + } + processBomMapper.insertOrUpdate(processBomList); + + List processMaterialsBomList = new ArrayList<>(); + for (int i=0;i implements ProductProcessService { + + @Autowired + private ProductProcessMapper productProcessMapper; + + @Autowired + private ProcessBomService processBomService; + + @Autowired + private MtAloneProcessService processService; + + @Override + public List findList(ProductProcessParams params) { + return productProcessMapper.findList(params); + } + + @Override + public void save(ProductProcess productProcess, CurrentUser currentUser) { + Date date = new Date(); + + /**批次生产加工单赋值**/ + productProcess.setOperatorId(currentUser.getUserId()); + productProcess.setCreateTime(date); + productProcess.setUpdateTime(date); + productProcess.setVersion("1.1"); + productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); + productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%"); + productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); + productProcess.setCompanyId(currentUser.getCompanyId()); + productProcessMapper.insert(productProcess); + } + + @Override + public void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser) { + //首先保存批次产品加工信息 + ProductProcess productProcess = new ProductProcess(); + Date date = new Date(); + productProcess.setOperatorId(1); + productProcess.setCreateTime(date); + productProcess.setUpdateTime(date); + productProcess.setVersion("1.1"); + productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + productProcess.setSalesNumber(productProcessHaveProcess.getSalesNumber()); + productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); + productProcess.setWorkOrderName(productProcessHaveProcess.getWorkOrderName()); + productProcess.setDeliveryCode(productProcessHaveProcess.getDeliveryCode()); + productProcess.setPlanBeginTime(productProcessHaveProcess.getPlanBeginTime()); + productProcess.setPlanFinishTime(productProcessHaveProcess.getPlanFinishTime()); + productProcess.setClientId(productProcessHaveProcess.getClientId()); + productProcess.setClientName(productProcessHaveProcess.getClientName()); + productProcess.setContractCode(productProcessHaveProcess.getContractCode()); + productProcess.setContractName(productProcessHaveProcess.getContractName()); + productProcess.setProductProcessCode(productProcessHaveProcess.getProductProcessCode()); + productProcess.setProductProcessName0(productProcessHaveProcess.getProductProcessName0()); + productProcess.setSpecification(productProcessHaveProcess.getSpecification()); + productProcess.setProcessPrice(productProcessHaveProcess.getProcessPrice()); + productProcess.setLen(productProcessHaveProcess.getLen()); + productProcess.setBatchCode(productProcessHaveProcess.getBatchCode()); + productProcess.setBatchOrderCode(productProcessHaveProcess.getBatchOrderCode()); + productProcess.setShrinkage((productProcessHaveProcess.getDetectionLen()/productProcessHaveProcess.getLen())*100+"%"); + productProcess.setPiNum(productProcessHaveProcess.getPiNum()); + productProcess.setProcessContent(productProcessHaveProcess.getProcessContent()); + productProcess.setMerchandiserId(productProcessHaveProcess.getMerchandiserId()); + productProcess.setMerchandiserName(productProcessHaveProcess.getMerchandiserName()); + productProcess.setMemo(productProcessHaveProcess.getMemo()); + productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); + productProcess.setProductAnnexCode(productProcessHaveProcess.getProductAnnexCode()); + productProcess.setCompanyId(1); + productProcessMapper.insert(productProcess); + + //其次保存由前端获取的工序信息 + MtAloneProcess[] processes = ProductProcessHaveProcess.getProcesses(); + for (int i = 0; i < processes.length; i++) { + processService.save(processes[i]); + } + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java new file mode 100644 index 0000000..302244f --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java @@ -0,0 +1,150 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.Authority; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MachiningProduct; +import com.deer.wms.produce.manage.model.MachiningProductParams; +import com.deer.wms.produce.manage.service.MachiningProductService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/09/09. +*/ +@Api(description = "产品和坯布接口") +@RestController +@RequestMapping("/machining/products") +public class MachiningProductController { + + @Autowired + private MachiningProductService machiningProductService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MachiningProduct machiningProduct, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + machiningProduct.setCreateTime(new Date()); + machiningProduct.setCompanyId(currentUser.getCompanyId()); + machiningProductService.save(machiningProduct); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + machiningProductService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MachiningProduct machiningProduct) { + machiningProduct.setUpdateTime(new Date()); + machiningProductService.update(machiningProduct); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MachiningProduct machiningProduct = machiningProductService.findById(id); + return ResultGenerator.genSuccessResult(machiningProduct); + } + + @GetMapping("/list") + public Result list(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = machiningProductService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * author:caixiang + * + **/ + //获取所有产品，产品编号或者产品名称 下拉框 都用这个接口。 + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @GetMapping("/productList") + public Result productList(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + //List list = machiningProductService.findProductList(params); + List list = machiningProductService.findProductListBom(params); + + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + //获取已生成对应bom的所有产品 + @GetMapping("/productHaveBomList") + public Result productHaveBomList(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + params.setCompanyId(1); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = machiningProductService.findProductHaveBomList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * author:caixiang + **/ + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @ApiOperation(value = "查询各种类下材料", notes = "查询各种类下材料") + @PostMapping("/selectMaterialByType") + public Result selectMaterialByType(@RequestBody MachiningProduct mtAloneMachiningProduct, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + List mtAloneMachiningProduct1 = machiningProductService.findListByClothAttr(mtAloneMachiningProduct); + return ResultGenerator.genSuccessResult().setData(mtAloneMachiningProduct1); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java new file mode 100644 index 0000000..74c75e6 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java @@ -0,0 +1,183 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.produce.manage.constant.ProduceManageConstant; +import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.MaterialsOutgoingLogService; +import com.deer.wms.produce.manage.service.MaterialsStockInfoService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.service.MaterialsInfoService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.project.seed.util.StringUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/07/18. +*/ +@Api(description = "物料接口") +@RestController +@RequestMapping("/materials/infos") +public class MaterialsInfoController { + + @Autowired + private MaterialsInfoService materialsInfoService; + + @Autowired + private MaterialsStockInfoService materialsStockInfoService; + + @Autowired + private MaterialsOutgoingLogService materialsOutgoingLogService; + + @OperateLog(description = "添加物料信息", type = "增加") + @ApiOperation(value = "添加物料信息", notes = "添加物料信息") + @PostMapping("/add") + public Result add(@RequestBody MaterialsInfo materialsInfo, @ApiIgnore @User CurrentUser currentUser) { + //增加物料信息 + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + Date date = new Date(); + materialsInfo.setCreateTime(date); + materialsInfo.setVersion("1.1"); + materialsInfo.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + materialsInfo.setOperatorId(currentUser.getUserId()); + materialsInfo.setCompanyId(currentUser.getCompanyId()); + materialsInfo.setCode(ProduceManagePublicMethod.creatUniqueCode("WL")); + materialsInfoService.save(materialsInfo); + + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除物料", type = "删除") + @ApiOperation(value = "删除物料", notes = "删除物料") + @DeleteMapping("/delete/{materialsId}") + public Result delete(@PathVariable Integer materialsId) { + //删除物料，顺带删除相应的库存信息 + MaterialsInfo materialsInfo = materialsInfoService.findById(materialsId); + materialsInfoService.deleteById(materialsId); + MaterialsStockInfo stock = materialsStockInfoService.findBy("materialsId", + materialsInfo.getId()); + materialsStockInfoService.deleteById(stock.getId()); + + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改物料", type = "更新") + @ApiOperation(value = "修改物料", notes = "修改物料") + @PostMapping("/update") + public Result update(@RequestBody MaterialsInfo materialsInfo) { + materialsInfoService.update(materialsInfo); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "获取某种物料详细信息", type = "查询") + @ApiOperation(value = "获取某种物料详细信息", notes = "获取某种物料详细信息") + @GetMapping("/detail") + public Result detail(MaterialsInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + StringUtil.trimObjectStringProperties(params); + + params.setCompanyId(currentUser.getCompanyId()); + MaterialsInfoDto materialsInfoDto = materialsInfoService.findDetailById(params); + return ResultGenerator.genSuccessResult(materialsInfoDto); + } + + @ApiImplicitParams({ + @ApiImplicitParam(name = "materialsId", value = "物料id", paramType = "query", dataType = "int", required = true) + }) + @OperateLog(description = "物料信息分页查询", type = "查询") + @ApiOperation(value = "物料信息列表分页", notes = "物料信息列表分页") + @GetMapping("/list") + public Result list(MaterialsInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + StringUtil.trimObjectStringProperties(params); + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = materialsInfoService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * author:caixiang + * + * desc:依据物料名称、编号查询该物料的bom + **/ + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @ApiOperation(value = "依据材料名称或者num查找物料bom", notes = "依据材料名称或者num查找物料bom") + @PostMapping("/selectMaterialByNameOrNum") + public Result selectMaterialByNameOrNum(@RequestBody MaterialsInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = new ArrayList<>(); + try { + list = materialsInfoService.findMaterialByNameAndNum(params); + }catch (Exception e){ + ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常","null"); + } + PageInfo pageInfo = new PageInfo(list);; + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * author:caixiang + * + * desc: 依据材料关键字 查找对用的list。 + * 关键字(其中一个关键字)： + * mt_alone_materials_info（materials_name OR code OR specification OR unit_id） + * mt_alone_process_materials_bom(dosage) + **/ + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @ApiOperation(value = "依据材料关键字 查找对用的list", notes = "依据材料关键字 查找对用的list") + @PostMapping("/selectMaterialsByKeyWords") + public Result selectMaterialsByKeyWords(@RequestBody MaterialsInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = new ArrayList<>(); + try { + list = materialsInfoService.findMaterialsByKeyWords(params); + }catch (Exception e){ + ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常","null"); + } + PageInfo pageInfo = new PageInfo(list);; + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java new file mode 100644 index 0000000..6482dc3 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.constant.ProduceManageConstant; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.MaterialsOutgoingLogService; +import com.deer.wms.produce.manage.service.MaterialsStockInfoService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Date; +import java.util.List; + + +/** +* Created by guo on 2019/07/21. +*/ +@Api(description = "物料出入库接口") +@RestController +@RequestMapping("/materials/outgoing/logs") +public class MaterialsOutgoingLogController { + + @Autowired + private MaterialsOutgoingLogService materialsOutgoingLogService; + + @Autowired + private MaterialsStockInfoService materialsStockInfoService; + + //@Autowired + //private MaterialsOutgoingLogDTOService materialsOutgoingLogDTOService; + + @OperateLog(description = "添加一条出入库记录", type = "增加") + @ApiOperation(value = "添加一条出入库记录", notes = "添加一条出入库记录") + @PostMapping("/add") + public Result add(@RequestBody MaterialsOutgoingLogDto materialsOutgoingLogDto, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + materialsOutgoingLogService.save(materialsOutgoingLogDto, currentUser); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + materialsOutgoingLogService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MaterialsOutgoingLog materialsOutgoingLog) { + //materialsOutgoingLog.setUpdateTime(new Date()); + materialsOutgoingLogService.update(materialsOutgoingLog); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MaterialsOutgoingLog materialsOutgoingLog = materialsOutgoingLogService.findById(id); + return ResultGenerator.genSuccessResult(materialsOutgoingLog); + } + + + @OperateLog(description = "获取某种物料的所有出入库记录", type = "查询") + @ApiOperation(value = "获取某种物料的所有出入库记录", notes = "获取某种物料的所有出入库记录") + @GetMapping("/listByOneMaterial") + public Result listByOneMaterial(MaterialsOutgoingLogParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = materialsOutgoingLogService.findListByOneMaterial(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsStockInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsStockInfoController.java new file mode 100644 index 0000000..15e9bf4 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsStockInfoController.java @@ -0,0 +1,88 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.MaterialsStockInfo; +import com.deer.wms.produce.manage.service.MaterialsStockInfoService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by guo on 2019/07/21. +*/ +@Api(description = "物料库存接口") +@RestController +@RequestMapping("/materials/stock/infos") +public class MaterialsStockInfoController { + + @Autowired + private MaterialsStockInfoService materialsStockInfoService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MaterialsStockInfo materialsStockInfo, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + materialsStockInfo.setCreateTime(new Date()); + materialsStockInfo.setCompanyId(currentUser.getCompanyId()); + materialsStockInfoService.save(materialsStockInfo); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + materialsStockInfoService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MaterialsStockInfo materialsStockInfo) { + //materialsStockInfo.setUpdateTime(new Date()); + materialsStockInfoService.update(materialsStockInfo); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MaterialsStockInfo materialsStockInfo = materialsStockInfoService.findById(id); + return ResultGenerator.genSuccessResult(materialsStockInfo); + } + + //@GetMapping("/list") + //public Result list(MaterialsStockInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + // params.setCompanyId(currentUser.getCompanyId()); + //}else{ + // params.setCompanyId(null); + // } + // PageHelper.startPage(params.getPageNum(), params.getPageSize()); + // List list = materialsStockInfoService.findList(params); + // PageInfo pageInfo = new PageInfo(list); + // return ResultGenerator.genSuccessResult(pageInfo); + //} + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java new file mode 100644 index 0000000..0dea8c1 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java @@ -0,0 +1,105 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.constant.ProduceManageConstant; +import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.MtAloneProcessService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by hy on 2019/07/19. +*/ +@Api(description = "工序接口") +@RestController +@RequestMapping("/mt/alone/processs") +public class MtAloneProcessController { + + @Autowired + private MtAloneProcessService mtAloneProcessService; + + /**工序处理界面，由前端获取工序列表对应行工序数据，完善后保存至工序库表**/ + @OperateLog(description = "添加/处理工序", type = "增加") + @ApiOperation(value = "添加/处理工序", notes = "添加/处理工序") + @PostMapping("/add") + public Result add(@RequestBody MtAloneProcess mtAloneProcess, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + Date date = new Date(); + mtAloneProcess.setCreateTime(date); + mtAloneProcess.setUpdateTime(date); + mtAloneProcess.setOperatorId(currentUser.getUserId()); + mtAloneProcess.setVersion("1.1"); + mtAloneProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); + mtAloneProcess.setCode(ProduceManagePublicMethod.creatUniqueCode("GX")); + mtAloneProcess.setLoss(mtAloneProcess.getAfterLen()/mtAloneProcess.getOriginalLen()); + mtAloneProcess.setMerchandiserId(currentUser.getUserId()); + mtAloneProcess.setCompanyId(currentUser.getCompanyId()); + mtAloneProcessService.save(mtAloneProcess); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + mtAloneProcessService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MtAloneProcess mtAloneProcess) { + mtAloneProcess.setUpdateTime(new Date()); + mtAloneProcessService.update(mtAloneProcess); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtAloneProcess mtAloneProcess = mtAloneProcessService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneProcess); + } + + /** + * hy + * 用于批次生产加工新建页面下方的工序列表展示,获取工序bom和工序，如果没有工序则新建对应的工序并初步赋值 + * @param params + * @param currentUser + * @return + */ + @OperateLog(description = "根据产品bom查询工序", type = "查询") + @ApiOperation(value = "根据产品bom查询工序", notes = "根据产品bom查询工序") + @GetMapping("/processListByProductBom") + public Result processListByProductBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + params.setCompanyId(1); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtAloneProcessService.findProcessListByProductBom(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessMethodsController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessMethodsController.java new file mode 100644 index 0000000..bc0f47d --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessMethodsController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MtAloneProcessMethods; +import com.deer.wms.produce.manage.model.MtAloneProcessMethodsParams; +import com.deer.wms.produce.manage.service.MtAloneProcessMethodsService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/10/16. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/mt/alone/process/methodss") +public class MtAloneProcessMethodsController { + + @Autowired + private MtAloneProcessMethodsService mtAloneProcessMethodsService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MtAloneProcessMethods mtAloneProcessMethods, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneProcessMethods.setCreateTime(new Date()); + mtAloneProcessMethods.setCompanyId(currentUser.getCompanyId().longValue()); + mtAloneProcessMethodsService.save(mtAloneProcessMethods); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + mtAloneProcessMethodsService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MtAloneProcessMethods mtAloneProcessMethods) { + mtAloneProcessMethods.setUpdateTime(new Date()); + mtAloneProcessMethodsService.update(mtAloneProcessMethods); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtAloneProcessMethods mtAloneProcessMethods = mtAloneProcessMethodsService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneProcessMethods); + } + + @GetMapping("/list") + public Result list(MtAloneProcessMethodsParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtAloneProcessMethodsService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProductNameController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProductNameController.java new file mode 100644 index 0000000..f4511a1 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProductNameController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MtAloneProductName; +import com.deer.wms.produce.manage.model.MtAloneProductNameParams; +import com.deer.wms.produce.manage.service.MtAloneProductNameService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/10/16. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/mt/alone/product/names") +public class MtAloneProductNameController { + + @Autowired + private MtAloneProductNameService mtAloneProductNameService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MtAloneProductName mtAloneProductName, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneProductName.setCreateTime(new Date()); + mtAloneProductName.setCompanyId(currentUser.getCompanyId().longValue()); + mtAloneProductNameService.save(mtAloneProductName); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + mtAloneProductNameService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MtAloneProductName mtAloneProductName) { + mtAloneProductName.setUpdateTime(new Date()); + mtAloneProductNameService.update(mtAloneProductName); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtAloneProductName mtAloneProductName = mtAloneProductNameService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneProductName); + } + + @GetMapping("/list") + public Result list(MtAloneProductNameParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtAloneProductNameService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneSerialNumberController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneSerialNumberController.java new file mode 100644 index 0000000..7ecf3bb --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneSerialNumberController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MtAloneSerialNumber; +import com.deer.wms.produce.manage.model.MtAloneSerialNumberParams; +import com.deer.wms.produce.manage.service.MtAloneSerialNumberService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/10/17. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/mt/alone/serial/numbers") +public class MtAloneSerialNumberController { + + @Autowired + private MtAloneSerialNumberService mtAloneSerialNumberService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MtAloneSerialNumber mtAloneSerialNumber, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneSerialNumber.setCreateTime(new Date()); + mtAloneSerialNumber.setCompanyId(currentUser.getCompanyId().longValue()); + mtAloneSerialNumberService.save(mtAloneSerialNumber); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer Id) { + mtAloneSerialNumberService.deleteById(Id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MtAloneSerialNumber mtAloneSerialNumber) { + mtAloneSerialNumber.setUpdateTime(new Date()); + mtAloneSerialNumberService.update(mtAloneSerialNumber); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtAloneSerialNumber mtAloneSerialNumber = mtAloneSerialNumberService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneSerialNumber); + } + + @GetMapping("/list") + public Result list(MtAloneSerialNumberParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtAloneSerialNumberService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtNumberConfController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtNumberConfController.java new file mode 100644 index 0000000..38f8a50 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtNumberConfController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MtNumberConf; +import com.deer.wms.produce.manage.model.MtNumberConfParams; +import com.deer.wms.produce.manage.service.MtNumberConfService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/10/17. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/mt/number/confs") +public class MtNumberConfController { + + @Autowired + private MtNumberConfService mtNumberConfService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody MtNumberConf mtNumberConf, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtNumberConf.setCreateTime(new Date()); + mtNumberConf.setCompanyId(currentUser.getCompanyId().longValue()); + mtNumberConfService.save(mtNumberConf); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer Id) { + mtNumberConfService.deleteById(Id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody MtNumberConf mtNumberConf) { + mtNumberConf.setUpdateTime(new Date()); + mtNumberConfService.update(mtNumberConf); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtNumberConf mtNumberConf = mtNumberConfService.findById(id); + return ResultGenerator.genSuccessResult(mtNumberConf); + } + + @GetMapping("/list") + public Result list(MtNumberConfParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtNumberConfService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtStockProvendorController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtStockProvendorController.java new file mode 100644 index 0000000..bfead19 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtStockProvendorController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.MtStockProvendor; +import com.deer.wms.produce.manage.model.MtStockProvendorParams; +import com.deer.wms.produce.manage.service.MtStockProvendorService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/10/17. +*/ +@Api(description = "采购供应商信息接口") +@RestController +@RequestMapping("/mt/stock/provendors") +public class MtStockProvendorController { + + @Autowired + private MtStockProvendorService mtStockProvendorService; + + @OperateLog(description = "添加采购供应商信息", type = "增加") + @ApiOperation(value = "添加采购供应商信息", notes = "添加采购供应商信息") + @PostMapping("/add") + public Result add(@RequestBody MtStockProvendor mtStockProvendor, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtStockProvendor.setCreateTime(new Date()); + mtStockProvendor.setCompanyId(currentUser.getCompanyId().longValue()); + mtStockProvendorService.save(mtStockProvendor); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除采购供应商信息", type = "删除") + @ApiOperation(value = "删除采购供应商信息", notes = "删除采购供应商信息") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + mtStockProvendorService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改采购供应商信息", type = "更新") + @ApiOperation(value = "修改采购供应商信息", notes = "修改采购供应商信息") + @PostMapping("/update") + public Result update(@RequestBody MtStockProvendor mtStockProvendor) { + mtStockProvendor.setUpdateTime(new Date()); + mtStockProvendorService.update(mtStockProvendor); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + MtStockProvendor mtStockProvendor = mtStockProvendorService.findById(id); + return ResultGenerator.genSuccessResult(mtStockProvendor); + } + + @GetMapping("/list") + public Result list(MtStockProvendorParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = mtStockProvendorService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBatchRelatController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBatchRelatController.java new file mode 100644 index 0000000..617e8f9 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBatchRelatController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.ProcessBatchRelat; +import com.deer.wms.produce.manage.model.ProcessBatchRelatParams; +import com.deer.wms.produce.manage.service.ProcessBatchRelatService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/09/09. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/process/batch/relats") +public class ProcessBatchRelatController { + + @Autowired + private ProcessBatchRelatService processBatchRelatService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessBatchRelat processBatchRelat, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + processBatchRelat.setCreateTime(new Date()); + processBatchRelat.setCompanyId(currentUser.getCompanyId()); + processBatchRelatService.save(processBatchRelat); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processBatchRelatService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessBatchRelat processBatchRelat) { + processBatchRelat.setUpdateTime(new Date()); + processBatchRelatService.update(processBatchRelat); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessBatchRelat processBatchRelat = processBatchRelatService.findById(id); + return ResultGenerator.genSuccessResult(processBatchRelat); + } + + @GetMapping("/list") + public Result list(ProcessBatchRelatParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processBatchRelatService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java new file mode 100644 index 0000000..82b7652 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java @@ -0,0 +1,193 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProcessBomService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by guo on 2019/07/18. +*/ +@Api(description = "工序Bom接口") +@RestController +@RequestMapping("/process/bom") +public class ProcessBomController { + + @Autowired + private ProcessBomService processBomService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessBom mtAloneProcessBom, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneProcessBom.setCreateTime(new Date()); + mtAloneProcessBom.setCompanyId(currentUser.getCompanyId()); + processBomService.save(mtAloneProcessBom); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "添加产品工艺", type = "增加") + @ApiOperation(value = "添加产品工艺", notes = "添加产品工艺") + @PostMapping("/add/process/to/product") + public Result addProcessToProduct(@RequestBody ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){ + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + params.setCreateTime(new Date()); + params.setCompanyId(currentUser.getCompanyId()); + List list = params.getProcessBomVoList(); + for (ProcessBomVo processBomVo:list) { + processBomVo.setCreateTime(new Date()); + processBomVo.setCompanyId(currentUser.getCompanyId()); + for (ProcessMaterialsBom processMaterialsBom:processBomVo.getList()) { + processMaterialsBom.setCreateTime(new Date()); + processMaterialsBom.setCompanyId(currentUser.getCompanyId()); + } + } + processBomService.addProcessToProduct(params); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processBomService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessBom processBom) { + + processBomService.update(processBom); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessBom mtAloneProcessBom = processBomService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneProcessBom); + } + + @GetMapping("/list") + public Result list(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processBomService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + @GetMapping("/list/by/id") + public Result listById(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processBomService.findListById(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + /** + * 根据选择的产品名称来展示产品其他数据和工序数据 + */ + @ApiOperation(value = "工序来获取物料信息", notes = "工序来获取物料信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @GetMapping("/list/by/product/name/id") + public Result listByProductNameId(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){ + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processBomService.findListByProductNameId(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * 添加工序数据到数据库 + */ + @ApiOperation(value = "工序来获取物料信息", notes = "工序来获取物料信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @GetMapping("/insert/process/bom") + public Result insertProcessBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){ + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + + return ResultGenerator.genSuccessResult(); + } + + /** + * hy + * 根据产品bom的id获取工序bom* + * @param params + * @param currentUser + * @return + */ + @GetMapping("/listByProductBom") + public Result listByProductBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processBomService.findListByProductBom(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessDetectRelatController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessDetectRelatController.java new file mode 100644 index 0000000..b71a315 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessDetectRelatController.java @@ -0,0 +1,88 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProcessDetectRelat; +import com.deer.wms.produce.manage.service.ProcessDetectRelatService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by guo on 2019/07/21. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/process/detect/relats") +public class ProcessDetectRelatController { + + @Autowired + private ProcessDetectRelatService processDetectRelatService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessDetectRelat processDetectRelat, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + processDetectRelat.setCreateTime(new Date()); + processDetectRelat.setCompanyId(currentUser.getCompanyId()); + processDetectRelatService.save(processDetectRelat); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processDetectRelatService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessDetectRelat processDetectRelat) { + processDetectRelat.setUpdateTime(new Date()); + processDetectRelatService.update(processDetectRelat); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessDetectRelat processDetectRelat = processDetectRelatService.findById(id); + return ResultGenerator.genSuccessResult(processDetectRelat); + } + + //@GetMapping("/list") + //public Result list(ProcessDetectRelatParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + // params.setCompanyId(currentUser.getCompanyId()); + //}else{ + // params.setCompanyId(null); + // } + // PageHelper.startPage(params.getPageNum(), params.getPageSize()); + // List list = processDetectRelatService.findList(params); + // PageInfo pageInfo = new PageInfo(list); + // return ResultGenerator.genSuccessResult(pageInfo); + //} + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsBomController.java new file mode 100644 index 0000000..ec62936 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsBomController.java @@ -0,0 +1,139 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.ProcessMaterialsBomService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + + +/** +* Created by hy on 2019/07/19. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/process/materials/boms") +public class ProcessMaterialsBomController { + + @Autowired + private ProcessMaterialsBomService processMaterialsBomService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessMaterialsBom processMaterialsBom, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + processMaterialsBom.setCreateTime(new Date()); + processMaterialsBom.setCompanyId(currentUser.getCompanyId()); + processMaterialsBomService.save(processMaterialsBom); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processMaterialsBomService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessMaterialsBom processMaterialsBom) { + processMaterialsBom.setUpdateTime(new Date()); + processMaterialsBomService.update(processMaterialsBom); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessMaterialsBom processMaterialsBom = processMaterialsBomService.findById(id); + return ResultGenerator.genSuccessResult(processMaterialsBom); + } + + /**通过某产品id获取该产品、工序、物料bom的信息，对应新建加工单时下方展示的材料信息，一条sql语句返回所有信息**/ + @GetMapping("/procMatBomVoListByProId") + public Result procMatBomVoListByProId(ProcessMaterialsBomParams params, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + params.setCompanyId(1); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processMaterialsBomService.findProcMatBomVoListByProId(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /**根据工序bom的id获取物料bom**/ + @GetMapping("/listByProcessBomId") + public Result listByProcessBomId(ProcessMaterialsBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = processMaterialsBomService.findListByProcessBomId(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + *author:caixiang + **/ + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @GetMapping("/findMaterilaListByProcessBomId") + public Result findMaterilaListByProcessBomId(ProcessBom params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + List list = new ArrayList<>(); + try { + list = processMaterialsBomService.findMaterilaListByProcessBomId(params); + }catch (Exception e){ + return ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常",null); + } + return ResultGenerator.genSuccessResult(list); + } + + //@GetMapping("/list") + //public Result list(ProcessMaterialsBomParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + // params.setCompanyId(currentUser.getCompanyId()); + //}else{ + // params.setCompanyId(null); + // } + // PageHelper.startPage(params.getPageNum(), params.getPageSize()); + // List list = processMaterialsBomService.findList(params); + // PageInfo pageInfo = new PageInfo(list); + // return ResultGenerator.genSuccessResult(pageInfo); + //} + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsController.java new file mode 100644 index 0000000..060d559 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessMaterialsController.java @@ -0,0 +1,89 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProcessMaterials; +import com.deer.wms.produce.manage.model.ProcessMaterialsParams; +import com.deer.wms.produce.manage.service.ProcessMaterialsService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by hy on 2019/07/19. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/process/materialss") +public class ProcessMaterialsController { + + @Autowired + private ProcessMaterialsService processMaterialsService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessMaterials processMaterials, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + processMaterials.setCreateTime(new Date()); + processMaterials.setCompanyId(currentUser.getCompanyId()); + processMaterialsService.save(processMaterials); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processMaterialsService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessMaterials processMaterials) { + processMaterials.setUpdateTime(new Date()); + processMaterialsService.update(processMaterials); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessMaterials mtAloneProcessMaterials = processMaterialsService.findById(id); + return ResultGenerator.genSuccessResult(mtAloneProcessMaterials); + } + + //@GetMapping("/list") + //public Result list(ProcessMaterialsParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + // params.setCompanyId(currentUser.getCompanyId()); + //}else{ + // params.setCompanyId(null); + // } + // PageHelper.startPage(params.getPageNum(), params.getPageSize()); + // List list = mtAloneProcessMaterialsService.findList(params); + // PageInfo pageInfo = new PageInfo(list); + // return ResultGenerator.genSuccessResult(pageInfo); + //} + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessQualityInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessQualityInfoController.java new file mode 100644 index 0000000..69df5c5 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessQualityInfoController.java @@ -0,0 +1,89 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProcessQualityInfo; +import com.deer.wms.produce.manage.model.ProcessQualityInfoParams; +import com.deer.wms.produce.manage.service.ProcessQualityInfoService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.List; + + +/** +* Created by hy on 2019/07/19. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/process/quality/infos") +public class ProcessQualityInfoController { + + @Autowired + private ProcessQualityInfoService processQualityInfoService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProcessQualityInfo processQualityInfo, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + processQualityInfo.setCreateTime(new Date()); + processQualityInfo.setCompanyId(currentUser.getCompanyId()); + processQualityInfoService.save(processQualityInfo); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + processQualityInfoService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProcessQualityInfo processQualityInfo) { + processQualityInfo.setUpdateTime(new Date()); + processQualityInfoService.update(processQualityInfo); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProcessQualityInfo processQualityInfo = processQualityInfoService.findById(id); + return ResultGenerator.genSuccessResult(processQualityInfo); + } + + //@GetMapping("/list") + //public Result list(ProcessQualityInfoParams params, @ApiIgnore @User CurrentUser currentUser) { + // if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + // } + // + // if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + // params.setCompanyId(currentUser.getCompanyId()); + //}else{ + // params.setCompanyId(null); + // } + // PageHelper.startPage(params.getPageNum(), params.getPageSize()); + // List list = processQualityInfoService.findList(params); + // PageInfo pageInfo = new PageInfo(list); + // return ResultGenerator.genSuccessResult(pageInfo); + //} + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java new file mode 100644 index 0000000..cd8b74f --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.ProductBatchDetect; +import com.deer.wms.produce.manage.model.ProductBatchDetectParams; +import com.deer.wms.produce.manage.service.ProductBatchDetectService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/09/09. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/product/batch/detects") +public class ProductBatchDetectController { + + @Autowired + private ProductBatchDetectService productBatchDetectService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProductBatchDetect productBatchDetect, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productBatchDetect.setCreateTime(new Date()); + productBatchDetect.setCompanyId(currentUser.getCompanyId()); + productBatchDetectService.save(productBatchDetect); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + productBatchDetectService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProductBatchDetect productBatchDetect) { + productBatchDetect.setUpdateTime(new Date()); + productBatchDetectService.update(productBatchDetect); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProductBatchDetect productBatchDetect = productBatchDetectService.findById(id); + return ResultGenerator.genSuccessResult(productBatchDetect); + } + + @GetMapping("/list") + public Result list(ProductBatchDetectParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productBatchDetectService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java new file mode 100644 index 0000000..713e19a --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductBatchDetectDetController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.ProductBatchDetectDet; +import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams; +import com.deer.wms.produce.manage.service.ProductBatchDetectDetService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/09/09. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/product/batch/detect/dets") +public class ProductBatchDetectDetController { + + @Autowired + private ProductBatchDetectDetService productBatchDetectDetService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProductBatchDetectDet productBatchDetectDet, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productBatchDetectDet.setCreateTime(new Date()); + productBatchDetectDet.setCompanyId(currentUser.getCompanyId()); + productBatchDetectDetService.save(productBatchDetectDet); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + productBatchDetectDetService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProductBatchDetectDet productBatchDetectDet) { + productBatchDetectDet.setUpdateTime(new Date()); + productBatchDetectDetService.update(productBatchDetectDet); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProductBatchDetectDet productBatchDetectDet = productBatchDetectDetService.findById(id); + return ResultGenerator.genSuccessResult(productBatchDetectDet); + } + + @GetMapping("/list") + public Result list(ProductBatchDetectDetParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productBatchDetectDetService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java new file mode 100644 index 0000000..bebd923 --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBatchDetController.java @@ -0,0 +1,92 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.produce.manage.model.ProductProcessBatchDetParams; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.deer.wms.produce.manage.model.ProductProcessBatchDet; +import com.deer.wms.produce.manage.service.ProductProcessBatchDetService; +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import springfox.documentation.annotations.ApiIgnore; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + + + +/** +* Created by on 2019/09/09. +*/ +@Api(description = "xxx接口") +@RestController +@RequestMapping("/product/process/batch/dets") +public class ProductProcessBatchDetController { + + @Autowired + private ProductProcessBatchDetService productProcessBatchDetService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProductProcessBatchDet productProcessBatchDet, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productProcessBatchDet.setCreateTime(new Date()); + productProcessBatchDet.setCompanyId(currentUser.getCompanyId()); + productProcessBatchDetService.save(productProcessBatchDet); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + productProcessBatchDetService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProductProcessBatchDet productProcessBatchDet) { + productProcessBatchDet.setUpdateTime(new Date()); + productProcessBatchDetService.update(productProcessBatchDet); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProductProcessBatchDet productProcessBatchDet = productProcessBatchDetService.findById(id); + return ResultGenerator.genSuccessResult(productProcessBatchDet); + } + + @GetMapping("/list") + public Result list(ProductProcessBatchDetParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productProcessBatchDetService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java new file mode 100644 index 0000000..7bf680c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java @@ -0,0 +1,208 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProductProcessBom; +import com.deer.wms.produce.manage.model.ProductProcessBomDto; +import com.deer.wms.produce.manage.model.ProductProcessBomParams; +import com.deer.wms.produce.manage.model.ProductProcessBomVO; +import com.deer.wms.produce.manage.service.ProductProcessBomService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.constant.SystemManageConstant; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + + +/** +* Created by guo on 2019/07/18. +*/ +@Api(description = "产品bom接口") +@RestController +@RequestMapping("/product/process/boms") +public class ProductProcessBomController { + + @Autowired + private ProductProcessBomService productProcessBomService; + + @OperateLog(description = "添加xxx", type = "增加") + @ApiOperation(value = "添加xxx", notes = "添加xxx") + @PostMapping("/add") + public Result add(@RequestBody ProductProcessBom mtAloneProductProcessBom, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneProductProcessBom.setCreateTime(new Date()); + mtAloneProductProcessBom.setCompanyId(currentUser.getCompanyId()); + productProcessBomService.save(mtAloneProductProcessBom); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "添加工艺", type = "增加") + @ApiOperation(value = "添加工艺", notes = "添加工艺") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @PostMapping("/add/product/process/bom") + public Result addProductProcessBom(@RequestBody ProductProcessBomParams productProcessBomParams, + @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productProcessBomParams.setCreateTime(new Date()); + productProcessBomParams.setCompanyId(currentUser.getCompanyId()); +// productProcessBomParams.setProductId(1); +// productProcessBomParams.setProcessContent("1"); +// productProcessBomParams.setSpecification("1"); + System.out.println(productProcessBomParams.toString()); + productProcessBomService.addProductProcessBom(productProcessBomParams); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改工艺", type = "修改") + @ApiOperation(value = "修改工艺", notes = "修改工艺") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @PostMapping("/update/product/process/bom") + public Result updateProductProcessBom(@RequestBody ProductProcessBomParams productProcessBomParams, + @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productProcessBomParams.setCreateTime(new Date()); + productProcessBomParams.setCompanyId(currentUser.getCompanyId()); +// productProcessBomParams.setProductId(1); +// productProcessBomParams.setProcessContent("1"); +// productProcessBomParams.setSpecification("1"); + + productProcessBomService.updateProductProcessBom(productProcessBomParams); + return ResultGenerator.genSuccessResult(); + } + + @ApiOperation(value = "删除工艺", notes = "删除工艺") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @PostMapping("/delete/product/process/bom") + public Result deleteProductProcessBom(@RequestBody ProductProcessBomParams productProcessBomParams, + @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + productProcessBomParams.setCreateTime(new Date()); + productProcessBomParams.setCompanyId(currentUser.getCompanyId()); + productProcessBomService.updateProductProcessBom(productProcessBomParams); + return ResultGenerator.genSuccessResult(); + } + + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + productProcessBomService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProductProcessBom mtAloneProductProcessBom) { + mtAloneProductProcessBom.setUpdateTime(new Date()); + productProcessBomService.update(mtAloneProductProcessBom); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProductProcessBom productProcessBom = productProcessBomService.findById(id); + return ResultGenerator.genSuccessResult(productProcessBom); + } + + /**仅获取所有产品Bom名称、产品名称、公司名称，用于新建加工单页面产品下拉框，该下拉框中的产品是已有bom的产品**/ + @GetMapping("/proBomAndProList") + public Result proBomAndProList(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productProcessBomService.findProBomAndProList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + @GetMapping("/list/by/term") + public Result listByTerm(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){ + params.setCompanyId(currentUser.getCompanyId()); + }else{ + params.setCompanyId(null); + } + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productProcessBomService.findListByTerm(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /**根据产品bom的id获取产品bom,用于新建批次产品加工的产品bom下拉框填入名称**/ + @GetMapping("/listById") + public Result listByProductId(ProductProcessBomParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productProcessBomService.findListById(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + * author:caixiang + * + * desc:依据产品名称、产品编号查询该产品的工艺列表 + **/ + @ApiImplicitParams({ + @ApiImplicitParam(name = "access-token", value = "token", paramType = "header", dataType = "String", required = true) + }) + @ApiOperation(value = "依据产品名称、产品编号查询该产品的工艺列表", notes = "依据产品名称、产品编号查询该产品的工艺列表") + @PostMapping("/selectProcessByProductNameNum") + public Result selectProcessByProductNameNum(@RequestBody ProductProcessBomParams mtAloneProductProcessBomParams, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + mtAloneProductProcessBomParams.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(mtAloneProductProcessBomParams.getPageNum(), mtAloneProductProcessBomParams.getPageSize()); + List byProductNameAndProductNum = new ArrayList(); + try { + System.out.println("pageNum:"+mtAloneProductProcessBomParams.getPageNum()); + System.out.println("getPageSize:"+mtAloneProductProcessBomParams.getPageSize()); + byProductNameAndProductNum = productProcessBomService.findByProductNameAndProductNum(mtAloneProductProcessBomParams); + + }catch (Exception e){ + ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常","null"); + } + PageInfo pageInfo = new PageInfo(byProductNameAndProductNum);; + return ResultGenerator.genSuccessResult(pageInfo); + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java new file mode 100644 index 0000000..4d8027e --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java @@ -0,0 +1,115 @@ +package com.deer.wms.produce.manage.web; + +import com.deer.wms.intercept.annotation.User; +import com.deer.wms.intercept.common.data.CurrentUser; +import com.deer.wms.produce.manage.model.ProductProcess; +import com.deer.wms.produce.manage.model.ProductProcessHaveProcess; +import com.deer.wms.produce.manage.model.ProductProcessParams; +import com.deer.wms.produce.manage.model.ProductProcessVo; +import com.deer.wms.produce.manage.service.ProcessBomService; +import com.deer.wms.produce.manage.service.ProductProcessService; +import com.deer.wms.project.seed.annotation.OperateLog; +import com.deer.wms.project.seed.core.result.CommonCode; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + + +/** +* Created by hy on 2019/07/19. +*/ +@Api(description = "生产加工接口") +@RestController +@RequestMapping("/product/processs") +public class ProductProcessController { + + @Autowired + private ProductProcessService productProcessService; + + @Autowired + private ProcessBomService processBomService; + + /** + * 生成某种产品某一批次的生产加工单 + * 需要调用对应产品bom + * @param productProcess + * @param currentUser + * @return + */ + @OperateLog(description = "添加批次生产加工单", type = "增加") + @ApiOperation(value = "添加批次生产加工单", notes = "添加批次生产加工单") + @PostMapping("/add") + public Result add(@RequestBody ProductProcess productProcess, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + productProcessService.save(productProcess, currentUser); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "删除xxx", type = "删除") + @ApiOperation(value = "删除xxx", notes = "删除xxx") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable Integer id) { + productProcessService.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @OperateLog(description = "修改xxx", type = "更新") + @ApiOperation(value = "修改xxx", notes = "修改xxx") + @PostMapping("/update") + public Result update(@RequestBody ProductProcess productProcess) { + productProcessService.update(productProcess); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/detail/{id}") + public Result detail(@PathVariable Integer id) { + ProductProcess productProcess = productProcessService.findById(id); + return ResultGenerator.genSuccessResult(productProcess); + } + + @OperateLog(description = "生产计划分页查询", type = "查询") + @ApiOperation(value = "生产计划列表分页", notes = "生产计划列表分页") + @GetMapping("/list") + public Result list(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + + params.setCompanyId(currentUser.getCompanyId()); + PageHelper.startPage(params.getPageNum(), params.getPageSize()); + List list = productProcessService.findList(params); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + + /** + *新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息 + * hy + * @param productProcessHaveProcess + * @param currentUser + * @return + */ + @OperateLog(description = "批次生产加工及工序保存更新", type = "保存更新") + @ApiOperation(value = "批次生产加工及工序保存更新", notes = "批次生产加工及工序保存更新") + @PostMapping("/addAndUpdateProProcAndProc") + public Result addAndUpdateProProcAndProc(@RequestBody ProductProcessHaveProcess productProcessHaveProcess, @ApiIgnore @User CurrentUser currentUser) { + //if(currentUser==null){ + // return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + //} + + productProcessService.addAndUpdateProProcAndProc(productProcessHaveProcess, currentUser); + return ResultGenerator.genSuccessResult(); + } + +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/Test.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/Test.java new file mode 100644 index 0000000..2efeedd --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/Test.java @@ -0,0 +1,16 @@ +package com.deer.wms.produce.manage.web; + +/** + * @Author: weihongyang + * @Date: 2019/10/18 16:54 + * @Version 1.0 + */ +public class Test { + + public static void main(String[] args){ + String s = "qwe"; + int i = 1; + s = s + i; + System.out.println(s); + } +} diff --git a/wms-produce-manage/src/main/resources/META-INF/spring-devtools.properties b/wms-produce-manage/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 0000000..868b195 --- /dev/null +++ b/wms-produce-manage/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.companycommonlibs=tk/mybatis.* \ No newline at end of file diff --git a/wms-produce-manage/src/main/resources/banner.txt b/wms-produce-manage/src/main/resources/banner.txt new file mode 100644 index 0000000..83a950a --- /dev/null +++ b/wms-produce-manage/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +${AnsiColor.BRIGHT_YELLOW} +██████╗ ███╗ ███╗███████╗ ██████╗ ██╗ ██╗ ███╗ ███╗████████╗ +██╔══██╗████╗ ████║██╔════╝ ██╔══██╗╚██╗ ██╔╝ ████╗ ████║╚══██╔══╝ +██████╔╝██╔████╔██║███████╗ ██████╔╝ ╚████╔╝ ██╔████╔██║ ██║ +██╔═══╝ ██║╚██╔╝██║╚════██║ ██╔══██╗ ╚██╔╝ ██║╚██╔╝██║ ██║ +██║ ██║ ╚═╝ ██║███████║ ██████╔╝ ██║ ██║ ╚═╝ ██║ ██║ +╚═╝ ╚═╝ ╚═╝╚══════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ +spring-boot.version：${spring-boot.version} diff --git a/wms-produce-manage/src/main/resources/config/application-dev.properties b/wms-produce-manage/src/main/resources/config/application-dev.properties new file mode 100644 index 0000000..c914dee --- /dev/null +++ b/wms-produce-manage/src/main/resources/config/application-dev.properties @@ -0,0 +1,148 @@ +server.context-path=/pms +spring.application.name=pallet-api-service +server.port=9062 + +#控制台彩色输出 +spring.output.ansi.enabled=ALWAYS + + +####配置数据库连接 +#spring.datasource.url=jdbc:mysql://47.110.34.124:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +#spring.datasource.username=root +#spring.datasource.password=MT_xiaobu_&20190524% +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.datasource.url=jdbc:mysql://47.96.183.77:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +spring.datasource.username=root +spring.datasource.password=mt_%wms#_CS_20190430 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.max-wait=10000 +spring.datasource.max-active=5 +spring.datasource.auto-commit=true +spring.datasource.connection-test-query=select 1 +spring.datasource.test-on-borrow=true +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=18800 +spring.datasource.jdbc-interceptors=ConnectionState;SlowQueryReport(threshold=3) + + +####Redis配置 +#Redis服务器地址 +spring.redis.host=132.232.34.114 +#Redis服务器连接端口 +spring.redis.port=6379 +#Redis服务器连接密码（默认为空） +spring.redis.password= +#Redis数据库索引 +spring.redis.database=4 +#连接池中的最大空闲连接 +spring.redis.pool.max-idle=8 +#连接池中的最小空闲连接 +spring.redis.pool.min-idle=0 +#连接池最大连接数(使用负值表示没有限制) +spring.redis.pool.max-active=8 +#连接池最大阻塞等待时间(使用负值表示没有限制) +spring.redis.pool.max-wait=-1 +#连接超时时间(单位：毫秒) +spring.redis.timeout=0 + +#配置RabbitMQ +spring.rabbitmq.host=192.168.1.103 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest +spring.rabbitmq.publisherConfirms=true +#rabbitmq.queue.name=${rabbitmq.queue.name} + +logging.level.com.deer.wms=DEBUG +logging.path=./logs + +#文件上传的目录位置 +file.uploadFileDir=E:/files/upload +#文件上传的临时保存目录 +file.uploadTempDir=E:/files/temp +#文件上传根目录 +file.uploadContent=/wms +spring.mvc.static-path-pattern=/file/view/** +spring.resources.static-locations=file:${file.uploadFileDir} + +spring.http.multipart.enabled=true +spring.http.multipart.max-request-size=50MB +spring.http.multipart.max-file-size=50MB + +#托盘生命周期 +pallet.lifecycle.design=5 + +#托盘低电压告警临界值 +pallet.low.voltage.alarm=1 + +#解析RFID上传记录数据的分隔符 +pallet.data.center.user-data-delimiter=; + +pallet.data.center.device-id-list[0]=19945474 + + +sms.api.domain=http://api.sms.heclouds.com +sms.api.sicode=afa5b6006f8e428a8c4a3c8204f81498 +sms.api.validate.code.template=10003 + +onenet.api.domain=http://api.heclouds.com +onenet.api.secret=tdYC5pmDyfcC8c7pp7YxFZaIfUqHrfka +onenet.api.user.id=38290 +onenet.api.product.id=81135 +onenet.api.max.limit=1 + +lbs.api.domain=http://api.lbs.heclouds.com +lbs.api.key=AF24009928A9E858B6EF901BDEC3A0E9 + + + + +#发送邮件的服务器的主机域名 +email.serverHost=smtp.chinamobile.com +#发送邮件的服务器的端口 +email.serverPort=465 +#发件箱昵称 +email.nick=魔方托盘 +#发件人邮箱地址 +email.fromAddress=chenxuefeng@cmiot.chinamobile.com +#登陆邮件发送服务器的密码 +email.pwd=@Feng623623 +#邮箱超时时间单位毫秒 +email.outTime=8000 + +# 百度地图的秘钥 +baidu.map.ak=LhVr3ruO2Ds2eEGec3kkd3aaPo2ri0Z6 + +# 租赁订单保证金(0~1000块板) +deposit.le.first=140 +# 租赁订单保证金(1001~10000块板) +deposit.le.second=130 +# 租赁订单保证金(10000+块板) +deposit.le.third=140 +# 转租订单保证金(0~1000块板) +deposit.su.first=140 +# 转租订单保证金(1001~10000块板) +deposit.su.second=130 +# 转租订单保证金(10000+块板) +deposit.su.third=140 +# 租赁订单租金 +rental.le=0.3 +# 转租订单租金 +rental.su=0.1 +# 租续租订单租金 +rental.re=0.1 +# 退板订单退租金 +rental.tr=0.3 + +#最小设计生命周期（用于验证批量导入时excel中的设计生命周期） +lifeCycleDesignMin=0 +#最大设计生命周期 +lifeCycleDesignMax=10 +#flowable +#flowable.common.app.idm-url=http://localhost:9060/wms +#flowable.common.app.idm-admin.user=admin +#flowable.common.app.idm-admin.password=test + +#flowable.modeler.app.deployment-api-url=http://localhost:9060/flowable-task/app-api + diff --git a/wms-produce-manage/src/main/resources/config/application-gjx.properties b/wms-produce-manage/src/main/resources/config/application-gjx.properties new file mode 100644 index 0000000..f8dd92e --- /dev/null +++ b/wms-produce-manage/src/main/resources/config/application-gjx.properties @@ -0,0 +1,135 @@ +server.port=8000 +server.context-path=/pallet +spring.application.name=pallet-api-service + +#控制台彩色输出 +spring.output.ansi.enabled=ALWAYS + +####配置数据库连接 +spring.datasource.url=jdbc:mysql://192.168.20.112:3306/pallet?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +spring.datasource.username=root +spring.datasource.password=_Yyyx0000 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.max-wait=10000 +spring.datasource.max-active=5 +spring.datasource.auto-commit=true +spring.datasource.connection-test-query=select 1 +spring.datasource.test-on-borrow=true +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=18800 +spring.datasource.jdbc-interceptors=ConnectionState;SlowQueryReport(threshold=3) + +####Redis配置 +#Redis服务器地址 +spring.redis.host=127.0.0.1 +#Redis服务器连接端口 +spring.redis.port=6379 +#Redis服务器连接密码（默认为空） +spring.redis.password= +#Redis数据库索引 +spring.redis.database=4 +#连接池中的最大空闲连接 +spring.redis.pool.max-idle=50 +#连接池中的最小空闲连接 +spring.redis.pool.min-idle=10 +#连接池最大连接数(使用负值表示没有限制) +spring.redis.pool.max-active=50 +#连接池最大阻塞等待时间(使用负值表示没有限制) +spring.redis.pool.max-wait=-1 +#连接超时时间(单位：毫秒) +spring.redis.timeout=0 + +#配置RabbitMQ +spring.rabbitmq.host=192.168.20.112 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest +spring.rabbitmq.publisherConfirms=true +#rabbitmq.queue.name=${rabbitmq.queue.name} + +logging.level.com.chinamobile.pallet=DEBUG +logging.path=file:/home/app/appServer/pallet/api/logs + +#文件上传的目录位置 +file.uploadFileDir=F:/pallet/files +#文件上传的临时保存目录 +file.uploadTempDir=F:/pallet/temp +#文件上传根目录 +file.uploadContent=/pfs +spring.mvc.static-path-pattern=/** +spring.resources.static-locations=file:F:/pallet/files + +spring.http.multipart.enabled=true +spring.http.multipart.max-request-size=50MB +spring.http.multipart.max-file-size=50MB + + +#托盘生命周期 +pallet.lifecycle.design=5 + +#托盘低电压告警临界值 +pallet.low.voltage.alarm=1 + +#解析RFID上传记录数据的分隔符 +pallet.data.center.user-data-delimiter=; + +pallet.data.center.device-id-list[0]=19945474 +pallet.data.center.device-id-list[1]=19948142 +pallet.data.center.device-id-list[2]=20117771 + +sms.api.domain=http://api.sms.heclouds.com +sms.api.sicode=afa5b6006f8e428a8c4a3c8204f81498 +sms.api.validate.code.template=10003 + +onenet.api.domain=http://api.heclouds.com +onenet.api.secret=tdYC5pmDyfcC8c7pp7YxFZaIfUqHrfka +onenet.api.user.id=38290 +onenet.api.product.id=81135 +onenet.api.max.limit=1 + +lbs.api.domain=http://api.lbs.heclouds.com +lbs.api.key=AF24009928A9E858B6EF901BDEC3A0E9 + + +#发送邮件的服务器的主机域名 +email.serverHost=smtp.chinamobile.com +#发送邮件的服务器的端口 +email.serverPort=465 +#发件箱昵称 +email.nick=魔方托盘 +#发件人邮箱地址 +email.fromAddress=chenxuefeng@cmiot.chinamobile.com +#登陆邮件发送服务器的密码 +email.password=@Feng623623 +#邮箱超时时间单位毫秒 +email.outTime=8000 + +# 百度地图的秘钥 +baidu.map.ak=gAcDsfWUz7Wx0XzjGGfmVIWA6h2hhnCk + +# 租赁订单保证金(0~1000块板) +deposit.le.first=140 +# 租赁订单保证金(1001~10000块板) +deposit.le.second=130 +# 租赁订单保证金(10000+块板) +deposit.le.third=140 +# 转租订单保证金(0~1000块板) +deposit.su.first=140 +# 转租订单保证金(1001~10000块板) +deposit.su.second=130 +# 转租订单保证金(10000+块板) +deposit.su.third=140 +# 租赁订单租金 +rental.le=0.3 +# 转租订单租金 +rental.su=0.1 +# 租续租订单租金 +rental.re=0.1 +# 退板订单退租金 +rental.tr=0.3 +#flowable +flowable.common.app.idm-url=http://localhost:8080/flowable-idm +flowable.common.app.idm-admin.user=admin +flowable.common.app.idm-admin.password=test + +flowable.modeler.app.deployment-api-url=http://localhost:8080/flowable-task/app-api diff --git a/wms-produce-manage/src/main/resources/config/application-pro.properties b/wms-produce-manage/src/main/resources/config/application-pro.properties new file mode 100644 index 0000000..aa8c704 --- /dev/null +++ b/wms-produce-manage/src/main/resources/config/application-pro.properties @@ -0,0 +1,145 @@ +server.context-path=/wms +spring.application.name=pallet-api-service +server.port=9060 + +#控制台彩色输出 +spring.output.ansi.enabled=ALWAYS + + +####配置数据库连接 +spring.datasource.url=jdbc:mysql://47.110.34.124:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +spring.datasource.username=root +spring.datasource.password=MT_xiaobu_&20190524% +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.max-wait=10000 +spring.datasource.max-active=5 +spring.datasource.auto-commit=true +spring.datasource.connection-test-query=select 1 +spring.datasource.test-on-borrow=true +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=18800 +spring.datasource.jdbc-interceptors=ConnectionState;SlowQueryReport(threshold=3) + + + + +####Redis配置 +#Redis服务器地址 +spring.redis.host=localhost +#Redis服务器连接端口 +spring.redis.port=6379 +#Redis服务器连接密码（默认为空） +spring.redis.password=MT@#0618 +#Redis数据库索引 +spring.redis.database=4 +#连接池中的最大空闲连接 +spring.redis.pool.max-idle=8 +#连接池中的最小空闲连接 +spring.redis.pool.min-idle=0 +#连接池最大连接数(使用负值表示没有限制) +spring.redis.pool.max-active=8 +#连接池最大阻塞等待时间(使用负值表示没有限制) +spring.redis.pool.max-wait=-1 +#连接超时时间(单位：毫秒) +spring.redis.timeout=0 + +#配置RabbitMQ +spring.rabbitmq.host=192.168.1.103 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest +spring.rabbitmq.publisherConfirms=true +#rabbitmq.queue.name=${rabbitmq.queue.name} + +logging.level.com.deer.wms=DEBUG +logging.path=./logs + +#文件上传的目录位置 +file.uploadFileDir=/home/mengtong/files/upload +#文件上传的临时保存目录 +file.uploadTempDir=/home/mengtong/files/temp +#文件上传根目录 +file.uploadContent=/wms +spring.mvc.static-path-pattern=/file/view/** +spring.resources.static-locations=file:${file.uploadFileDir} + +spring.http.multipart.enabled=true +spring.http.multipart.max-request-size=50MB +spring.http.multipart.max-file-size=50MB + +#托盘生命周期 +pallet.lifecycle.design=5 + +#托盘低电压告警临界值 +pallet.low.voltage.alarm=1 + +#解析RFID上传记录数据的分隔符 +pallet.data.center.user-data-delimiter=; + +pallet.data.center.device-id-list[0]=19945474 + + +sms.api.domain=http://api.sms.heclouds.com +sms.api.sicode=afa5b6006f8e428a8c4a3c8204f81498 +sms.api.validate.code.template=10003 + +onenet.api.domain=http://api.heclouds.com +onenet.api.secret=tdYC5pmDyfcC8c7pp7YxFZaIfUqHrfka +onenet.api.user.id=38290 +onenet.api.product.id=81135 +onenet.api.max.limit=1 + +lbs.api.domain=http://api.lbs.heclouds.com +lbs.api.key=AF24009928A9E858B6EF901BDEC3A0E9 + + + + +#发送邮件的服务器的主机域名 +email.serverHost=smtp.chinamobile.com +#发送邮件的服务器的端口 +email.serverPort=465 +#发件箱昵称 +email.nick=魔方托盘 +#发件人邮箱地址 +email.fromAddress=chenxuefeng@cmiot.chinamobile.com +#登陆邮件发送服务器的密码 +email.pwd=@Feng623623 +#邮箱超时时间单位毫秒 +email.outTime=8000 + +# 百度地图的秘钥 +baidu.map.ak=LhVr3ruO2Ds2eEGec3kkd3aaPo2ri0Z6 + +# 租赁订单保证金(0~1000块板) +deposit.le.first=140 +# 租赁订单保证金(1001~10000块板) +deposit.le.second=130 +# 租赁订单保证金(10000+块板) +deposit.le.third=140 +# 转租订单保证金(0~1000块板) +deposit.su.first=140 +# 转租订单保证金(1001~10000块板) +deposit.su.second=130 +# 转租订单保证金(10000+块板) +deposit.su.third=140 +# 租赁订单租金 +rental.le=0.3 +# 转租订单租金 +rental.su=0.1 +# 租续租订单租金 +rental.re=0.1 +# 退板订单退租金 +rental.tr=0.3 + +#最小设计生命周期（用于验证批量导入时excel中的设计生命周期） +lifeCycleDesignMin=0 +#最大设计生命周期 +lifeCycleDesignMax=10 +#flowable +flowable.common.app.idm-url=http://localhost:9060/wms +flowable.common.app.idm-admin.user=admin +flowable.common.app.idm-admin.password=test + +flowable.modeler.app.deployment-api-url=http://localhost:9060/flowable-task/app-api + diff --git a/wms-produce-manage/src/main/resources/config/application-test.properties b/wms-produce-manage/src/main/resources/config/application-test.properties new file mode 100644 index 0000000..238e77e --- /dev/null +++ b/wms-produce-manage/src/main/resources/config/application-test.properties @@ -0,0 +1,134 @@ +server.port=8000 +server.context-path=/pallet +spring.application.name=pallet-api-service + +#控制台彩色输出 +spring.output.ansi.enabled=ALWAYS + +####配置数据库连接 +#spring.datasource.url=jdbc:mysql://192.168.20.88:33060/pallet?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +spring.datasource.url=jdbc:mysql://47.96.183.77:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false +spring.datasource.username=root +spring.datasource.password=mt_%wms#_CS_20190430 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.max-wait=10000 +spring.datasource.max-active=5 +spring.datasource.auto-commit=true +spring.datasource.connection-test-query=select 1 +spring.datasource.test-on-borrow=true +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=18800 +spring.datasource.jdbc-interceptors=ConnectionState;SlowQueryReport(threshold=3) + +####Redis配置 +#Redis服务器地址 +spring.redis.host=192.168.20.88 +#Redis服务器连接端口 +spring.redis.port=6379 +#Redis服务器连接密码（默认为空） +spring.redis.password= +#Redis数据库索引 +spring.redis.database=4 +#连接池中的最大空闲连接 +spring.redis.pool.max-idle=8 +#连接池中的最小空闲连接 +spring.redis.pool.min-idle=0 +#连接池最大连接数(使用负值表示没有限制) +spring.redis.pool.max-active=8 +#连接池最大阻塞等待时间(使用负值表示没有限制) +spring.redis.pool.max-wait=-1 +#连接超时时间(单位：毫秒) +spring.redis.timeout=0 + +#配置RabbitMQ +spring.rabbitmq.host=192.168.20.88 +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest +spring.rabbitmq.publisherConfirms=true +#rabbitmq.queue.name=${rabbitmq.queue.name} + +logging.level.com.chinamobile.pallet=DEBUG +logging.path=/root/appServer/pallet/api/logs + +#文件上传的目录位置 +file.uploadFileDir=/root/appServer/pallet +#文件上传的临时保存目录 +file.uploadTempDir=/root/appServer/pallet/temp +#文件上传根目录 +file.uploadContent=/pfs +spring.mvc.static-path-pattern=/** +spring.resources.static-locations=file:/root/appServer/pallet + +spring.http.multipart.enabled=true +spring.http.multipart.max-request-size=50MB +spring.http.multipart.max-file-size=50MB + + +#托盘生命周期 +pallet.lifecycle.design=5 + +#托盘低电压告警临界值 +pallet.low.voltage.alarm=1 + +#解析RFID上传记录数据的分隔符 +pallet.data.center.user-data-delimiter=; + +pallet.data.center.device-id-list[0]=19945474 +pallet.data.center.device-id-list[1]=19948142 +pallet.data.center.device-id-list[2]=20117771 + +sms.api.domain=http://api.sms.heclouds.com +sms.api.sicode=afa5b6006f8e428a8c4a3c8204f81498 +sms.api.validate.code.template=10003 + +onenet.api.domain=http://api.heclouds.com +onenet.api.secret=tdYC5pmDyfcC8c7pp7YxFZaIfUqHrfka +onenet.api.user.id=38290 +onenet.api.product.id=81135 +onenet.api.max.limit=1 + +lbs.api.domain=http://api.lbs.heclouds.com +lbs.api.key=AF24009928A9E858B6EF901BDEC3A0E9 + + +#发送邮件的服务器的主机域名 +email.serverHost=smtp.chinamobile.com +#发送邮件的服务器的端口 +email.serverPort=25 +#发件人邮箱地址 +email.fromAddress=chenxuefeng@cmiot.chinamobile.com +#登陆邮件发送服务器的密码 +email.password=@Feng623623 +#邮箱超时时间单位毫秒 +email.outTime=8000 + +# 百度地图的秘钥 +baidu.map.ak=gAcDsfWUz7Wx0XzjGGfmVIWA6h2hhnCk + +# 租赁订单保证金(0~1000块板) +deposit.le.first=140 +# 租赁订单保证金(1001~10000块板) +deposit.le.second=130 +# 租赁订单保证金(10000+块板) +deposit.le.third=140 +# 转租订单保证金(0~1000块板) +deposit.su.first=140 +# 转租订单保证金(1001~10000块板) +deposit.su.second=130 +# 转租订单保证金(10000+块板) +deposit.su.third=140 +# 租赁订单租金 +rental.le=0.3 +# 转租订单租金 +rental.su=0.1 +# 租续租订单租金 +rental.re=0.1 +# 退板订单退租金 +rental.tr=0.3 +#flowable +flowable.common.app.idm-url=http://localhost:8080/flowable-idm +flowable.common.app.idm-admin.user=admin +flowable.common.app.idm-admin.password=test + +flowable.modeler.app.deployment-api-url=http://localhost:8080/flowable-task/app-api \ No newline at end of file diff --git a/wms-produce-manage/src/main/resources/config/application.properties b/wms-produce-manage/src/main/resources/config/application.properties new file mode 100644 index 0000000..257b306 --- /dev/null +++ b/wms-produce-manage/src/main/resources/config/application.properties @@ -0,0 +1 @@ +spring.profiles.active=dev \ No newline at end of file diff --git a/wms-produce-manage/src/test/java/BillCodeGenerator.java b/wms-produce-manage/src/test/java/BillCodeGenerator.java new file mode 100644 index 0000000..339f37f --- /dev/null +++ b/wms-produce-manage/src/test/java/BillCodeGenerator.java @@ -0,0 +1,33 @@ +import com.deer.wms.project.seed.generator.Generator; +import com.deer.wms.project.seed.generator.configurer.DatasourceConfigurer; +import com.deer.wms.project.seed.generator.configurer.Table; + +/** + * Created by Floki on 2017/9/29. + */ +public class BillCodeGenerator { + public static void main(String[] args) { + DatasourceConfigurer configurer = new DatasourceConfigurer(); + //设置数据库连接信息 + configurer.setUrl("jdbc:mysql://47.96.183.77:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"); + configurer.setUserName("root"); + configurer.setPassword("mt_%wms#_CS_20190430"); + configurer.setDiverClassName("com.mysql.jdbc.Driver"); + + //设置需要生成代码的基础路径，生成的代码都会在该路径下面 + configurer.setBasePackage("com.deer.wms.ware.task"); + configurer.setAuthor("guo"); + + //设置子模块名称(如果要生成子模块的代码，一定要设置该值，否则代码将会生成到父项目中了) + configurer.setModuleName("/wms-ware-task"); + + //设置需要生成的表 + configurer.getTables().add(new Table("mt_alone_materials_info",null,"id","Integer")); + + configurer.getTables().add(new Table("mt_alone_product_process_bom",null,"id","Integer")); + + configurer.getTables().add(new Table("mt_alone_process_bom",null,"id","Integer")); + //生成代码 + Generator.genCode(configurer); + } +} diff --git a/wms-produce-manage/src/test/java/ParseJSON.java b/wms-produce-manage/src/test/java/ParseJSON.java new file mode 100644 index 0000000..2efb1ae --- /dev/null +++ b/wms-produce-manage/src/test/java/ParseJSON.java @@ -0,0 +1,26 @@ + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author: hy + * @Date: 2019/9/21 16:02 + * @Version 1.0 + */ +public class ParseJSON { + + public static void main(String[] args){ + MaterialsOutgoingLogVo materialsInfo = new MaterialsOutgoingLogVo(); + List l = new ArrayList(); + l.add(materialsInfo); + String s = JSON.toJSONString(l, SerializerFeature.PrettyFormat,SerializerFeature.WriteNullStringAsEmpty,SerializerFeature.WriteNullListAsEmpty,SerializerFeature.WriteNullBooleanAsFalse,SerializerFeature.WriteNullNumberAsZero); + System.out.println(s); + } + +} diff --git a/wms-produce-manage/src/test/java/generator/CodeGenerator.java b/wms-produce-manage/src/test/java/generator/CodeGenerator.java new file mode 100644 index 0000000..5979415 --- /dev/null +++ b/wms-produce-manage/src/test/java/generator/CodeGenerator.java @@ -0,0 +1,33 @@ +package generator; + +import com.deer.wms.project.seed.generator.Generator; +import com.deer.wms.project.seed.generator.configurer.DatasourceConfigurer; +import com.deer.wms.project.seed.generator.configurer.Table; + +/** + * Created by Floki on 2017/9/29. + */ +public class CodeGenerator { + public static void main(String[] args) { + DatasourceConfigurer configurer = new DatasourceConfigurer(); + //璁剧疆鏁版嵁搴撹繛鎺ヤ俊鎭 + configurer.setUrl("jdbc:mysql://47.96.183.77:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"); + configurer.setUserName("root"); + configurer.setPassword("mt_%wms#_CS_20190430"); + configurer.setDiverClassName("com.mysql.jdbc.Driver"); + + //璁剧疆闇€瑕佺敓鎴愪唬鐮佺殑鍩虹璺緞锛岀敓鎴愮殑浠ｇ爜閮戒細鍦ㄨ璺緞涓嬮潰 + configurer.setBasePackage("com.deer.wms.produce.manage"); + configurer.setAuthor(""); + + //璁剧疆瀛愭ā鍧楀悕绉濡傛灉瑕佺敓鎴愬瓙妯″潡鐨勪唬鐮侊紝涓€瀹氳璁剧疆璇ュ€硷紝鍚﹀垯浠ｇ爜灏嗕細鐢熸垚鍒扮埗椤圭洰涓簡) + configurer.setModuleName("/wms-produce-manage"); + + //璁剧疆闇€瑕佺敓鎴愮殑琛 + configurer.getTables().add(new Table("mt_stock_provendor", null, "id", "Integer")); +// configurer.getTables().add(new Table("mt_alone_process_methods", null, "id", "Integer")); + + //鐢熸垚浠ｇ爜 + Generator.genCode(configurer); + } +} diff --git a/wms-produce-manage/src/test/java/generator/CodeGenerator.java.orig b/wms-produce-manage/src/test/java/generator/CodeGenerator.java.orig new file mode 100644 index 0000000..9241322 --- /dev/null +++ b/wms-produce-manage/src/test/java/generator/CodeGenerator.java.orig @@ -0,0 +1,38 @@ +package generator; + +import com.deer.wms.project.seed.generator.Generator; +import com.deer.wms.project.seed.generator.configurer.DatasourceConfigurer; +import com.deer.wms.project.seed.generator.configurer.Table; + +/** + * Created by Floki on 2017/9/29. + */ +public class CodeGenerator { + public static void main(String[] args) { + DatasourceConfigurer configurer = new DatasourceConfigurer(); + //设置数据库连接信息 + configurer.setUrl("jdbc:mysql://47.96.183.77:3306/mt_erp?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false"); + configurer.setUserName("root"); + configurer.setPassword("mt_%wms#_CS_20190430"); + configurer.setDiverClassName("com.mysql.jdbc.Driver"); + + //设置需要生成代码的基础路径，生成的代码都会在该路径下面 + configurer.setBasePackage("com.deer.wms.produce.manage"); + configurer.setAuthor(""); + + //设置子模块名称(如果要生成子模块的代码，一定要设置该值，否则代码将会生成到父项目中了) + configurer.setModuleName("/wms-produce-manage"); + + //设置需要生成的表 +<<<<<<< HEAD + configurer.getTables().add(new Table("mt_alone_process_batch_relat", null, "id", "Integer")); + configurer.getTables().add(new Table("mt_alone_product_batch_detect", null, "id", "Integer")); + configurer.getTables().add(new Table("mt_alone_product_batch_detect_det", null, "id", "Integer")); +======= + configurer.getTables().add(new Table("mt_alone_stock_product", null, "id", "Integer")); +>>>>>>> 24c28f381e61494386a251b4c15c5521198b7ae3 + + //生成代码 + Generator.genCode(configurer); + } +} diff --git a/wms-produce-manage/src/test/resources/generator/template/controller-restful.ftl b/wms-produce-manage/src/test/resources/generator/template/controller-restful.ftl new file mode 100644 index 0000000..f2a3000 --- /dev/null +++ b/wms-produce-manage/src/test/resources/generator/template/controller-restful.ftl @@ -0,0 +1,58 @@ +package ${basePackage}.web; + +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import ${basePackage}.model.${modelNameUpperCamel}; +import ${basePackage}.model.${modelNameUpperCamel}Criteria; +import ${basePackage}.service.${modelNameUpperCamel}Service; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import ${basePackage}.model.${modelNameUpperCamel}; + + +/** +* Created by ${author} on ${date}. +*/ +@RestController +@RequestMapping("${baseRequestMapping}s") +public class ${modelNameUpperCamel}Controller { + + @Autowired + private ${modelNameUpperCamel}Service ${modelNameLowerCamel}Service; + + @PostMapping("/add") + public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) { + ${modelNameLowerCamel}Service.save(${modelNameLowerCamel}); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/delete") + public Result delete( ${type} ${modelNameLowerCamel}Id) { + ${modelNameLowerCamel}Service.deleteById(${modelNameLowerCamel}Id); + return ResultGenerator.genSuccessResult(); + } + + @PostMapping("/update") + public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) { + ${modelNameLowerCamel}Service.update(${modelNameLowerCamel}); + return ResultGenerator.genSuccessResult(); + } + + @GetMapping("/{id}") + public Result detail(@PathVariable ${type} id) { + ${modelNameUpperCamel} ${modelNameLowerCamel} = ${modelNameLowerCamel}Service.findById(id); + return ResultGenerator.genSuccessResult(${modelNameLowerCamel}); + } + + @GetMapping("/list") + public Result list(${modelNameUpperCamel}Criteria criteria) { + PageHelper.startPage(criteria.getPageNum(), criteria.getPageSize()); + List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Service.findList(criteria); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } + +} diff --git a/wms-produce-manage/src/test/resources/generator/template/controller.ftl b/wms-produce-manage/src/test/resources/generator/template/controller.ftl new file mode 100644 index 0000000..3d22b30 --- /dev/null +++ b/wms-produce-manage/src/test/resources/generator/template/controller.ftl @@ -0,0 +1,59 @@ +package ${basePackage}.web; + +import com.deer.wms.project.seed.core.result.Result; +import com.deer.wms.project.seed.core.result.ResultGenerator; +import ${basePackage}.model.${modelNameUpperCamel}; +import ${basePackage}.service.${modelNameUpperCamel}Service; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** +* Created by ${author} on ${date}. +*/ +@RestController +@RequestMapping("${baseRequestMapping}s") +public class ${modelNameUpperCamel}Controller { + @Autowired + private ${modelNameUpperCamel}Service ${modelNameLowerCamel}Service; + + @PostMapping("/add") + public Result add(${modelNameUpperCamel} ${modelNameLowerCamel}) { + ${modelNameLowerCamel}Service.save(${modelNameLowerCamel}); + return ResultGenerator.genSuccessResult(); + } + + @PostMapping("/delete") + public Result delete(@RequestParam ${type} id) { + ${modelNameLowerCamel}Service.deleteById(id); + return ResultGenerator.genSuccessResult(); + } + + @PostMapping("/update") + public Result update(${modelNameUpperCamel} ${modelNameLowerCamel}) { + ${modelNameLowerCamel}Service.update(${modelNameLowerCamel}); + return ResultGenerator.genSuccessResult(); + } + + @PostMapping("/detail") + public Result detail(@RequestParam ${type} id) { + ${modelNameUpperCamel} ${modelNameLowerCamel} = ${modelNameLowerCamel}Service.findById(id); + return ResultGenerator.genSuccessResult(${modelNameLowerCamel}); + } + + @PostMapping("/list") + public Result list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) { + PageHelper.startPage(page, size); + List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Service.findAll(); + PageInfo pageInfo = new PageInfo(list); + return ResultGenerator.genSuccessResult(pageInfo); + } +} diff --git a/wms-produce-manage/src/test/resources/generator/template/criteria.ftl b/wms-produce-manage/src/test/resources/generator/template/criteria.ftl new file mode 100644 index 0000000..f94de9a --- /dev/null +++ b/wms-produce-manage/src/test/resources/generator/template/criteria.ftl @@ -0,0 +1,9 @@ +package ${basePackage}.model; + +import com.deer.wms.project.seed.core.service.QueryCriteria; + +/** +* Created by ${author} on ${date}. +*/ +public class ${modelNameUpperCamel}Criteria extends QueryCriteria { +} diff --git a/wms-produce-manage/src/test/resources/generator/template/service-impl.ftl b/wms-produce-manage/src/test/resources/generator/template/service-impl.ftl new file mode 100644 index 0000000..24f9885 --- /dev/null +++ b/wms-produce-manage/src/test/resources/generator/template/service-impl.ftl @@ -0,0 +1,30 @@ +package ${basePackage}.service.impl; + +import ${basePackage}.dao.${modelNameUpperCamel}Mapper; +import ${basePackage}.model.${modelNameUpperCamel}; +import ${basePackage}.model.${modelNameUpperCamel}Criteria; +import ${basePackage}.service.${modelNameUpperCamel}Service; + +import com.deer.wms.project.seed.core.service.AbstractService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import ${basePackage}.model.${modelNameUpperCamel}; + +/** + * Created by ${author} on ${date}. + */ +@Service +@Transactional +public class ${modelNameUpperCamel}ServiceImpl extends AbstractService<${modelNameUpperCamel}, ${type}> implements ${modelNameUpperCamel}Service { + + @Autowired + private ${modelNameUpperCamel}Mapper ${modelNameLowerCamel}Mapper; + + + @Override + public List<${modelNameUpperCamel}> findList(${modelNameUpperCamel}Criteria criteria) { + return ${modelNameLowerCamel}Mapper.findList(criteria); + } +} diff --git a/wms-produce-manage/src/test/resources/generator/template/service.ftl b/wms-produce-manage/src/test/resources/generator/template/service.ftl new file mode 100644 index 0000000..6209c34 --- /dev/null +++ b/wms-produce-manage/src/test/resources/generator/template/service.ftl @@ -0,0 +1,18 @@ +package ${basePackage}.service; + +import ${basePackage}.model.${modelNameUpperCamel}; +import ${basePackage}.model.${modelNameUpperCamel}Criteria; + +import com.deer.wms.project.seed.core.service.Service; +import java.util.List; +import ${basePackage}.model.${modelNameUpperCamel}; + +/** + * Created by ${author} on ${date}. + */ +public interface ${modelNameUpperCamel}Service extends Service<${modelNameUpperCamel}, ${type}> { + + + List<${modelNameUpperCamel}> findList(${modelNameUpperCamel}Criteria criteria) ; + +}