Sign in

canrd-outside / order-erp · Commits

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 154
  • Compare
  • Branches 3
  • Tags 0
  • order-erp
15 Aug, 2024
3 commits
  • Revert "feat:防止没有给生产科配置邮箱产生空指针异常" ...
      bdf35574
    This reverts commit 3efd19ba.
    chenhang4442024 authored
    2024-08-15 22:06:31 +0800  
    Browse Code »
  • feat:防止没有给生产科配置邮箱产生空指针异常
    3efd19ba
    1
    chenhang4442024 authored
    2024-08-15 22:05:23 +0800  
    Browse Code »
  • feat:更新邮件编辑配置
      78eb9f1d
    chenhang4442024 authored
    2024-08-15 13:10:15 +0800  
    Browse Code »

14 Aug, 2024
2 commits
  • feat:创建生产科角色的同时顺便把生产科添加到dictionary中
      30ec44cd
    chenhang4442024 authored
    2024-08-14 18:38:44 +0800  
    Browse Code »
  • feat:1.把时间由yyyy-mm-dd hh:mm:ss改为yyyy-mm-dd ...
      a8d06449
    2.把邮件标头背景色改为白色,手机端黑色不显示
    chenhang4442024 authored
    2024-08-14 18:33:32 +0800  
    Browse Dir »

12 Aug, 2024
1 commit
  • feat:生产科角色对于订单的可见范围
      c1005400
    chenhang4442024 authored
    2024-08-12 09:15:01 +0800  
    Browse Code »

09 Aug, 2024
4 commits
  • feat:防止注册多个相同客户注册邮件
      b498609e
    chenhang4442024 authored
    2024-08-09 18:40:42 +0800  
    Browse Code »
  • feat:一次性通过率,更新sgs测试与Aitex测试合并计算
      75dda45a
    chenhang4442024 authored
    2024-08-09 13:25:18 +0800  
    Browse Code »
  • feat:一次性通过率2.0
      7657ece5
    chenhang4442024 authored
    2024-08-09 11:34:20 +0800  
    Browse File »
  • feat:一次性通过率
      00e630ff
    chenhang4442024 authored
    2024-08-09 10:22:48 +0800  
    Browse Dir »

08 Aug, 2024
9 commits
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test
      c2082068
    谢茂盛 authored
    2024-08-08 17:02:20 +0800  
    Browse Code »
  • feat: ERP升级 ...
      194f0484
    1、应收账单提交审核修复
    谢茂盛 authored
    2024-08-08 16:58:55 +0800  
    Browse Code »
  • Merge branch 'test' of http://39.108.227.113:8001/xiemaosheng2/order-erp into ch
      f924d5a8
    chenhang4442024 authored
    2024-08-08 16:44:33 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test
      927a715a
    谢茂盛 authored
    2024-08-08 16:40:01 +0800  
    Browse Code »
  • feat: ERP升级 ...
      977d2c69
    1、导出分析列表支持勾选
    谢茂盛 authored
    2024-08-08 16:39:15 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test
      180eea36
    谢茂盛 authored
    2024-08-08 13:48:04 +0800  
    Browse Code »
  • feat: ERP升级 ...
      f54dcd2d
    1、修复获取最后回款时间bug
    谢茂盛 authored
    2024-08-08 13:46:02 +0800  
    Browse Dir »
  • 表结构的修改
      fbfd37bd
    chenhang4442024 authored
    2024-08-08 10:38:08 +0800  
    Browse Code »
  • Merge branch 'test' of http://39.108.227.113:8001/xiemaosheng2/order-erp into ch
    46ab42aa
    chenhang4442024 authored
    2024-08-08 08:49:18 +0800  
    Browse Code »

07 Aug, 2024
16 commits
  • feat: ERP升级 ...
      beeb44bd
    1、fix 冲突
    谢茂盛 authored
    2024-08-07 17:54:57 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test ...
      07ba3676
    # Conflicts:
    #	src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
    谢茂盛 authored
    2024-08-07 17:46:23 +0800  
    Browse Code »
  • feat: ERP升级 ...
      a437906e
    1、订单列表返回invoiceNo字段
    谢茂盛 authored
    2024-08-07 17:42:09 +0800  
    Browse File »
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test
      151f61c9
    谢茂盛 authored
    2024-08-07 16:41:31 +0800  
    Browse Code »
  • feat: ERP升级 ...
      451672c6
    1、文件上传
    谢茂盛 authored
    2024-08-07 16:39:58 +0800  
    Browse Code »
  • feat: update 新增预发布环境配置文件
      27b3d6ff
    zhongnanhuang authored
    2024-08-07 16:01:53 +0800  
    Browse Code »
  • 跟单记录表
    ce6134c8
    chenhang4442024 authored
    2024-08-07 15:42:38 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/ch' into test
      1bd2ff06
    谢茂盛 authored
    2024-08-07 15:09:43 +0800  
    Browse Code »
  • Merge remote-tracking branch 'origin/dev_finance_20240830' into test
      1e436f60
    谢茂盛 authored
    2024-08-07 14:56:59 +0800  
    Browse Code »
  • feat: ERP升级 ...
      b51d8686
    1、文件上传
    谢茂盛 authored
    2024-08-07 14:53:27 +0800  
    Browse Code »
  • 跟单记录信息和生产科邮件配置
      98968e78
    chenhang4442024 authored
    2024-08-07 14:49:12 +0800  
    Browse Dir »
  • feat: ERP升级 ...
      bfb51ca5
    1、生产科角色
    
    (cherry picked from commit 106ec958)
    谢茂盛 authored
    2024-08-07 14:18:02 +0800  
    Browse Code »
  • 测试环境配置文件修改 ...
    ff6131d1
    (cherry picked from commit 94ece63d)
    zhongnanhuang authored
    2024-08-07 14:17:54 +0800  
    Browse Code »
  • 优化定时任务超时时间
      650e5163
    chenhang4442024 authored
    2024-08-07 14:08:52 +0800  
    Browse Code »
  • feat: ERP升级 ...
      8c31cb74
    1、财务分支
    谢茂盛 authored
    2024-08-07 13:54:40 +0800  
    Browse Code »
  • 更新邮件模块,解决尾期验货日期发送邮件到对应生产科
      ca292506
    chenhang4442024 authored
    2024-08-07 13:45:04 +0800  
    Browse Code »

05 Aug, 2024
4 commits
  • 订单跟单结果记录
    5d08aa73
    chenhang4442024 authored
    2024-08-05 18:36:55 +0800  
    Browse Code »
  • feat: ERP升级 ...
      8e2b3476
    1、财务应收创建invoice单据/列表查询/删除/更新操作
    谢茂盛 authored
    2024-08-05 18:22:37 +0800  
    Browse Code »
  • feat: ERP升级 ...
      c0757c2b
    1、财务应付应收框架代码
    谢茂盛 authored
    2024-08-05 16:49:46 +0800  
    Browse Code »
  • feat: ERP升级 ...
      3e244f70
    1、财务脚本
    谢茂盛 authored
    2024-08-05 13:50:02 +0800  
    Browse Code »

01 Aug, 2024
1 commit
  • 定时检测超时任务
      573715a9
    chenhang4442024 authored
    2024-08-01 20:41:26 +0800  
    Browse File »