Commits · c74023317faae7b87e17e37bd100592c6b4c4978 · platform / hg-smart · GitLab

18 Jul, 2024 11 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · c7402331
  liuyang authored Jul 18, 2024
  
  c7402331 Browse Files
- 2024-07-18 修复采购开票提交bug · 9f99cb55
  liuyang authored Jul 18, 2024
  
  9f99cb55 Browse Files
- 入库账期校验业务日期bug修改 · 72fd28a0
  江和松 authored Jul 18, 2024
  
  72fd28a0 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 0d70413d
  江和松 authored Jul 18, 2024
  
  0d70413d Browse Files
- 付款单清单bugfix · ab78bc05
  wuwenlong authored Jul 18, 2024
  
  ab78bc05 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 8e10ce8f
  liuyang authored Jul 18, 2024
  
  8e10ce8f Browse Files
- 2024-07-18 · eae72b7f
```
1.合同类型为补充协议，主合同号选择后没有显示
2.合同类型为合同外用工，可以选择主合同号这劳务合同
```
  liuyang authored Jul 18, 2024
  eae72b7f Browse Files
- 采购收货为已入库进行选择，劳务合同结算为已提交进行选择，租赁合同结算为已提交进行选择 · 02b3dc66
  wuwenlong authored Jul 18, 2024
  
  02b3dc66 Browse Files
- 签证单可以选劳务合同 · f66a40fb
  wuwenlong authored Jul 18, 2024
  
  f66a40fb Browse Files
- 结算单选择合同可选择所有合同类型 · 49930265
  wuwenlong authored Jul 18, 2024
  
  49930265 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 6b52a0fe
  江和松 authored Jul 18, 2024
  
  6b52a0fe Browse Files
17 Jul, 2024 13 commits
- 2024-07-17 修复收款单录入收款金额，保存提示生成收款单失败，原因：扣款金额不能大于销售开票剩余金额bug · 508d4c0e
  liuyang authored Jul 17, 2024
  
  508d4c0e Browse Files
- 2024-07-17 修复批量工艺流程bug · ddefd6b2
  liuyang authored Jul 17, 2024
  
  ddefd6b2 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · dece5d6a
  liuyang authored Jul 17, 2024
  
  dece5d6a Browse Files
- 存货批量设置流程，存货流程批量设置排产系数 · 74296ed6
  wuwenlong authored Jul 17, 2024
  
  74296ed6 Browse Files
- 2024-07-17 业务账期维护优化防止重复提交 · 67ff52c2
  liuyang authored Jul 17, 2024
  
  67ff52c2 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · fad7a97c
  liuyang authored Jul 17, 2024
  
  fad7a97c Browse Files
- 2024-07-17 修复存货档案工艺详情bug · b69e255d
  liuyang authored Jul 17, 2024
  
  b69e255d Browse Files
- 结算单选择合同可选择合同外用工 · ea5c435e
  wuwenlong authored Jul 17, 2024
  
  ea5c435e Browse Files
- 项目立项opt; · 9d0a061d
  wuwenlong authored Jul 17, 2024
  
  9d0a061d Browse Files
- Merge remote-tracking branch 'hg/dev' into dev · 363e69fc
  wuwenlong authored Jul 17, 2024
  
  363e69fc Browse Files
- 产副品制造成本核算； · e6aa6586
  wuwenlong authored Jul 17, 2024
  
  e6aa6586 Browse Files
- 2024-07-17 业务账期维护重复添加校验优化 · 8e56d455
  liuyang authored Jul 17, 2024
  
  8e56d455 Browse Files
- 2024-07-17 业务账期维护重复添加校验优化 · 85dfea34
  liuyang authored Jul 17, 2024
  
  85dfea34 Browse Files
16 Jul, 2024 11 commits
- 2024-07-16 设备管理优化根据用户角色查询用户所属公司用户 · 06610fdf
  liuyang authored Jul 16, 2024
  
  06610fdf Browse Files
- Merge remote-tracking branch 'hg/dev' into dev · 36abee8b
  wuwenlong authored Jul 16, 2024
  
  36abee8b Browse Files
- 会计期管理dev; · 3ed1cafa
  wuwenlong authored Jul 16, 2024
  
  3ed1cafa Browse Files
- 2024-07-16 新增业务账期同步添加会计期 · b204ad4e
  liuyang authored Jul 16, 2024
  
  b204ad4e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 2e3a3e1d
  liuyang authored Jul 16, 2024
  
  2e3a3e1d Browse Files
- 2024-07-16 原材料成本核算选择公司提示bug修复 · 4715141b
  liuyang authored Jul 16, 2024
  
  4715141b Browse Files
- 产副品制造成本核算； · b54ad124
  wuwenlong authored Jul 16, 2024
  
  b54ad124 Browse Files
- 产副品制造成本核算； · 24d0eb0e
  wuwenlong authored Jul 16, 2024
  
  24d0eb0e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 9e263532
  liuyang authored Jul 16, 2024
  
  9e263532 Browse Files
- 会计期管理dev; · 39a7aef8
  wuwenlong authored Jul 16, 2024
  
  39a7aef8 Browse Files
- 会计起管理dev; · c9280883
  wuwenlong authored Jul 16, 2024
  
  c9280883 Browse Files
15 Jul, 2024 5 commits
- 2024-07-15 原燃料入库成本核算和原燃料出库成本核算bug修复 · 18c71863
  liuyang authored Jul 15, 2024
  
  18c71863 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 053f47a2
  江和松 authored Jul 15, 2024
  
  053f47a2 Browse Files
- 2024-07-15 业务账期维护账期结束日期变更 · d430a272
  liuyang authored Jul 15, 2024
  
  d430a272 Browse Files
- 2024-07-15 业务账期维护变更 · 7aa95d79
  liuyang authored Jul 15, 2024
  
  7aa95d79 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 45ffe828
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
```
  liuyang authored Jul 15, 2024
  45ffe828 Browse Files