Commits · e6cc3a15345a0e7645e933e764c4aab507b3f96c · platform / hg-smart · GitLab

14 Oct, 2024 2 commits
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · e6cc3a15
  宋祥 authored Oct 14, 2024
  
  e6cc3a15 Browse Files
- 1.修复生产领料提交BUG · 817f4be7
  宋祥 authored Oct 14, 2024
  
  817f4be7 Browse Files
12 Oct, 2024 28 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 15696bae
  liuyang authored Oct 12, 2024
  
  15696bae Browse Files
- 2024-10-12 采购收货单状态为已收货，详情的保存按钮可以显示，不管是手工增加还是选择采购合同都可以修改再保存详情的数据 · c714a411
  liuyang authored Oct 12, 2024
  
  c714a411 Browse Files
- 2024-10-12 生产任务添加报工状态条件，文档管理添加状态和修改范围条件 · f857ac06
  liuyang authored Oct 12, 2024
  
  f857ac06 Browse Files
- 1.角色菜单树新增角色时增加数据范围 · 4ef69092
  宋祥 authored Oct 12, 2024
  
  4ef69092 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 6b0b03c0
```
 Conflicts:
	pom.xml
```
  宋祥 authored Oct 12, 2024
  6b0b03c0 Browse Files
- 1.菜单授权增加资源类型 · 5b2b2ac9
  宋祥 authored Oct 12, 2024
  
  5b2b2ac9 Browse Files
- 1.菜单授权增加资源类型 · dba3e65a
  宋祥 authored Oct 12, 2024
  
  dba3e65a Browse Files
- 1.菜单授权增加资源类型 · d1c29661
  宋祥 authored Oct 12, 2024
  
  d1c29661 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · bc9119ef
  liuyang authored Oct 12, 2024
  
  bc9119ef Browse Files
- 2024-10-12 采购合同手工录入详情按照录入顺序排序，采购收货选择合同时按照合同明细顺序显示 · f49bd947
  liuyang authored Oct 12, 2024
  
  f49bd947 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 9a4be616
  宋祥 authored Oct 12, 2024
  
  9a4be616 Browse Files
- 1.项目信息变更同步修改文档库 · 365f7a1d
  宋祥 authored Oct 12, 2024
  
  365f7a1d Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 375977d4
  宋祥 authored Oct 12, 2024
  
  375977d4 Browse Files
- 1.角色管理调整为角色授权 · ea449b73
```
2.项目信息变更同步修改文档库
```
  宋祥 authored Oct 12, 2024
  ea449b73 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · c5a291b6
  宋祥 authored Oct 12, 2024
  
  c5a291b6 Browse Files
- 1.生产领料报错BUG修复 · 4f823247
  宋祥 authored Oct 12, 2024
  
  4f823247 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 027257db
  宋祥 authored Oct 12, 2024
  
  027257db Browse Files
- 1.生产领料选择库存时显示长宽厚 · b368bb6c
  宋祥 authored Oct 12, 2024
  
  b368bb6c Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 12630dc5
  宋祥 authored Oct 12, 2024
  
  12630dc5 Browse Files
- 1.文件预览界面不显示预览次数和下载次数 · 2164e8ea
  宋祥 authored Oct 12, 2024
  
  2164e8ea Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 1a4aa715
  宋祥 authored Oct 12, 2024
  
  1a4aa715 Browse Files
- 1.定时清理zip文件 · 4974c17c
  宋祥 authored Oct 12, 2024
  
  4974c17c Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 97636a5c
  宋祥 authored Oct 12, 2024
  
  97636a5c Browse Files
- 1.定时清理zip文件 · 49e55a63
  宋祥 authored Oct 12, 2024
  
  49e55a63 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 2223f6b7
  宋祥 authored Oct 12, 2024
  
  2223f6b7 Browse Files
- 1.图片放大预览,文件数据编码调整 · 6dc8f3c1
  宋祥 authored Oct 12, 2024
  
  6dc8f3c1 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 880678f7
  宋祥 authored Oct 12, 2024
  
  880678f7 Browse Files
- 1.图片放大预览 · 4dd7bc24
  宋祥 authored Oct 12, 2024
  
  4dd7bc24 Browse Files
11 Oct, 2024 10 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 18320f5a
  liuyang authored Oct 11, 2024
  
  18320f5a Browse Files
- 2024-10-11 文档管理按钮线上优化 · 9fbc71c5
  liuyang authored Oct 11, 2024
  
  9fbc71c5 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d1fdc042
  宋祥 authored Oct 11, 2024
  
  d1fdc042 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · dcecdffd
  宋祥 authored Oct 11, 2024
  
  dcecdffd Browse Files
- 1.处理重复查询问题 · 6f6d69b1
  宋祥 authored Oct 11, 2024
  
  6f6d69b1 Browse Files
- 2024-10-11 文档浏览树图标调整 · bbefcccd
  liuyang authored Oct 11, 2024
  
  bbefcccd Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 637c70de
  liuyang authored Oct 11, 2024
  
  637c70de Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 47fcd2fd
  宋祥 authored Oct 11, 2024
  
  47fcd2fd Browse Files
- 1.文件预览页面，单个文件可直接预览 · 43ecb29c
  宋祥 authored Oct 11, 2024
  
  43ecb29c Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 61969f36
```
 Conflicts:
	src/main/webapp/HG/WD/HGWD001.js
```
  liuyang authored Oct 11, 2024
  61969f36 Browse Files