Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
factory_front
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • qinjianhui
  • factory_front
  • Merge Requests
  • !203

Merged
Opened Jun 04, 2026 by qinjianhui@qinjianhui 
  • Report abuse
Report abuse

Dev new order intercept

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b dev_new_order_intercept origin/dev_new_order_intercept

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout dev
git merge --no-ff dev_new_order_intercept

Step 4. Push the result of the merge to GitLab

git push origin dev

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 21
  • Changes 23
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • qinjianhui @qinjianhui

    added 54 commits

    • fa20b629...3aea5144 - 33 commits from branch dev
    • 65f2915e - feat: 工厂订单挂起状态增加拦截成功和拦截失败功能
    • 7158837e - feat: 已取消状态增加子tab
    • 1e56e787 - fix: 问题修改
    • 72632338 - feat: 订单详情增加「操作单」子表 Tab
    • a96bb2d7 - feat: 工厂订单取消后处理功能开发
    • 43b046d8 - feat: 胚衣入库功能开发
    • 93b6f25e - feat: 生产完成入库功能开发
    • 21240c71 - fix: 问题修改
    • c7d581fe - fix: 挂起子tab文案修改
    • be5de7ac - fix: 订单拦截功能接口联调
    • 0c7ea95a - fix: 问题修改
    • 55956f72 - fix: 去掉注释
    • 574904ef - fix: 工厂订单拦截功能bug修改
    • 71b5c0fb - fix: 问题修改
    • 746754ca - fix: 问题修改
    • 93c4ac4e - fix: 问题修改
    • d9156ae7 - feat: 工厂订单取消后挂起功能接口联调
    • e647ba64 - fix: 问题修改
    • 1d887218 - fix: 问题修改
    • a4a06109 - fix: 胚衣入库与生产完成入库使用独立扫码历史缓存 key
    • a640f575 - fix: 注释取消后订单处理菜单

    Compare with previous version

    Jun 04, 2026

    added 54 commits

    • fa20b629...3aea5144 - 33 commits from branch dev
    • 65f2915e - feat: 工厂订单挂起状态增加拦截成功和拦截失败功能
    • 7158837e - feat: 已取消状态增加子tab
    • 1e56e787 - fix: 问题修改
    • 72632338 - feat: 订单详情增加「操作单」子表 Tab
    • a96bb2d7 - feat: 工厂订单取消后处理功能开发
    • 43b046d8 - feat: 胚衣入库功能开发
    • 93b6f25e - feat: 生产完成入库功能开发
    • 21240c71 - fix: 问题修改
    • c7d581fe - fix: 挂起子tab文案修改
    • be5de7ac - fix: 订单拦截功能接口联调
    • 0c7ea95a - fix: 问题修改
    • 55956f72 - fix: 去掉注释
    • 574904ef - fix: 工厂订单拦截功能bug修改
    • 71b5c0fb - fix: 问题修改
    • 746754ca - fix: 问题修改
    • 93c4ac4e - fix: 问题修改
    • d9156ae7 - feat: 工厂订单取消后挂起功能接口联调
    • e647ba64 - fix: 问题修改
    • 1d887218 - fix: 问题修改
    • a4a06109 - fix: 胚衣入库与生产完成入库使用独立扫码历史缓存 key
    • a640f575 - fix: 注释取消后订单处理菜单

    Compare with previous version

    added 54 commits * fa20b629...3aea5144 - 33 commits from branch `dev` * 65f2915e - feat: 工厂订单挂起状态增加拦截成功和拦截失败功能 * 7158837e - feat: 已取消状态增加子tab * 1e56e787 - fix: 问题修改 * 72632338 - feat: 订单详情增加「操作单」子表 Tab * a96bb2d7 - feat: 工厂订单取消后处理功能开发 * 43b046d8 - feat: 胚衣入库功能开发 * 93b6f25e - feat: 生产完成入库功能开发 * 21240c71 - fix: 问题修改 * c7d581fe - fix: 挂起子tab文案修改 * be5de7ac - fix: 订单拦截功能接口联调 * 0c7ea95a - fix: 问题修改 * 55956f72 - fix: 去掉注释 * 574904ef - fix: 工厂订单拦截功能bug修改 * 71b5c0fb - fix: 问题修改 * 746754ca - fix: 问题修改 * 93c4ac4e - fix: 问题修改 * d9156ae7 - feat: 工厂订单取消后挂起功能接口联调 * e647ba64 - fix: 问题修改 * 1d887218 - fix: 问题修改 * a4a06109 - fix: 胚衣入库与生产完成入库使用独立扫码历史缓存 key * a640f575 - fix: 注释取消后订单处理菜单 [Compare with previous version](http://47.122.114.111:9999/qinjianhui/factory_front/merge_requests/203/diffs?diff_id=9295&start_sha=fa20b629e7aa53475094fecb4885d2676675fbd8)
    Toggle commit list
  • qinjianhui @qinjianhui

    merged

    Jun 04, 2026

    merged

    merged
    Toggle commit list
  • qinjianhui @qinjianhui

    mentioned in commit 01701ca7

    Jun 04, 2026

    mentioned in commit 01701ca7

    mentioned in commit 01701ca739a3100959f5b617364152a76e3707d8
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: qinjianhui/factory_front!203
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.