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 7
  • Tags 0
  • xingyun-erp
20 Jul, 2026
1 commit
  • 订货单打印:执行标准是其它取执行标准备注的值
    28f0cd3a
    房远帅 authored
    2026-07-20 16:05:13 +0800  
    Browse Files »

15 Jul, 2026
1 commit
  • 资信-变更查询接口补充办事处、区域名称
    05778da5
    房远帅 authored
    2026-07-15 09:54:34 +0800  
    Browse Files »

30 Jun, 2026
2 commits
  • 合同变更:排序规则
    169964c0
    房远帅 authored
    2026-06-30 17:24:51 +0800  
    Browse Files »
  • 合同变更:流程变量参数改正
    99976f1b
    房远帅 authored
    2026-06-30 13:53:31 +0800  
    Browse Files »

29 Jun, 2026
3 commits
  • 合同变更:未锁规合同只有在锁规完成后才能变更,和锁规延期申请不会同时进行(未锁规的才能进行锁规延期申请),所以多余的判断逻辑去除
    c57660c2
    房远帅 authored
    2026-06-29 15:31:36 +0800  
    Browse Files »
  • 合同:合同变更完善
    dd85ff37
    房远帅 authored
    2026-06-29 14:28:01 +0800  
    Browse Files »
  • Merge branch 'master_after0506' into master_after0506_0626 ...
    a9cfb21a
    # Conflicts:
    #	xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractDistributorStandardBo.java
    #	xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractDistributorStandardBo.java
    #	xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractDistributorStandard.java
    #	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
    房远帅 authored
    2026-06-29 11:26:47 +0800  
    Browse Files »

27 Jun, 2026
3 commits
  • 优化:1:剩余锁规数量移到子表里面;2:允许办事处内勤锁价操作,并且记录锁价人
    dc626e31
    房远帅 authored
    2026-06-27 15:45:04 +0800  
    Browse Files »
  • 合同:合同变更单-变更完成后在合同里做标记是否变更
    19fc7a9d
    房远帅 authored
    2026-06-27 11:22:12 +0800  
    Browse Files »
  • 合同:合同变更单
    ca77a0b4
    房远帅 authored
    2026-06-27 11:14:25 +0800  
    Browse Files »

26 Jun, 2026
4 commits
  • Merge branch 'master_after0506_tmp' into master_after0506
    de5cf25a
    房远帅 authored
    2026-06-26 13:39:32 +0800  
    Browse Files »
  • 订货单:增加操作时间筛选
    948ba24b
    房远帅 authored
    2026-06-26 09:53:37 +0800  
    Browse Files »
  • 订货单:增加操作时间筛选
    a046e0f3
    房远帅 authored
    2026-06-26 09:18:19 +0800  
    Browse Files »
  • 合同:合同变更单
    9f71f5b6
    房远帅 authored
    2026-06-26 09:06:19 +0800  
    Browse Files »

12 Jun, 2026
1 commit
  • 锁价功能回退(生成订货单审核通过后才能锁价-回退)
    77ec2cf9
    房远帅 authored
    2026-06-12 10:00:39 +0800  
    Browse Files »

11 Jun, 2026
1 commit
  • Merge branch 'master_after0506' into master_after0506_tmp
    95d9735e
    房远帅 authored
    2026-06-11 16:17:06 +0800  
    Browse Files »

10 Jun, 2026
4 commits
  • 规格变更:相关问题修改
    aab223c5
    房远帅 authored
    2026-06-10 17:45:19 +0800  
    Browse Files »
  • 库存合同:判断是否可锁价
    6681aa15
    房远帅 authored
    2026-06-10 16:26:02 +0800  
    Browse Files »
  • 合同消息提醒:消息提醒只提醒对应的办事处主管及分厂经营办主管
    23f5f6ac
    房远帅 authored
    2026-06-10 10:28:00 +0800  
    Browse Files »
  • 规格变更单:订货单生成中状态可以修改订货单位
    721694c1
    房远帅 authored
    2026-06-10 09:05:06 +0800  
    Browse Files »

09 Jun, 2026
3 commits
  • 库存合同:生产订货单审核通过后才能锁价
    99a6729f
    房远帅 authored
    2026-06-09 15:12:51 +0800  
    Browse Files »
  • 合同:打印模板修改
    a8e3ad2e
    房远帅 authored
    2026-06-09 13:52:20 +0800  
    Browse Files »
  • 合同:打印模板修改
    f492b522
    房远帅 authored
    2026-06-09 11:32:11 +0800  
    Browse Files »

05 Jun, 2026
1 commit
  • 订单明细报表查询优化
    7e44d40d
    房远帅 authored
    2026-06-05 09:16:50 +0800  
    Browse Files »

04 Jun, 2026
2 commits
  • Merge branch 'master_after0506_report02_1' into master_after0506
    851d90a8
    房远帅 authored
    2026-06-04 16:18:49 +0800  
    Browse Files »
  • 销售:规格变更单-模板调整和时间变更打印不展示修改
    871eac5b
    房远帅 authored
    2026-06-04 16:11:55 +0800  
    Browse Files »

03 Jun, 2026
1 commit
  • 东莞办事处编码问题处理
    71cffe0f
    房远帅 authored
    2026-06-03 14:42:30 +0800  
    Browse Files »

02 Jun, 2026
1 commit
  • 1:订货单、撤销单、规格变更单查询接口增加合同类型方便前端判断单位是元还是美元 2:合同锁规可以编辑备注 3:订单明细报表赋值订单类型 经销标准合同-经销 经销… ...
    55489fa9
    …库存、外贸库存合同-库存已锁价、库存未锁价 经销未锁规、外贸未锁规合同-未锁规、已锁规 加工标准合同-加工 外贸标准合同-外贸
    房远帅 authored
    2026-06-02 11:50:13 +0800  
    Browse Files »

01 Jun, 2026
2 commits
  • 订货单:打印模板增加目的地
    7daf9de0
    房远帅 authored
    2026-06-01 17:22:53 +0800  
    Browse Files »
  • 订货单:打印模板修改
    ac1d4465
    房远帅 authored
    2026-06-01 11:48:06 +0800  
    Browse Files »

29 May, 2026
4 commits
  • 打印模板检查
    8c4274a3
    房远帅 authored
    2026-05-29 17:35:50 +0800  
    Browse Files »
  • 打印模板检查
    7f03426a
    房远帅 authored
    2026-05-29 17:27:40 +0800  
    Browse Files »
  • 打印模板检查
    80663a52
    房远帅 authored
    2026-05-29 16:38:38 +0800  
    Browse Files »
  • 打印模板检查
    12c351a8
    房远帅 authored
    2026-05-29 12:30:43 +0800  
    Browse Files »

26 May, 2026
2 commits
  • 合同编码:按办事处生成每个都从办事处编码+日期+00001开始递增;WZ260500001 ZT260500001
    5e12e993
    房远帅 authored
    2026-05-26 10:59:16 +0800  
    Browse Directory »
  • 合同打印模板修改:自动填充法定代表人、委托代理人、电话及传真、日期
    7b044e95
    房远帅 authored
    2026-05-26 09:37:52 +0800  
    Browse Directory »

25 May, 2026
4 commits
  • 合同打印模板修改:自动填充法定代表人、委托代理人、电话及传真、日期
    af36720b
    房远帅 authored
    2026-05-25 17:39:10 +0800  
    Browse Directory »
  • 合同:支持导出excel
    42f04fbf
    房远帅 authored
    2026-05-25 16:01:49 +0800  
    Browse Directory »
  • 客户信息、客户资信:业务员,办事处内勤,办事处主管,区域负责人-各办事处只能看到各办事处的客户信息、客户资信(精确到区域)
    1c2d0914
    房远帅 authored
    2026-05-25 15:31:22 +0800  
    Browse Files »
  • Merge branch 'master_after0506' into master_after0506_report02_1
    71a1549a
    房远帅 authored
    2026-05-25 14:05:24 +0800  
    Browse Files »