Commits · f1b070073e49bd984d48ace3b055bdb6dbf41b30 · lanbaoming / jiedao-app-operator-master · GitLab

30 Mar, 2023 9 commits
- 直接修改储位的判断条件更正 · f1b07007
  Marcus authored Mar 30, 2023
  
  f1b07007
- 入仓操作，缺少整板、箱号的计算规则 · 5a2b80be
  Marcus authored Mar 30, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2667.html
```
  5a2b80be
- type=1 非下单货物， 0 填单货物 · effc1936
  Marcus authored Mar 30, 2023
  
  effc1936
- sit入仓操作，货物首次入仓没有默认的行 · 2af113d5
  Marcus authored Mar 30, 2023
```
 https://zentao.test.jdshangmen.com/bug-view-2666.html
```
  2af113d5
- 储位修改成功 · 4c6ffcc9
  Marcus authored Mar 30, 2023
  
  4c6ffcc9
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 2a69c2d2
  我在何方 authored Mar 30, 2023
  
  2a69c2d2
- 订单异常品牌修复 · a3d1507d
  我在何方 authored Mar 30, 2023
  
  a3d1507d
- 订单日志增加操作类型 · bacd264c
  dragondean@qq.com authored Mar 30, 2023
  
  bacd264c
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · b9c30cea
  邓春圆 authored Mar 30, 2023
  
  b9c30cea
29 Mar, 2023 11 commits
- 储位弹窗标题 · 91edfab2
  Marcus authored Mar 29, 2023
  
  91edfab2
- 货物入仓弹窗重构 · 1452f22b
  Marcus authored Mar 29, 2023
  
  1452f22b
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · a0f5409b
  我在何方 authored Mar 29, 2023
  
  a0f5409b
- 收款单bug修复，汇率更新 · 7fad46a4
  我在何方 authored Mar 29, 2023
  
  7fad46a4
- 银行卡不给默认信息 · 77de451f
  邓春圆 authored Mar 29, 2023
  
  77de451f
- 请款单，客户和申请日期提示信息需要优化 · fc53e049
  邓春圆 authored Mar 29, 2023
  
  fc53e049
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 93529e7a
  zhoutong authored Mar 29, 2023
  
  93529e7a
- 操作页面的步骤增加权限 · 3806fd9a
  zhoutong authored Mar 29, 2023
  
  3806fd9a
- 添加创建人 · 6eb453d9
  邓春圆 authored Mar 28, 2023
  
  6eb453d9
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · db1ed10f
  Marcus authored Mar 29, 2023
  
  db1ed10f
- 入仓选储位无效问题 · c51da1d8
  Marcus authored Mar 29, 2023
  
  c51da1d8
28 Mar, 2023 20 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 1cc46338
  houjn@hikoon.cn authored Mar 28, 2023
  
  1cc46338
- Merge remote-tracking branch 'origin/dev' into dev · 8979b3d8
  邓春圆 authored Mar 28, 2023
  
  8979b3d8
- 添加创建人 · 0c9bb730
  邓春圆 authored Mar 28, 2023
  
  0c9bb730
- 文案修改 · e9fb9494
  邓春圆 authored Mar 28, 2023
  
  e9fb9494
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 08dd3689
  邓春圆 authored Mar 28, 2023
  
  08dd3689
- 审批流添加注释 · 4f1487f6
  邓春圆 authored Mar 28, 2023
  
  4f1487f6
- 添加文案 · cb5098f6
  邓春圆 authored Mar 28, 2023
  
  cb5098f6
- 编辑佣金付款单、付款单，付款单详情、佣金付款单详情增加付款单编号 · e21bcf70
  邓春圆 authored Mar 28, 2023
  
  e21bcf70
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 2ef2ef05
  zhoutong authored Mar 28, 2023
  
  2ef2ef05
- 订单箱数点击后弹窗入仓记录的页面加上储位 · c5e889b6
  zhoutong authored Mar 28, 2023
```
供应商等一些bug
```
  c5e889b6
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 6b480e73
  dragondean@qq.com authored Mar 28, 2023
  
  6b480e73
- 订单日志的权限配置 · 33d9f012
  dragondean@qq.com authored Mar 28, 2023
  
  33d9f012
- 付款单佣金添加审核详情 · 2dbd2bac
  邓春圆 authored Mar 28, 2023
  
  2dbd2bac
- 客户添加操作日志，以及客户列表修改 · 5e598469
  邓春圆 authored Mar 28, 2023
  
  5e598469
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · c30a6e70
  wanglianghe authored Mar 28, 2023
  
  c30a6e70
- 供应商区域筛选 · 3c5f6fde
  wanglianghe authored Mar 28, 2023
  
  3c5f6fde
- 完善订单日志 · 1cbba058
  dragondean@qq.com authored Mar 28, 2023
  
  1cbba058
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 32002d5a
  dragondean@qq.com authored Mar 28, 2023
  
  32002d5a
- 订单详情储位的bug · 5b84e217
  dragondean@qq.com authored Mar 28, 2023
  
  5b84e217
- 控货审核详情异常 · efe530f1
  dragondean@qq.com authored Mar 28, 2023
  
  efe530f1