Commits · f0ca3c74bfc92184b747941c638a2f76ad6e0773 · platform / hg-smart · GitLab

15 Oct, 2024 9 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · f0ca3c74
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java
	src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
	src/main/webapp/HG/WD/HGWD001.jsp
```
  liuyang authored Oct 15, 2024
  f0ca3c74 Browse Files
- 2024-10-15 文档库，按文件夹批量复制，能复制到文件夹子集 · c57c8f92
  liuyang authored Oct 15, 2024
  
  c57c8f92 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · da4333e6
  宋祥 authored Oct 15, 2024
  
  da4333e6 Browse Files
- 1.fixBug:新增项目时，设计来源未写入问题。 · d4921a11
  宋祥 authored Oct 15, 2024
  
  d4921a11 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · c90a4ec4
  宋祥 authored Oct 15, 2024
  
  c90a4ec4 Browse Files
- 1.文档库页面，默认不加载 · 78f0632f
  宋祥 authored Oct 15, 2024
  
  78f0632f Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 4c12b938
  宋祥 authored Oct 15, 2024
  
  4c12b938 Browse Files
- 1.项目来源增加备件制造图，该目录无需授权可直接操作 · 3a69bad2
  宋祥 authored Oct 15, 2024
  
  3a69bad2 Browse Files
- 2024-10-15 物料清单添加物料生成模板和模糊选择功能 · b388ccc0
  liuyang authored Oct 15, 2024
  
  b388ccc0 Browse Files
14 Oct, 2024 15 commits
- 2024-10-14 修复文档浏览上传时间排序功能 · 13919f0c
  liuyang authored Oct 14, 2024
  
  13919f0c Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 8826a92d
  liuyang authored Oct 14, 2024
  
  8826a92d Browse Files
- 2024-10-14 批量派工、批量改派、全部派工、全部改派选择班组页面时，增加人员明细，显示当时班组的人员明细数据，如果有差异通知行政调整人员班组信息 · d3ee5c50
  liuyang authored Oct 14, 2024
  
  d3ee5c50 Browse Files
- 1.fixBug:默认隐藏文本预览区域 · f553f9e9
  宋祥 authored Oct 14, 2024
  
  f553f9e9 Browse Files
- 1.HPSC001 SQL名称调整 · 4cf97846
  宋祥 authored Oct 14, 2024
  
  4cf97846 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · aef5ecdb
  宋祥 authored Oct 14, 2024
  
  aef5ecdb Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · ec2371de
  宋祥 authored Oct 14, 2024
  
  ec2371de Browse Files
- 1.调整项目来源字段 · 8b97c63f
  宋祥 authored Oct 14, 2024
  
  8b97c63f Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 2a4e3b7c
  liuyang authored Oct 14, 2024
  
  2a4e3b7c Browse Files
- 2024-10-14 采购合同详情录入长、宽、厚，规格自动带出,修改长、宽、厚回写规格 · 0f73fa72
  liuyang authored Oct 14, 2024
  
  0f73fa72 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 4c8fca2d
  宋祥 authored Oct 14, 2024
  
  4c8fca2d Browse Files
- 1.修复生产领料提交BUG，主状态未变更问题 · 9ad02c5c
  宋祥 authored Oct 14, 2024
  
  9ad02c5c Browse Files
- 1.修复生产领料提交BUG，主状态未变更 · 698e7457
  宋祥 authored Oct 14, 2024
  
  698e7457 Browse Files
- 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 16 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