From c7514836cb101dcd91e5623507f625d6e0efcef3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 26 Aug 2025 16:51:51 +0800 Subject: [PATCH] release: 2.7.2025082616 --- changelog.md | 22 ++++++++++++++++++++++ server/settings.py | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 6b7bacbc..d7962cb5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,25 @@ +## 2.7.2025082616 +- feat: 新增功能 + - 添加mlog和handover的锁 [caoqianming] + - base 添加悲观锁及其装饰器 [caoqianming] + - number_to_batch 支持结合工序 [caoqianming] + - 物料清单的导出 [caoqianming] + - mlogbw create 优化 [caoqianming] + - material添加img字段 [caoqianming] + - 过滤来料未完成的优化 [caoqianming] + - mlog quick添加mlogb [caoqianming] + - batch_gzerp添加库存等字段 [caoqianming] + - check_sql_safe 优化一下 [caoqianming] + - quick返回mlogId [caoqianming] + - mlog submit revert支持放置到车间 [caoqianming] + - 可根据work_start_time 推出handle_date [caoqianming] + - MlogInitSerializer 可传入handle_date [caoqianming] + - 去除commands命令权限 [caoqianming] + - 交接记录在审批状态下对撤销的处理 [caoqianming] + - base retreat 撤回功能提到wfservice里 [caoqianming] +- fix: 问题修复 + - mlogbw create 调换一下if顺序 [caoqianming] + - base ComplexQueryMixin 默认null值排最后 [caoqianming] ## 2.7.2025081813 - feat: 新增功能 - 导入出入库明细 [caoqianming] diff --git a/server/settings.py b/server/settings.py index 822e63e7..e7c2cac2 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.2025081813' +SYS_VERSION = '2.7.2025082616' X_FRAME_OPTIONS = 'SAMEORIGIN' # Application definition