From 39c86a14d5d540bdccea04fcb8e13691b5b12f12 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 17 Jun 2025 15:39:39 +0800 Subject: [PATCH] release: 2.6.2025061715 --- changelog.md | 19 +++++++++++++++++++ server/settings.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 957ab8a8..cba9228c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,22 @@ +## 2.6.2025061715 +- feat: 新增功能 + - mlogbin的编辑与mlogbout的联动 [caoqianming] + - mlogb首次创建需要更新count_ok_full [caoqianming] + - 支持从wpr处获取切片数 [caoqianming] + - workchain通过线程执行 [caoqianming] + - mlogbin 和 update时cal_count_notok cal_mlog传False [caoqianming] + - ichat 添加workchain接口 [caoqianming] + - 优化get_tyy_data [caoqianming] + - batch_gxerp添加加工前缺陷 [caoqianming] + - 增加check_sql_safe 稳定性 [caoqianming] + - 放开出入库的物料匹配 [caoqianming] + - 采购入库节点可复用 [caoqianming] +- fix: 问题修复 + - mlogbinupdate时的bug [caoqianming] + - mlogserializer需要同步count_real [caoqianming] + - cal_mlog_count_from_mlogb 需要传参触发 [caoqianming] + - mlog 数值计算bug [caoqianming] + - wmaterial get在传入query参数时完善can_do的逻辑 [caoqianming] ## 2.6.2025060913 - feat: 新增功能 - inm 和 wpm添加wpr number的查询条件 [caoqianming] diff --git a/server/settings.py b/server/settings.py index 2678e14a..d28aed0b 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.6.2025060913' +SYS_VERSION = '2.6.2025061715' X_FRAME_OPTIONS = 'SAMEORIGIN' # Application definition