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
  • !1674

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

fix: 布票打印的批号字段返回匹布批号

  • Overview 0
  • Commits 3
  • Changes 6

替代 !1673 (closed)。原分支还要合入 preview,不能把 test_security 合进去,所以从 test_security 拣出这 3 个提交单独合入。

变更

  • 最新系统批号比较的类型放到 BatchNoTypeEnum.latestSystemBatchTypeList(),SYS 占位不参与
  • 布票打印详情、模板和预览仍用原批号字段,取值改为匹布批号;没有匹布批号时回落系统批号
  • 前缀批号仍用原字段,取值改为前缀拼匹布批号

冲突:OrderService 里同时保留 test_security 已有的 MachineRepairBizService 和本次的 OrderMachineConfigBizService。

测试

  • 打印详情、模板字段、预览图上的批号是匹布批号
  • 前缀-批号是前缀拼匹布批号
  • 布票没有匹布批号时,打印仍显示系统批号
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: hotfix_cloth_ticket_print_batch