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
20 Sep, 2024
1 commit
  • 1.优化邮件发送 ...
      9a1e5de5
    2.测试结果自动更新到产品意见
    3.创建生产科时不重复自动添加到字典中
    chenhang4442024 authored
    2024-09-20 16:41:04 +0800  
    Browse Code »

20 Aug, 2024
1 commit
  • 定时任务改为每天凌晨五点执行
      74490ef0
    chenhang4442024 authored
    2024-08-20 08:40:25 +0800  
    Browse Code »

19 Aug, 2024
1 commit
  • 不在根据中期申请时间和尾期申请时间判断是否发送邮件,根据中期结果和尾期结果判断。
      2dff447b
    chenhang4442024 authored
    2024-08-19 18:09:21 +0800  
    Browse File »

18 Aug, 2024
3 commits
  • 避免最初dictory中没有生产科时无法在创建生产科用户的同时创建生产科daodictory中
      36c3c0bb
    chenhang4442024 authored
    2024-08-18 23:45:49 +0800  
    Browse Code »
  • 避免最初dictory中没有生产科时无法在创建生产科用户的同时创建生产科daodictory中
      7803cc94
    chenhang4442024 authored
    2024-08-18 23:24:36 +0800  
    Browse Code »
  • 修复已删除的邮件配置也会被列入校验的情况
      5ed2fe71
    chenhang4442024 authored
    2024-08-18 18:42:14 +0800  
    Browse Code »

17 Aug, 2024
5 commits
  • add 校验
      b04d4ca0
    chenhang4442024 authored
    2024-08-17 23:54:47 +0800  
    Browse Dir »
  • add 校验
      5bd631bb
    chenhang4442024 authored
    2024-08-17 18:12:50 +0800  
    Browse Code »
  • add让:添加日志
      3a5cbb04
    chenhang4442024 authored
    2024-08-17 17:04:37 +0800  
    Browse Code »
  • fix:剔除多余代码
      9d11e9bc
    chenhang4442024 authored
    2024-08-17 16:17:00 +0800  
    Browse Code »
  • fix:剔除多余代码
      0b616ebb
    chenhang4442024 authored
    2024-08-17 01:17:16 +0800  
    Browse Code »

16 Aug, 2024
5 commits
  • fix:剔除多余代码
      a69d0f44
    chenhang4442024 authored
    2024-08-16 23:50:09 +0800  
    Browse Dir »
  • Merge branch 'ch-prod' into 'main' ...
      bf78f16c
    Ch prod
    
    
    
    See merge request !1
    chwork authored
    2024-08-16 19:54:43 +0800  
    Browse Code »
  • feat:防止没有给生产科配置邮箱产生空指针异常
      8d9b8e04
    chenhang4442024 authored
    2024-08-16 19:50:49 +0800  
    Browse Code »
  • feat:解决旧版erp系统最晚包材到货时间和最晚订舱时间无法选择时间的问题
      17ee2dd5
    chenhang4442024 authored
    2024-08-16 13:42:38 +0800  
    Browse Code »
  • feat:修复AITEX/SGS一个满足,另一个不执行的情况。
      b416f3e5
    chenhang4442024 authored
    2024-08-16 11:48:38 +0800  
    Browse Code »

15 Aug, 2024
2 commits
  • 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
6 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 »