Commits · 899bbf67175a9404db7f04a5d59d24c6201ca316 · platform / hg-smart · GitLab

30 Aug, 2024 10 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 899bbf67
  liuyang authored Aug 30, 2024
  
  899bbf67 Browse Files
- 2024-08-29 文档库变更 · ba2dec46
  liuyang authored Aug 30, 2024
  
  ba2dec46 Browse Files
- 1.德诚获取token接口 · 2f2ed119
  宋祥 authored Aug 30, 2024
  
  2f2ed119 Browse Files
- 1.20240829 BUG修复 · 425bd4e4
  宋祥 authored Aug 30, 2024
  
  425bd4e4 Browse Files
- 1.德诚开放接口开发 · 98137787
  宋祥 authored Aug 30, 2024
  
  98137787 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · d19747a2
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java
	src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
	src/main/webapp/HG/SC/HGSC101.jsp
```
  宋祥 authored Aug 30, 2024
  d19747a2 Browse Files
- 1.德诚开放接口 · 505308d1
  宋祥 authored Aug 30, 2024
  
  505308d1 Browse Files
- 2024-08-29 文档库变更 · c3d1aa21
  liuyang authored Aug 30, 2024
  
  c3d1aa21 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 93f6895c
  liuyang authored Aug 30, 2024
  
  93f6895c Browse Files
- 2024-08-29 文档库变更 · 71c014dc
  liuyang authored Aug 30, 2024
  
  71c014dc Browse Files
29 Aug, 2024 3 commits
- 1.fixBug: 查询条件修改 · 9519b5cd
  宋祥 authored Aug 29, 2024
  
  9519b5cd Browse Files
- 1.采购合同BUG修复 · b993f965
  宋祥 authored Aug 29, 2024
  
  b993f965 Browse Files
- 2024-08-29 文档库 · fc93070f
  liuyang authored Aug 29, 2024
  
  fc93070f Browse Files
28 Aug, 2024 6 commits
- 1.采购收货BUG修复 · 294bfa0c
  宋祥 authored Aug 28, 2024
  
  294bfa0c Browse Files
- 2024-08-28 合同管理甲方和乙方修复筛选功能 · 2ed3b447
  liuyang authored Aug 28, 2024
  
  2ed3b447 Browse Files
- 2024-08-28 合同管理甲方和乙方修复筛选功能 · 7f862860
  liuyang authored Aug 28, 2024
  
  7f862860 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 720153bc
  liuyang authored Aug 28, 2024
  
  720153bc Browse Files
- 2024-08-28 合同管理甲方和乙方修复筛选功能 · a9f82509
  liuyang authored Aug 28, 2024
  
  a9f82509 Browse Files
- 1.生产领料BUG修复 · 33e7256e
  宋祥 authored Aug 28, 2024
  
  33e7256e Browse Files
27 Aug, 2024 6 commits
- 1.fixBug:生产领料 · c9b127bc
  wasx8023 authored Aug 27, 2024
  
  c9b127bc Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 9777c6fa
  宋祥 authored Aug 27, 2024
  
  9777c6fa Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · fb9672e2
  宋祥 authored Aug 27, 2024
  
  fb9672e2 Browse Files
- 1.客户回访功能 · 747cce3f
  宋祥 authored Aug 27, 2024
  
  747cce3f Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d1ce7e41
  江和松 authored Aug 27, 2024
  
  d1ce7e41 Browse Files
- 被覆盖的问题提交 · ac3f0f37
  江和松 authored Aug 27, 2024
  
  ac3f0f37 Browse Files
26 Aug, 2024 9 commits
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 0cdfd3ca
  宋祥 authored Aug 26, 2024
  
  0cdfd3ca Browse Files
- 1.token:登录失效的问题 · 9d2fc311
  宋祥 authored Aug 26, 2024
  
  9d2fc311 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a1843d45
  liuyang authored Aug 26, 2024
  
  a1843d45 Browse Files
- 2024-08-26 · 2e5cdb9c
```
1.发货单需求：发货单零件和构件选择按照项目显示，原材料和耗材选库存有的
2.采购合同数据校验调整和添加项目查询条件
3.销售开票添加项目查询条件
4、采购计划添加项目查询条件
5、采购收货添加项目查询条件
```
  liuyang authored Aug 26, 2024
  2e5cdb9c Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 4b385da7
  宋祥 authored Aug 26, 2024
  
  4b385da7 Browse Files
- 1.token串号问题修复 · ffcf575b
  宋祥 authored Aug 26, 2024
  
  ffcf575b Browse Files
- 1.客户画像功能 · 84869a69
  宋祥 authored Aug 26, 2024
  
  84869a69 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 7f6e4cc2
  liuyang authored Aug 26, 2024
  
  7f6e4cc2 Browse Files
- 2024-08-26 · 41c13420
```
1.公司名称下拉选择不应该显示集团的公司
2.变更记录的文件类型要显示中文
3.发布以后状态为已发布，当修改文件类型、文件名称、增加和删除附件时，状态为待发布，再次点发布状态为已发布
```
  liuyang authored Aug 26, 2024
  41c13420 Browse Files
25 Aug, 2024 1 commit
- 生产领料增加选择库存数据进行勾选 · 45800e0d
  江和松 authored Aug 25, 2024
  
  45800e0d Browse Files
23 Aug, 2024 5 commits
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · ecbe68db
```
 Conflicts:
	src/main/webapp/HG/CG/HGCG002B.jsp
	src/main/webapp/HG/CG/HGCG003B.jsp
```
  宋祥 authored Aug 23, 2024
  ecbe68db Browse Files
- 1.fixBug:修复采购合同数量金额不对的问题 · 8cf85c8e
  宋祥 authored Aug 23, 2024
  
  8cf85c8e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d842a6d1
  宋祥 authored Aug 23, 2024
  
  d842a6d1 Browse Files
- 1.fixBug:修复采购合同数量金额不对的问题 · 21b0ee32
  宋祥 authored Aug 23, 2024
  
  21b0ee32 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d2f87c38
  江和松 authored Aug 23, 2024
  
  d2f87c38 Browse Files