From bdf69a66350fdb4dc37f2196db8aa4852326129d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 15 Jul 2025 16:04:20 +0800
Subject: [PATCH] release: 2.7.2025071516

---
 changelog.md       | 25 +++++++++++++++++++++++++
 server/settings.py |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 51499a72..7a04c265 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,28 @@
+## 2.7.2025071516
+- feat: 新增功能
+  - ftestwork添加cbatch查询条件 [caoqianming]
+  - 出入库记录缺少明细不让操作 [caoqianming]
+  - 光子batch统计增加大小日期 [caoqianming]
+  - 导入daoru_mioitem_test单元格公式的处理 [caoqianming]
+  - ftestprocess update 支持新的检测项和缺陷项 [caoqianming]
+  - 数采做成单独服务 [caoqianming]
+  - 测试cd [caoqianming]
+  - gen_number_with_rule 偏离6小时 [caoqianming]
+  - base complexquery value支持多种类型 支持isnull [caoqianming]
+  - wpr 增加复杂查询接口 [caoqianming]
+  - 返工不限制物料选择 [caoqianming]
+  - mlog添加操作时间校验 [caoqianming]
+  - 按个选入消耗时统计mlog数据 [caoqianming]
+  - BatchSt.g_create取消传入check_mat [caoqianming]
+  - 优化ana_wpr [caoqianming]
+  - wpr_bxerp返回批号 [caoqianming]
+  - 获取该批次的DAG图数据 支持仅直接关系 [caoqianming]
+  - 批次追踪链优化 [caoqianming]
+- fix: 问题修复
+  - 生成dag时为防止边重复给edge设置ID [caoqianming]
+  - batchst并发创建的处理 [caoqianming]
+  - 日志多步骤导致的返工填写bug [caoqianming]
+  - 正常交接收料工段与送料工段不能相同 [caoqianming]
 ## 2.7.2025070310
 - feat: 新增功能
   - ana_wpr忽略模块导入错误 [caoqianming]
diff --git a/server/settings.py b/server/settings.py
index fe161043..dd762775 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.2025070310'
+SYS_VERSION = '2.7.2025071516'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 
 # Application definition