Commits · 07ae7764bb7f3a5f3a3dc4896a569888a5c93692 · platform / hg-smart · GitLab

21 Aug, 2024 14 commits
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 07ae7764
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC008.xml
	src/main/resources/application.properties
	src/main/resources/quartz.properties
```
  宋祥 authored Aug 21, 2024
  07ae7764 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 923be607
  江和松 authored Aug 21, 2024
  
  923be607 Browse Files
- 采购合同增加计算方式，根据计算方式来计算重量乘单价还是数量乘单价 · ae1df708
  江和松 authored Aug 21, 2024
  
  ae1df708 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a6dcfc58
  liuyang authored Aug 21, 2024
  
  a6dcfc58 Browse Files
- 2024-08-21 文档库没有附件无法发布 · eafa54a0
  liuyang authored Aug 21, 2024
  
  eafa54a0 Browse Files
- 1.本地测试 · 87e9ad73
  宋祥 authored Aug 21, 2024
  
  87e9ad73 Browse Files
- 1.管理员看所有数据，新增工序查询条件，组织机构支持修改 · bd6f3e10
  宋祥 authored Aug 21, 2024
  
  bd6f3e10 Browse Files
- 1.修复admin查询时userId错误问题 · 054afc56
  宋祥 authored Aug 21, 2024
  
  054afc56 Browse Files
- 2024-08-21 设备管理附件删除调整 · ce1327c2
  liuyang authored Aug 21, 2024
  
  ce1327c2 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 574425e0
  liuyang authored Aug 21, 2024
  
  574425e0 Browse Files
- 2024-08-21 文档库优化 · 688176f5
  liuyang authored Aug 21, 2024
  
  688176f5 Browse Files
- 1.附件一对多的形式 · 60422ff2
  宋祥 authored Aug 21, 2024
  
  60422ff2 Browse Files
- 1.生产任务根据名称进行过滤 · cd364bb0
  宋祥 authored Aug 21, 2024
  
  cd364bb0 Browse Files
- 2024-08-21 企业管理banner清单删除功能 · 48eac788
  liuyang authored Aug 21, 2024
  
  48eac788 Browse Files
20 Aug, 2024 10 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 96c8bb80
  liuyang authored Aug 20, 2024
  
  96c8bb80 Browse Files
- 2024-08-20 文档库 · 33727bbc
  liuyang authored Aug 20, 2024
  
  33727bbc Browse Files
- 1.仅查询自己所在的生产组的数据 · 70908f2b
  宋祥 authored Aug 20, 2024
  
  70908f2b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ac429dca
  江和松 authored Aug 20, 2024
  
  ac429dca Browse Files
- APP段上传附件代码修改 · defef165
  江和松 authored Aug 20, 2024
  
  defef165 Browse Files
- 1.仅查询自己所在的生产组 · 9ff2afda
  宋祥 authored Aug 20, 2024
  
  9ff2afda Browse Files
- Merge branch 'master' of http://git.pseer.com:8800/platform/hg-smart into dev · ce864f52
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
	src/main/resources/application.properties
	src/main/resources/quartz.properties
```
  宋祥 authored Aug 20, 2024
  ce864f52 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 9332d21d
```
# Conflicts:
#	src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
```
  宋祥 authored Aug 20, 2024
  9332d21d Browse Files
- 1.页面显示增加数量 · 43081f8e
  宋祥 authored Aug 20, 2024
  
  43081f8e Browse Files
- 1.仅查询所在组的数据 · 2d47037c
  宋祥 authored Aug 20, 2024
  
  2d47037c Browse Files
19 Aug, 2024 16 commits
- 2024-08-19 文档库 · ee49ba16
  liuyang authored Aug 19, 2024
  
  ee49ba16 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 04b11448
  liuyang authored Aug 19, 2024
  
  04b11448 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · eb572f0b
  宋祥 authored Aug 19, 2024
  
  eb572f0b Browse Files
- 1.预览和下载记录数+1 · 3cb143c8
  宋祥 authored Aug 19, 2024
  
  3cb143c8 Browse Files
- 采购合同详情、合同变更超链接逻辑修改 · 49cd4c97
  江和松 authored Aug 19, 2024
  
  49cd4c97 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 72a18a6d
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java
	src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
```
  liuyang authored Aug 19, 2024
  72a18a6d Browse Files
- 2024-08-19 文档库 · 0640485c
  liuyang authored Aug 19, 2024
  
  0640485c Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 03376375
  江和松 authored Aug 19, 2024
  
  03376375 Browse Files
- 采购计划生成合同的保存按钮不显示问题修改 · abdb456c
  江和松 authored Aug 19, 2024
  
  abdb456c Browse Files
- 1.预览和下载记录数+1 · b01e502c
  宋祥 authored Aug 19, 2024
  
  b01e502c Browse Files
- 1.记录倒序排列 · 53857b14
  宋祥 authored Aug 19, 2024
  
  53857b14 Browse Files
- 1.文件下载和预览 · bd7fb9e6
  宋祥 authored Aug 19, 2024
  
  bd7fb9e6 Browse Files
- 1.文件预览 · b414e454
  宋祥 authored Aug 19, 2024
  
  b414e454 Browse Files
- 1.meger 代码 · 5b79a625
  宋祥 authored Aug 19, 2024
  
  5b79a625 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · c7854021
```
# Conflicts:
#	src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG001.java
#	src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002.java
#	src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002B.java
```
  宋祥 authored Aug 19, 2024
  c7854021 Browse Files
- 1.北湖德诚文档库 · f2176c5c
  宋祥 authored Aug 19, 2024
  
  f2176c5c Browse Files