Commits · 729653d5d05742ba72e0eba6c60385af89c1f35a · lanbaoming / jiedao-api-boot-master · GitLab

24 Dec, 2024 10 commits
- Merge branch 'master-fix' into release · 729653d5
  zhengyi authored Dec 24, 2024
  
  729653d5
- 取消或拒绝费用申请审批业务bug修复 · da431668
  zhengyi authored Dec 24, 2024
  
  da431668
- Merge branch 'master-fix' into release · a67c4298
  zhengyi authored Dec 24, 2024
  
  a67c4298
- sql修复 · 9e95991e
  zhengyi authored Dec 24, 2024
  
  9e95991e
- Merge branch 'master-fix' into release · 98927d66
  zhengyi authored Dec 24, 2024
  
  98927d66
- sql修复 · 17463f9c
  zhengyi authored Dec 24, 2024
  
  17463f9c
- Merge remote-tracking branch 'origin/release' into release · b7615bb7
  wux authored Dec 24, 2024
  
  b7615bb7
- 将jd_dev分支代码合并到release分支 · f132dd89
  wux authored Dec 24, 2024
  
  f132dd89
- 货柜相关审批冗余到订单的审批类型bug修复 · ec5f67e8
  zhengyi authored Dec 24, 2024
  
  ec5f67e8
- bug修复 · e52e7563
  zhengyi authored Dec 24, 2024
  
  e52e7563
23 Dec, 2024 4 commits
- 批量审批不通过操作bug修复 · 437b6337
  zhengyi authored Dec 23, 2024
  
  437b6337
- 订单的出货审批状态更新bug修复 · 869e1a6a
  zhengyi authored Dec 23, 2024
  
  869e1a6a
- 出货阶段的订单信息修改都不对订单产品价格进行重置计算 · c16a8845
  zhengyi authored Dec 23, 2024
  
  c16a8845
- 收货人为空时合单与拆单bug修复 · 2031c168
  zhengyi authored Dec 23, 2024
  
  2031c168
20 Dec, 2024 3 commits
- fix: 在pda中入仓纪录明细信息需要返回品牌名和产品名 · df0bc8d0
  yanghao authored Dec 20, 2024
  
  df0bc8d0
- 复制订单时重置品牌id · 1ce554dc
  zhengyi authored Dec 20, 2024
  
  1ce554dc
- 待预装订单列表查询bug修复 · e203f205
  zhengyi authored Dec 20, 2024
  
  e203f205
19 Dec, 2024 3 commits
- 控货订单有收货人时也发送短信 · e08680a1
  zhengyi authored Dec 19, 2024
  
  e08680a1
- 订单审批动态更新bug修复 · 9f4160b1
  zhengyi authored Dec 19, 2024
  
  9f4160b1
- 订单审批动态更新bug修复 · 9bf6f6ac
  zhengyi authored Dec 19, 2024
  
  9bf6f6ac
18 Dec, 2024 4 commits
- 空运分拣并发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
17 Dec, 2024 2 commits
- Merge branch 'master-fix' · a6a2251e
  zhengyi authored Dec 17, 2024
  
  a6a2251e
- 复制订单时重置调仓id数据 · 57525462
  zhengyi authored Dec 17, 2024
  
  57525462
13 Dec, 2024 2 commits
- 海运/空运-出货屏蔽自编号下的所有应收已核销校验添加注释 · 0d7a2d49
  wux authored Dec 12, 2024
  
  0d7a2d49
- 1.海运/空运-出货屏蔽自编号下的所有应收已核销校验 · 8b5ce941
  honghy authored Dec 12, 2024
  
  8b5ce941
11 Dec, 2024 6 commits
- 出货阶段的入仓修改和订单修改状态节点权限修正，海运是装柜审批完成，空运是已出仓 · 79aa2612
  zhengyi authored Dec 11, 2024
  
  79aa2612
- 动态查询时，对订单提货状态进行sql转换 · 2e3a9f89
  zhengyi authored Dec 11, 2024
  
  2e3a9f89
- 允许选择了主营类别，但是该主营类别下面没有对应的商品，并保存时对数据进行去重 · 5b590907
  zhengyi authored Dec 11, 2024
  
  5b590907
- 线路价格导出的bug修复 · 4950d20a
  zhengyi authored Dec 11, 2024
  
  4950d20a
- 收货人手机号不能为国内号码的文案提示修改 · eb03dd14
  zhengyi authored Dec 11, 2024
  
  eb03dd14
- 补充客户详情2的返回值 · 6fc4f7b8
  zhengyi authored Dec 11, 2024
  
  6fc4f7b8
10 Dec, 2024 6 commits
- 修改客户新增/编辑/详情，客户主营类别/主营产品的传参与返参数据结构 · c61dd7b2
  zhengyi authored Dec 10, 2024
  
  c61dd7b2
- 修改客户新增/编辑/详情，客户主营类别/主营产品的传参与返参数据结构 · 83933bf7
  zhengyi authored Dec 10, 2024
  
  83933bf7
- task: #970 客户列表新增最新发货时间 · 11d33ceb
  yanghao authored Dec 10, 2024
  
  11d33ceb
- 跟进列表返回上级跟进记录详情信息 · d7a59e26
  zhengyi authored Dec 10, 2024
  
  d7a59e26
- 获取仓库区域并行国家、城市、仓库列表排序 · cdc6515f
  zhengyi authored Dec 10, 2024
  
  cdc6515f
- 获取仓库区域并行国家、城市、仓库列表排序 · ba272da2
  zhengyi authored Dec 10, 2024
  
  ba272da2