Commits · e6a292efca2d4f3d9f4b435c8be8b965e9cc99c4 · lanbaoming / jiedao-api-boot-master · GitLab

19 Dec, 2024 4 commits
- fix:需求取消未分配客户经理异常。创建订单，客户自动迁移到待分配客户列表时，客户经理字段置空失效问题修改 · e6a292ef
  Smile authored Dec 19, 2024
  
  e6a292ef
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · 919d2268
  Smile authored Dec 19, 2024
  
  919d2268
- 会员模块-积分规则订单V值积分规则重复校验新增客户方规则和是否首单规则更新。 · e9b7e996
  Smile authored Dec 19, 2024
  
  e9b7e996
- Merge branch 'release' into 'jd_dev' · 5ccd2dc9
  Administrator authored Dec 19, 2024
```
Release分支合并到jd分支20241219

See merge request !48
```
  5ccd2dc9
18 Dec, 2024 6 commits
- 打包环节订单状态设为普货，防止因设置全泡。导致订单状态为抛货状态，会按照抛货收费数据计算。影响渠道免泡重功能。 · 74ef0cae
  Smile authored Dec 18, 2024
  
  74ef0cae
- 空运分拣并发bug修复 · e5502acb
  zhengyi authored Dec 18, 2024
  
  e5502acb
- 已出货订单修改计价都需要更新应收单 · dbc058ed
  zhengyi authored Dec 18, 2024
  
  dbc058ed
- 客户详情主营类别和主营商品回显返回值格式化封装bug修复 · 454adc55
  zhengyi authored Dec 18, 2024
  
  454adc55
- 自编号提单编辑列表重新排序 · b5b46bf2
  zhengyi authored Dec 18, 2024
  
  b5b46bf2
- Merge branch 'release' into 'jd_dev' · 849457b0
  Administrator authored Dec 18, 2024
```
Release分支代码合并到jd分支20241218

See merge request !47
```
  849457b0
17 Dec, 2024 5 commits
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · ab435eac
  Smile authored Dec 17, 2024
  
  ab435eac
- 创建订单，订单的发货人或收货人，无归属客户经理/无在途的待接收流程（包括分配、移交），客户自动迁移到待分配客户列表 · 234b45b7
  Smile authored Dec 17, 2024
  
  234b45b7
- 短信目的仓取值调整 · 4c8c8e1d
  honghy authored Dec 17, 2024
  
  4c8c8e1d
- Merge branch 'master-fix' · a6a2251e
  zhengyi authored Dec 17, 2024
  
  a6a2251e
- 复制订单时重置调仓id数据 · 57525462
  zhengyi authored Dec 17, 2024
  
  57525462
16 Dec, 2024 3 commits
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · 4b3fe376
  Smile authored Dec 16, 2024
  
  4b3fe376
- 官网首页查询订单信息倒序排序 · 7b8cecf2
  Smile authored Dec 16, 2024
  
  7b8cecf2
- 海运已装单导出调整 · 394a0a79
  honghy authored Dec 16, 2024
  
  394a0a79
13 Dec, 2024 5 commits
- 海运/空运-出货屏蔽自编号下的所有应收已核销校验添加注释 · 0d7a2d49
  wux authored Dec 12, 2024
  
  0d7a2d49
- 1.海运/空运-出货屏蔽自编号下的所有应收已核销校验 · 8b5ce941
  honghy authored Dec 12, 2024
  
  8b5ce941
- 调整Bulk客户端接收状态 · a2ca58ab
  honghy authored Dec 13, 2024
  
  a2ca58ab
- 订单短信日志 · 062b8816
  honghy authored Dec 13, 2024
  
  062b8816
- Merge remote-tracking branch 'origin/release' into jd_dev · 8e2d5c9b
  Smile authored Dec 13, 2024
```
# Conflicts:
#	yudao-server/src/main/resources/i18n/messages_zh.properties
```
  8e2d5c9b
12 Dec, 2024 3 commits
- 空运&海运，已装单导出底色调整 · d9167b1e
  honghy authored Dec 12, 2024
  
  d9167b1e
- 短信节点添加目的仓 · 41caa58c
  honghy authored Dec 12, 2024
  
  41caa58c
- 海运/空运-出货屏蔽自编号下的所有应收已核销校验添加注释 · de603ae7
  wux authored Dec 12, 2024
  
  de603ae7
11 Dec, 2024 12 commits
- 出货阶段的入仓修改和订单修改状态节点权限修正，海运是装柜审批完成，空运是已出仓 · 79aa2612
  zhengyi authored Dec 11, 2024
  
  79aa2612
- 动态查询时，对订单提货状态进行sql转换 · 2e3a9f89
  zhengyi authored Dec 11, 2024
  
  2e3a9f89
- 允许选择了主营类别，但是该主营类别下面没有对应的商品，并保存时对数据进行去重 · 5b590907
  zhengyi authored Dec 11, 2024
  
  5b590907
- fix: 放货收货人创建赋值不完整缺少常用网点修改 · f20933e7
  Smile authored Dec 11, 2024
  
  f20933e7
- 订单海运状态，"起运"状态详情内容法语翻译修改 · 4ccb3110
  Smile authored Dec 11, 2024
  
  4ccb3110
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · da78e039
  Smile authored Dec 11, 2024
  
  da78e039
- fix: 放货收货人创建赋值不完整 · fe918478
  Smile authored Dec 11, 2024
  
  fe918478
- 线路价格导出的bug修复 · 4950d20a
  zhengyi authored Dec 11, 2024
  
  4950d20a
- 收货人手机号不能为国内号码的文案提示修改 · eb03dd14
  zhengyi authored Dec 11, 2024
  
  eb03dd14
- 调整whatsapp发送接收状态 · 25f143f9
  honghy authored Dec 11, 2024
  
  25f143f9
- Merge branch 'release' into 'jd_dev' · 34cf5e93
  Administrator authored Dec 11, 2024
```
Release代码合并入jd分支20241211

See merge request !41
```
  34cf5e93
- 补充客户详情2的返回值 · 6fc4f7b8
  zhengyi authored Dec 11, 2024
  
  6fc4f7b8
10 Dec, 2024 2 commits
- 修改客户新增/编辑/详情，客户主营类别/主营产品的传参与返参数据结构 · c61dd7b2
  zhengyi authored Dec 10, 2024
  
  c61dd7b2
- 修改客户新增/编辑/详情，客户主营类别/主营产品的传参与返参数据结构 · 83933bf7
  zhengyi authored Dec 10, 2024
  
  83933bf7