diff --git a/changelog.md b/changelog.md index 88a073c3..2ff4afd8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,69 @@ +## 3.0.2025110710 +- feat: 新增功能 + - material count字段完全由计算可得 [caoqianming] + - 移除material count字段 [caoqianming] + - revert_and_del时触发物料统计 [caoqianming] + - ofm-serializer borrow_file 修改 [TianyangZhang] + - 添加离职记录表 [caoqianming] + - ofm-models vehicle 修改model 字段类型 [TianyangZhang] + - srm -add models 平台审批表 [TianyangZhang] + - srm 修改接口信息 [TianyangZhang] + - srm 增加论文台账接口 [TianyangZhang] + - srm 修改serializer [TianyangZhang] + - 优化gen_number_with_rule的m_model的校验 [caoqianming] + - srm 修改 views [TianyangZhang] + - srm 修改models [TianyangZhang] + - srm -views 修改patentrecord 的 搜索字段 [TianyangZhang] + - ofm-models 修改model 字段 [TianyangZhang] + - ofm-views 修改视图集名称 [TianyangZhang] + - check_wpr_number 优化 [caoqianming] + - fix enm-models 修改 enm 字段 [TianyangZhang] + - 编号生成后在提交时进行校验 [caoqianming] + - gen_number_with_rule 添加校验 [caoqianming] + - base clean_timescaledb_job_his 优化2 [caoqianming] + - base execute_raw_sql 增加timeout参数可传none不限时 [caoqianming] + - base clean_timescaledb_job_his 优化 [caoqianming] + - base execute_raw_sql 增加timeout参数 [caoqianming] + - base clean_timescaledb_job_his [caoqianming] + - feat : ofm-models 修改字段 [TianyangZhang] + - ofm-models 修改字段 [TianyangZhang] + - 执行数据库备份时排除指定超表 [caoqianming] + - backup_database 使用 sudo -u postgres [caoqianming] + - ofm-models 修改专利patent 字段 [zty] + - ofm-models 修改专利model patentInfo 字段 [zty] + - mio 添加查询条件 [caoqianming] + - mloguser添加字段 [caoqianming] + - 修改mroombooking表约束 [caoqianming] + - base 获取流转时排序按attribute_type倒序 [caoqianming] + - base workflow添加view_path2字段 [caoqianming] + - ofm-services 修改绑定反存的接口 [zty] + - base 获取流转时排序按attribute_type2 [caoqianming] + - base 获取流转时排序按attribute_type [caoqianming] + - ofm-views 修改文件列表排序 [zty] + - ofm-BorrowRecord - 档案借阅反存ticket-data [zty] + - ofm-service-vehicle 用车管理反存 实际归还里程树 [zty] + - ofm-service 反向存储ticket_data 到 Lendingseal [zty] + - mio增加筛选条件inout_date [caoqianming] + - do_out和do_in在处理into_wm不应直接忽略 [caoqianming] + - ofm-views 修改时间倒叙 [zty] + - material添加create_time的排序条件 [caoqianming] + - ofm-service-pulicity 反存ticket_data 到 obj [zty] + - ofm-service-pulicity 反存ticket_data 到 obj [zty] + - ofm--Alter field publicity_opinion on publicity [zty] + - ofm-models 修改字段属性 [zty] + - ofm-models -pulicity 修改字段属性 [zty] + - 修改 ofm-moedels - pulicity字段为空值 [zty] + - ofm-models 增加字段 [zty] +- fix: 问题修复 + - ftestprocess 在create和update时保持一致 [caoqianming] + - wpr change_or_new wpr_from 配置 [caoqianming] + - ofm- papersecret 修改论文申密的model 名字 [TianyangZhang] + - wpr_bxerp 数据统计在mlogbw存在才继续 [caoqianming] + - gen_number_with_rule bug [caoqianming] + - mlogbw defect 分配 bug [caoqianming] + - fix : ofm-models-publicity 修改记录编号自动生成 [zty] + - work_start_time 可不填 [caoqianming] + - handle_date和shift可传 [caoqianming] ## 2.8.2025101011 - feat: 新增功能 - Ptest val_xj可为空 [caoqianming] diff --git a/server/settings.py b/server/settings.py index 09477a4e..9156c344 100755 --- a/server/settings.py +++ b/server/settings.py @@ -35,7 +35,7 @@ sys.path.insert(0, os.path.join(BASE_DIR, 'apps')) ALLOWED_HOSTS = ['*'] SYS_NAME = '星途工厂综合管理系统' -SYS_VERSION = '2.8.2025101011' +SYS_VERSION = '3.0.2025110710' X_FRAME_OPTIONS = 'SAMEORIGIN' # Application definition diff --git a/update_changelog.sh b/update_changelog.sh index 23267a2f..ce0cfe26 100644 --- a/update_changelog.sh +++ b/update_changelog.sh @@ -1,7 +1,7 @@ #!/bin/bash -# 设置默认版本号 (格式: 2.7.YYYYMMDDHH) -DEFAULT_VERSION="2.8.$(date '+%Y%m%d%H')" +# 设置默认版本号 (格式: 3.0.YYYYMMDDHH) +DEFAULT_VERSION="3.0.$(date '+%Y%m%d%H')" # 获取参数 (起始tag) TARGET_TAG="$1"