Sign in

朱园亮 / xingyun-erp · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Network
  • Commits 2
  • Network
  • Compare
  • Branches 8
  • Tags 0
  • xingyun-erp
07 May, 2026
5 commits
  • Merge branch 'master_after0423' into master_after0506 ...
    d8c0b10d
    # Conflicts:
    #	xingyun-sc/src/main/resources/templates/purchaseOrderTemplate.xlsx
    #	xingyun-sc/src/main/resources/templates/purchaseOrderTemplateForProduction.xlsx
    房远帅 authored
    2026-05-07 11:10:33 +0800  
    Browse Files »
  • 合同、订货单导出模板修改
    1990ea67
    房远帅 authored
    2026-05-07 11:07:45 +0800  
    Browse Files »
  • 合同、订货单导出模板修改
    d1b43a7b
    房远帅 authored
    2026-05-07 10:35:30 +0800  
    Browse Files »
  • 合同、订货单导出模板修改
    2ff2bf59
    房远帅 authored
    2026-05-07 10:32:16 +0800  
    Browse Files »
  • 订货单:数量小数位问题处理
    f150f018
    房远帅 authored
    2026-05-07 10:30:24 +0800  
    Browse Files »

06 May, 2026
3 commits
  • 订货单:批量打印问题修改
    e15cdbfe
    房远帅 authored
    2026-05-06 16:34:38 +0800  
    Browse Files »
  • 订货单:获取历史生产工艺
    2b2b8433
    房远帅 authored
    2026-05-06 15:34:49 +0800  
    Browse Files »
  • 合同、订货单导出模板修改
    d3d1600b
    房远帅 authored
    2026-05-06 13:56:08 +0800  
    Browse Files »

30 Apr, 2026
2 commits
  • Merge branch 'master_after0423' into master_after0506
    5f54bd08
    房远帅 authored
    2026-04-30 11:47:26 +0800  
    Browse Files »
  • 合同:审核流程发起人问题处理
    629120a9
    房远帅 authored
    2026-04-30 10:10:51 +0800  
    Browse Files »

29 Apr, 2026
4 commits
  • 合同:审核过程中新增试样订单
    a59efdae
    房远帅 authored
    2026-04-29 16:45:06 +0800  
    Browse Files »
  • 合同:审核过程中新增物料编码
    8dc7a5f7
    房远帅 authored
    2026-04-29 14:44:28 +0800  
    Browse Files »
  • 合同:审核过程中可编辑规范性附件
    bc554a1a
    房远帅 authored
    2026-04-29 14:29:30 +0800  
    Browse Files »
  • 合同:经销、外贸库存合同拆分
    226513fd
    房远帅 authored
    2026-04-29 09:49:43 +0800  
    Browse Files »

27 Apr, 2026
4 commits
  • 合同:外贸、加工合同目的地历史数据处理地址风格保持一致
    69338cd7
    房远帅 authored
    2026-04-27 17:50:34 +0800  
    Browse Files »
  • 合同:审核过程中更新流程变量数据
    844cefda
    房远帅 authored
    2026-04-27 15:08:57 +0800  
    Browse Files »
  • 合同:外贸、加工合同目的地历史数据处理
    d9b6f3cb
    房远帅 authored
    2026-04-27 13:57:01 +0800  
    Browse Files »
  • 合同:外贸、加工合同新增目的地(文本)
    313b397a
    房远帅 authored
    2026-04-27 11:56:49 +0800  
    Browse Files »

24 Apr, 2026
15 commits
  • Merge branch 'master_after0225' into master_after0423
    94e73da7
    房远帅 authored
    2026-04-24 17:06:51 +0800  
    Browse Files »
  • 订货单:打印模板优化
    3db638e0
    房远帅 authored
    2026-04-24 17:06:30 +0800  
    Browse Files »
  • Merge branch 'master_after0225' into master_after0423
    3457627f
    房远帅 authored
    2026-04-24 16:59:56 +0800  
    Browse Files »
  • 订货单:打印模板优化
    0cf65ec3
    房远帅 authored
    2026-04-24 16:59:38 +0800  
    Browse Files »
  • Merge branch 'master_after0225' into master_after0423
    030b5e39
    房远帅 authored
    2026-04-24 16:42:12 +0800  
    Browse Files »
  • 订货单:打印模板优化
    b3e1caf9
    房远帅 authored
    2026-04-24 16:41:47 +0800  
    Browse Files »
  • Merge branch 'master_after0225' into master_after0423
    f6c8c4f7
    房远帅 authored
    2026-04-24 16:23:17 +0800  
    Browse Files »
  • 合同:修改打印模板
    e14368de
    房远帅 authored
    2026-04-24 15:53:43 +0800  
    Browse Files »
  • Merge branch 'master_after0225' into master_after0423
    0c9a02bf
    房远帅 authored
    2026-04-24 15:46:46 +0800  
    Browse Files »
  • 合同:修改打印模板
    6b6fecb8
    房远帅 authored
    2026-04-24 15:46:28 +0800  
    Browse Files »
  • Merge branch 'master_after0225' into master_after0423
    7cc9e6fd
    房远帅 authored
    2026-04-24 15:34:06 +0800  
    Browse Files »
  • 合同:修改打印模板
    806e0e82
    房远帅 authored
    2026-04-24 15:33:39 +0800  
    Browse Files »
  • 合同:打印模板添加收货人
    ec124a9c
    房远帅 authored
    2026-04-24 15:17:59 +0800  
    Browse Files »
  • 经销库存、外贸库存正式合同:办事处内勤审核过程中可修改合同、驳回业务员可修改,办事处内勤审核通过生成订货单,后续节点驳回后只能修改规范性文件,其它不可再修改;经… ...
    09c2f2fa
    …销未锁规、外贸未锁规标准合同:办事处内勤审核过程中可修改合同、驳回业务员可修改,办事处内勤审核通过生成订货单,后续节点驳回后只能修改规范性文件
    房远帅 authored
    2026-04-24 15:01:48 +0800  
    Browse Files »
  • 经销、外贸、加工标准合同:办事处内勤审核过程中可修改合同、驳回业务员可修改,办事处内勤审核通过生成订货单,后续节点驳回后只能修改规范性文件,其它不可再修改
    6811acb2
    房远帅 authored
    2026-04-24 10:09:04 +0800  
    Browse Files »

23 Apr, 2026
3 commits
  • 合同编码问题修改
    02f3e856
    房远帅 authored
    2026-04-23 15:22:21 +0800  
    Browse Files »
  • Merge branch 'master_after0416' into master_after0225
    f8773fa2
    房远帅 authored
    2026-04-23 11:51:53 +0800  
    Browse Files »
  • 订货单:订单变动后去除同步修改合同相关信息逻辑
    93e325a2
    房远帅 authored
    2026-04-23 09:39:16 +0800  
    Browse Files »

17 Apr, 2026
4 commits
  • 订货单:打印修改
    4fb0c499
    房远帅 authored
    2026-04-17 17:33:16 +0800  
    Browse Files »
  • 规格变更:bug修改
    5bf51f12
    房远帅 authored
    2026-04-17 17:32:57 +0800  
    Browse Files »
  • 导出:规格大小时大时小问题修改
    453af234
    房远帅 authored
    2026-04-17 16:18:20 +0800  
    Browse Files »
  • 订货单:订单变动后同步修改合同相关信息
    ff7b6358
    房远帅 authored
    2026-04-17 10:34:24 +0800  
    Browse Files »