Commits · 1d49bf9d86c8877d725e6307732d6fd6d6b0dda9 · qinjianhui / factory_front · GitLab

24 Jun, 2026 18 commits
- Merge branch 'dev_intercept_refund' into 'release_v2.28.0' · 1d49bf9d
```
Dev intercept refund

See merge request !229
```
  qinjianhui committed Jun 24, 2026
  1d49bf9d Browse Files
- Merge branch 'dev_new_order_stock_up' into 'release_v2.28.0' · 9953d104
```
Dev new order stock up

See merge request !228
```
  qinjianhui committed Jun 24, 2026
  9953d104 Browse Files
- feat: 修改快捷生产扫码接口传参 · 0e64c95c
  wusiyi committed Jun 24, 2026
  
  0e64c95c Browse Files
- Merge branch 'fix_1001679' into release_v2.28.0 · 2466af4d
  wusiyi committed Jun 24, 2026
  
  2466af4d Browse Files
- Merge branch 'dev_sorting_complete' into release_v2.28.0 · 6852d4f0
  wusiyi committed Jun 24, 2026
  
  6852d4f0 Browse Files
- Merge branch 'dev_new_search' into release_v2.28.0 · 39870179
  wusiyi committed Jun 24, 2026
  
  39870179 Browse Files
- Merge branch 'dev_new_copy' of… · 75bcf5ea
```
Merge branch 'dev_new_copy' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_new_copy
```
  wusiyi committed Jun 24, 2026
  75bcf5ea Browse Files
- feat: 工厂订单new支持批量复制订单号到筛选框进行筛选 #1009627 · ef941f44
  wusiyi committed Jun 24, 2026
  
  ef941f44 Browse Files
- Merge branch 'dev_new_search' of… · 924abab2
```
Merge branch 'dev_new_search' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_new_search
```
  wusiyi committed Jun 24, 2026
  924abab2 Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · 1560e4a9
  wusiyi committed Jun 24, 2026
  
  1560e4a9 Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · 7b5e2727
  wusiyi committed Jun 24, 2026
  
  7b5e2727 Browse Files
- Merge branch 'dev_sorting_complete' of… · 475c52d9
```
Merge branch 'dev_sorting_complete' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_sorting_complete
```
  wusiyi committed Jun 24, 2026
  475c52d9 Browse Files
- feat: 工厂订单new增加配货完成功能 #1009532 · 65c8a949
  wusiyi committed Jun 24, 2026
  
  65c8a949 Browse Files
- Merge branch 'dev_intercept_refund' of… · 98720be4
```
Merge branch 'dev_intercept_refund' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_intercept_refund
```
  wusiyi committed Jun 24, 2026
  98720be4 Browse Files
- feat: 添加取消订单提示语 · 1310f7c0
  wusiyi committed Jun 24, 2026
  
  1310f7c0 Browse Files
- feat: 工厂订单new取消订单按钮展示 #1005797 · 722c4691
  wusiyi committed Jun 24, 2026
  
  722c4691 Browse Files
- fix: bug · 7ba97440
  wusiyi committed Jun 24, 2026
  
  7ba97440 Browse Files
- feat: 工厂接单后取消的退款逻辑 #1005797 · a6d41353
  wusiyi committed Jun 24, 2026
  
  a6d41353 Browse Files
23 Jun, 2026 8 commits
- Merge branch 'fix_1001679' of http://47.122.114.111:9999/qinjianhui/factory_front into fix_1001679 · e88fb8d2
  wusiyi committed Jun 23, 2026
  
  e88fb8d2 Browse Files
- fix: 尝试修复扫下一单偶发上一单不自动打单完成问题 #1001679 · 423d74ae
  wusiyi committed Jun 23, 2026
  
  423d74ae Browse Files
- fix:入库单添加入库数量 · ae3b07e1
  qinjianhui committed Jun 23, 2026
  
  ae3b07e1 Browse Files
- Merge branch 'cherry-pick-eed3cfb1' into 'dev' · 3e0881e1
```
Merge branch 'fix_1001695' into 'master'

See merge request !225
```
  qinjianhui committed Jun 23, 2026
  3e0881e1 Browse Files
- Merge branch 'fix_1001695' into 'master' · a24d5e4f
```
Fix 1001695

See merge request !224

(cherry picked from commit eed3cfb1)

580e4f10 fix: 修复扫码进箱时，商品主图未随扫码商品同步更新 #1001695
c437c05c feat: 修改工厂订单new分页上限
```
  qinjianhui committed Jun 23, 2026
  a24d5e4f Browse Files
- feat: 添加取消订单提示语 · 8bfa2a41
  wusiyi committed Jun 23, 2026
  
  8bfa2a41 Browse Files
- feat: 工厂订单new取消订单按钮展示 #1005797 · e97678ec
  wusiyi committed Jun 23, 2026
  
  e97678ec Browse Files
- fix: 尝试修复扫下一单偶发上一单不自动打单完成问题 #1001679 · 1e039d32
  wusiyi committed Jun 23, 2026
  
  1e039d32 Browse Files
22 Jun, 2026 14 commits
- Merge branch 'dev_sorting_complete' of… · 769a3589
```
Merge branch 'dev_sorting_complete' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_sorting_complete
```
  wusiyi committed Jun 22, 2026
  769a3589 Browse Files
- feat: 工厂订单new增加配货完成功能 #1009532 · 8bce0135
  wusiyi committed Jun 22, 2026
  
  8bce0135 Browse Files
- Merge branch 'dev_intercept_refund' of… · b7c2f83c
```
Merge branch 'dev_intercept_refund' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_intercept_refund
```
  wusiyi committed Jun 22, 2026
  b7c2f83c Browse Files
- fix: bug · 5d3da86b
  wusiyi committed Jun 22, 2026
  
  5d3da86b Browse Files
- feat: 工厂接单后取消的退款逻辑 #1005797 · b6f3afae
  wusiyi committed Jun 22, 2026
  
  b6f3afae Browse Files
- Merge branch 'dev_new_search' of… · 2f9ef2ff
```
Merge branch 'dev_new_search' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_new_search
```
  wusiyi committed Jun 22, 2026
  2f9ef2ff Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · a18b8b3a
  wusiyi committed Jun 22, 2026
  
  a18b8b3a Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · 194ed94c
  wusiyi committed Jun 22, 2026
  
  194ed94c Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · 8bca6054
  wusiyi committed Jun 22, 2026
  
  8bca6054 Browse Files
- feat: 工厂订单new支持批量复制订单号到筛选框进行筛选 #1009627 · 7421ad51
  wusiyi committed Jun 22, 2026
  
  7421ad51 Browse Files
- Merge branch 'fix_1001695' into 'dev' · 2219553e
```
Fix 1001695

See merge request !222
```
  zhuzhequan committed Jun 22, 2026
  2219553e Browse Files
- fix: bug · b4be2d0e
  wusiyi committed Jun 22, 2026
  
  b4be2d0e Browse Files
- feat: 工厂订单增加查询客户交运单号 #1009553 · 43afc7c9
  wusiyi committed Jun 22, 2026
  
  43afc7c9 Browse Files
- feat: 工厂订单new增加配货完成功能 #1009532 · 9afa39ca
  wusiyi committed Jun 22, 2026
  
  9afa39ca Browse Files