Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • H holdingk
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 4
    • Merge requests 4
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • knitting
  • holdingk
  • Merge requests
  • !1687

Merged
Created Oct 09, 2026 by wangzp@wangzpOwner0 of 3 tasks completed0/3 tasks

feat: 坯布批号确认合入 test_security

  • Overview 0
  • Commits 22
  • Changes 123

Summary

  • 由 hotfix_piece_batch_confirm 合入 test_security,解决与 test_security 的文件冲突。
  • 保留生成系统批号时确认坯布批号,综合查询仍按系统批号加坯布批号展开。
  • 带上 test_security 已有的完工比例、机修处理,以及较新的 minio 版本。数据库仍用 1.4.11.5-SNAPSHOT。
  • 替代无法合并的 MR 1686。指向 preview 的 MR 1685 仍走 hotfix_piece_batch_confirm,不包含这次合并。

Test plan

  • 派料、机台调拨、手动确认生成系统批号时确认坯布批号
  • 综合查询按系统批号加坯布批号分行
  • 生产单全部下机后仍按完工比例自动完工
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: mr-1686-merge-test-security