diff --git a/changelog.md b/changelog.md index 246726de..6d3eda12 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,13 @@ +## 3.1.2026071614 + +- feat: 新增功能 + - 合格B类字段前端文案改为"记为合格"更准确表达 [caoqianming] +- fix: 问题修复 + - 发货编号获取接口number_out_last兼容无横杠格式避免明细重复编号 [caoqianming] +- other: 其他变更 + - perf:mlog/handover/mlogb列表消除N+1,select_related精简改prefetch,修Handover.handoverb属性绕过prefetch的bug [caoqianming] + - 车间库存列表补齐关联字段select_related,消除剩余N+1 [caoqianming] + - perf:销售发货批次隐藏可发数量为0的批次,并用子查询消除在途量N+1 [caoqianming] ## 3.1.2026071608 - feat: 新增功能 diff --git a/server/settings.py b/server/settings.py index 02893fc5..e79a911a 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 = '3.1.2026071608' +SYS_VERSION = '3.1.2026071614' X_FRAME_OPTIONS = 'SAMEORIGIN' # Application definition diff --git a/update_changelog.sh b/update_changelog.sh index dd7f2b87..a6815c2b 100644 --- a/update_changelog.sh +++ b/update_changelog.sh @@ -33,9 +33,12 @@ process_commits() { local type="$1" local header="$2" local pattern="$3" - + local invert="$4" # 传 "invert" 则取"不匹配 pattern 的提交"(用于 other 兜底) + # 查找匹配类型的提交 - git log $RANGE --no-merges --pretty=format:"%s | %an | %ad" --date=short | grep -E "$pattern" | while read -r line; do + local grep_flag="-E" + [ "$invert" = "invert" ] && grep_flag="-vE" + git log $RANGE --no-merges --pretty=format:"%s | %an | %ad" --date=short | grep $grep_flag "$pattern" | while read -r line; do COMMIT_MSG=$(echo "$line" | cut -d'|' -f1 | sed 's/^ *//;s/ *$//') AUTHOR=$(echo "$line" | cut -d'|' -f2 | sed 's/^ *//;s/ *$//') DATE=$(echo "$line" | cut -d'|' -f3 | sed 's/^ *//;s/ *$//') @@ -55,7 +58,7 @@ process_commits() { # 处理各类型提交(按优先级排序) printed_header=0; process_commits "feat" "feat: 新增功能" "^[fF]eat" printed_header=0; process_commits "fix" "fix: 问题修复" "^[fF]ix" -printed_header=0; process_commits "" "other: 其他变更" "^((?![fF]eat|[fF]ix).)*$" +printed_header=0; process_commits "" "other: 其他变更" "^([fF]eat|[fF]ix)" "invert" # 合并到原文件 if [ -f changelog.md ]; then