qianyu
|
8ea28cfeae
|
Merge remote-tracking branch 'origin/master' into gsw
# Conflicts:
# log.path_IS_UNDEFINED/sys-user.log
|
1 year ago |
|
qianyu
|
3e05f5ddeb
|
230508
|
1 year ago |
ling li
|
5d25829911
|
领料单（原料/辅料/半成品）、上线支持日志（48、49、55、56、73）
|
1 year ago |
|
ling li
|
1aa26557ca
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# log.path_IS_UNDEFINED/sys-user.log
# ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoCP/outboundInfoCP.html
# ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoFL/outboundInfoFL.html
# ruoyi-admin/src/main/resources/templates/storehouse/outboundInfoYL/outboundInfoYL.html
# ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
# ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml
|
1 year ago |
|
ling li
|
d666034ab5
|
领料单（原料/辅料/半成品）、上线支持日志（48、49、55、56、73）
|
1 year ago |
|
qianyu
|
b7576a286a
|
230508
|
1 year ago |
|
ling li
|
febfa51ca4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# log.path_IS_UNDEFINED/sys-user.log
|
2 years ago |
|
ling li
|
c043daced5
|
订单号自动生成、呆滞料功能、委外入库检验通知单功能
|
2 years ago |
|
qianyu
|
e452c09b84
|
230508
|
2 years ago |
|
qianyu
|
72c8a6cf89
|
Merge remote-tracking branch 'origin/master' into gsw
# Conflicts:
# .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
# .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
# .idea/libraries/Maven__cn_hutool_hutool_core_5_8_12.xml
# .idea/libraries/Maven__com_alibaba_druid_1_2_6.xml
# .idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_6.xml
# .idea/libraries/Maven__com_alibaba_easyexcel_3_1_0.xml
# .idea/libraries/Maven__com_alibaba_easyexcel_core_3_1_0.xml
# .idea/libraries/Maven__com_alibaba_easyexcel_support_3_1_0.xml
# .idea/libraries/Maven__com_alibaba_fastjson_1_2_76.xml
# .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
# .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_5.xml
# .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_5.xml
# .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_5_1.xml
# .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_10_5.xml
# .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_10_5.xml
# .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_10_5.xml
# .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml
# .idea/libraries/Maven__com_github_oshi_oshi_core_5_6_0.xml
# .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml
# .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml
# .idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml
# .idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
# .idea/libraries/Maven__com_github_theborakompanioni_thymeleaf_extras_shiro_2_0_0.xml
# .idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
# .idea/libraries/Maven__com_google_guava_guava_20_0.xml
# .idea/libraries/Maven__com_jacob_jacob_1_19.xml
# .idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
# .idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml
# .idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
# .idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml
# .idea/libraries/Maven__com_sun_mail_javax_mail_1_5_2.xml
# .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
# .idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
# .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
# .idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
# .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
# .idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
# .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
# .idea/libraries/Maven__commons_io_commons_io_2_5.xml
# .idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
# .idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
# .idea/libraries/Maven__commons_net_commons_net_3_6.xml
# .idea/libraries/Maven__commons_pool_commons_pool_1_6.xml
# .idea/libraries/Maven__de_odysseus_juel_juel_api_2_2_7.xml
# .idea/libraries/Maven__de_odysseus_juel_juel_impl_2_2_7.xml
# .idea/libraries/Maven__de_odysseus_juel_juel_spi_2_2_7.xml
# .idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml
# .idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
# .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
# .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_10.xml
# .idea/libraries/Maven__io_swagger_swagger_models_1_5_10.xml
# .idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
# .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
# .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
# .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
# .idea/libraries/Maven__javax_activation_activation_1_1_1.xml
# .idea/libraries/Maven__javax_annotation_jsr250_api_1_0.xml
# .idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
# .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
# .idea/libraries/Maven__joda_time_joda_time_2_10_9.xml
# .idea/libraries/Maven__junit_junit_4_12.xml
# .idea/libraries/Maven__math_geom2d_javaGeom_0_11_1.xml
# .idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml
# .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_19.xml
# .idea/libraries/Maven__net_java_dev_jna_jna_5_7_0.xml
# .idea/libraries/Maven__net_java_dev_jna_jna_platform_5_7_0.xml
# .idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
# .idea/libraries/Maven__net_sourceforge_javacsv_javacsv_2_0.xml
# .idea/libraries/Maven__org_activiti_activiti_bpmn_converter_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_bpmn_model_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_common_rest_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_dmn_api_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_dmn_model_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_engine_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_form_api_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_form_model_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_image_generator_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_json_converter_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_process_validation_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_rest_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_spring_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_spring_boot_starter_basic_6_0_0.xml
# .idea/libraries/Maven__org_activiti_activiti_spring_boot_starter_rest_api_6_0_0.xml
# .idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_api_4_3_1.xml
# .idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_impl_4_3_1.xml
# .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
# .idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
# .idea/libraries/Maven__org_apache_commons_commons_csv_1_8.xml
# .idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml
# .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
# .idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
# .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_12_1.xml
# .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
# .idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
# .idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
# .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_cache_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_core_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_event_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_lang_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_spring_1_7_1.xml
# .idea/libraries/Maven__org_apache_shiro_shiro_web_1_7_1.xml
# .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_41.xml
# .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_41.xml
# .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_41.xml
# .idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml
# .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_js_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_7.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_fop_0_94.xml
# .idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_1_2.xml
# .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
# .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml
# .idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
# .idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml
# .idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml
# .idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml
# .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
# .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_1.xml
# .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_22_Final.xml
# .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
# .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_5_2.xml
# .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_5_2.xml
# .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_5_2.xml
# .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_5_2.xml
# .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_5_2.xml
# .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_5_2.xml
# .idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
# .idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml
# .idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml
# .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
# .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml
# .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml
# .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
# .idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml
# .idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml
# .idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml
# .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml
# .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
# .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_13_RELEASE.xml
# .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
# .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
# .idea/libraries/Maven__org_springframework_security_spring_security_config_5_2_8_RELEASE.xml
# .idea/libraries/Maven__org_springframework_security_spring_security_core_5_2_8_RELEASE.xml
# .idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_2_8_RELEASE.xml
# .idea/libraries/Maven__org_springframework_security_spring_security_web_5_2_8_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_aop_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_beans_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_context_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_context_support_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_core_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_expression_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_jcl_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_orm_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_tx_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_web_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_12_RELEASE.xml
# .idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
# .idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_12_RELEASE.xml
# .idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_12_RELEASE.xml
# .idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
# .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
# .idea/libraries/Maven__xalan_xalan_2_6_0.xml
# .idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
# .idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml
# log.path_IS_UNDEFINED/sys-user.log
|
2 years ago |
|
qianyu
|
3b791da97e
|
230508
|
2 years ago |
RonNurKe
|
a6aad359c2
|
提交maven XML
|
2 years ago |
|
RonNurKe
|
6f884e7105
|
修改gitignore
|
2 years ago |
|
ling li
|
f1fd744b63
|
采购对账、入库记录查询
|
2 years ago |
|
ling li
|
28e8bf8dbe
|
委外领料（一半）
|
2 years ago |
|
ling li
|
f91174022a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# log.path_IS_UNDEFINED/sys-user.log
|
2 years ago |
|
ling li
|
7cdf1d72f9
|
委外领料（一半）
|
2 years ago |
|
ling li
|
49dce84400
|
委外加工订单
|
2 years ago |
|
ling li
|
c96a65933c
|
委外加工订单
|
2 years ago |
|
ling li
|
88e29fbe09
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .gitignore
|
2 years ago |
|
RonNurKe
|
f587ca90ab
|
添加除仓库外前端的shiro标签。此时数据库权限进度相同
|
2 years ago |
|
RonNurKe
|
783d706506
|
添加除仓库外前端的shiro标签。此时数据库权限进度相同
|
2 years ago |
|
RonNurKe
|
f4a7d08d23
|
改了下启动提示
|
2 years ago |
|
ling li
|
2ddbacf38c
|
制工单、发货单、入库检验通知
|
2 years ago |
|
ling li
|
3b6a5efca9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# log.path_IS_UNDEFINED/sys-user.log
|
2 years ago |
|
ling li
|
b25e86744e
|
制工单、发货单、入库检验通知
|
2 years ago |
|
ling li
|
2821fa6127
|
制工单、发货单、入库检验通知
|
2 years ago |
|
RonNurKe
|
a13cc3e96f
|
提交
|
2 years ago |
|
RonNurKe
|
583f760dbd
|
提交
|
2 years ago |
|
RonNurKe
|
17fcc0b918
|
提交
|
2 years ago |
|
RonNurKe
|
67edcd0092
|
提交
|
2 years ago |
|
RonNurKe
|
5bfc257ac5
|
提交
|
2 years ago |
|
ling li
|
de481fbe8d
|
test push
|
2 years ago |
|
RonNurKe
|
7fcbccab1c
|
提交
|
2 years ago |
|
RonNurKe
|
1053134ff8
|
提交
|
2 years ago |
|
RonNurKe
|
5e5a421ef4
|
提交
|
2 years ago |
|
ling li
|
3337809f44
|
test push
|
2 years ago |
|
ling li
|
9e98b769a5
|
test push
|
2 years ago |
|
ling li
|
fe8cfac19e
|
first
|
2 years ago |
|
ling li
|
637232e79f
|
first
|
2 years ago |
|
RonNurKe
|
a215ee30e5
|
提交
|
2 years ago |
|
RonNurKe
|
c8d54525cb
|
提交
|
2 years ago |
|
RonNurKe
|
b4049fec7f
|
提交
|
2 years ago |
|
RonNurKe
|
0ab8d1f127
|
提交
|
2 years ago |
|
RonNurKe
|
bdce036a5c
|
提交
|
2 years ago |
