diff --git a/changelog.md b/changelog.md index 5d89a26f..5d95c2b9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,39 @@ +## 2.8.2025090815 +- feat: 新增功能 + - batch bxerp含缺陷统计 [caoqianming] + - mlog list 添加update_time筛选 [caoqianming] + - 工艺步骤中辅料使用的校验 [caoqianming] + - mlogb添加parent isnull查询 [caoqianming] + - 次批触发输出产生 [caoqianming] + - 修改印章的model 和 serializer [zty] + - 修改 ofm sevice 印章模块 [zty] + - base 优化safe_get_or_create [caoqianming] + - 修改ofm seal 过滤查询功能 [zty] + - 行政管理 -印章管理 [zty] + - ftest默认为合格 [caoqianming] + - mlogbdefect添加count_has 字段及处理 [caoqianming] + - update_mb_item defect处理更严谨 [caoqianming] + - 取消最后一步产出与工艺包不一致 的校验 [caoqianming] + - 出入库记录添加乐观锁 [caoqianming] + - batch_bxerp考虑mlogbw_from [caoqianming] + - mlog_submit mlogbdefect增加筛选条件 [caoqianming] + - 导入物料明细时可默认批次号为无 [caoqianming] + - 光芯批次统计增加班次返回 [caoqianming] + - mlog_submit 进行操作时间校验 [caoqianming] + - route update 时from_route存在则不可修改关键信息 [caoqianming] + - mlogchange支持work_start_time [caoqianming] + - route采用引用方式允许重复创建 [caoqianming] + - MlogSerializer 处理 work_start_time 的 bug [caoqianming] + - 修改能管采集的点位 [zty] + - mlog work_start_time必填 [caoqianming] + - ftestwork submit支持mb [zty] + - toggle_state 使用 routepack.update权限 [caoqianming] + - ftestwork支持对materialbatch检查 [caoqianming] + - batchst返回material_start相关信息 [caoqianming] +- fix: 问题修复 + - ftestwork submit 校验wm和mb bug [caoqianming] + - MlogbInUpdateSerializer 联动count_use 和 count_real [caoqianming] + - batchlog batches_to 优化 [caoqianming] ## 2.7.2025082816 - feat: 新增功能 - 添加定时任务以标记mtask为已完成 [caoqianming] diff --git a/server/settings.py b/server/settings.py index effb7ac6..b65c2923 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.7.2025082816' +SYS_VERSION = '2.8.2025090815' X_FRAME_OPTIONS = 'SAMEORIGIN' # Application definition diff --git a/update_changelog.sh b/update_changelog.sh index c8ffad89..23267a2f 100644 --- a/update_changelog.sh +++ b/update_changelog.sh @@ -1,7 +1,7 @@ #!/bin/bash # 设置默认版本号 (格式: 2.7.YYYYMMDDHH) -DEFAULT_VERSION="2.7.$(date '+%Y%m%d%H')" +DEFAULT_VERSION="2.8.$(date '+%Y%m%d%H')" # 获取参数 (起始tag) TARGET_TAG="$1"