Commits · 03c9ec8b7d13c8d928f2963c1725c9b22614e320 · platform / hg-smart · GitLab

23 Aug, 2024 7 commits
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart · 03c9ec8b
  宋祥 authored Aug 23, 2024
  
  03c9ec8b Browse Files
- 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
- 1.fixBug:预览记录显示错误问题修复 · 03d12f35
  宋祥 authored Aug 23, 2024
  
  03d12f35 Browse Files
22 Aug, 2024 20 commits
- 收货明细中增加计算方式下拉框 · bd812f19
  江和松 authored Aug 22, 2024
  
  bd812f19 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart · 75008b5a
  宋祥 authored Aug 22, 2024
  
  75008b5a Browse Files
- 1.修复查询用户厂区和公司BUG · 42bd5ace
  宋祥 authored Aug 22, 2024
  
  42bd5ace Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart · 3e2be62d
  宋祥 authored Aug 22, 2024
  
  3e2be62d Browse Files
- 1.生产任务和生产报工增加按厂区和公司过滤 · e1bb9ffa
  宋祥 authored Aug 22, 2024
  
  e1bb9ffa Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart · 8f5e564b
```
 Conflicts:
	src/main/resources/application.properties
```
  宋祥 authored Aug 22, 2024
  8f5e564b Browse Files
- 1.项目修改时间填充 · 56725d6e
  宋祥 authored Aug 22, 2024
  
  56725d6e Browse Files
- 1.修改配置信息 · 3dbb7035
  宋祥 authored Aug 22, 2024
  
  3dbb7035 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · 50765dfc
```
 Conflicts:
	src/main/resources/application.properties
	src/main/resources/quartz.properties
```
  宋祥 authored Aug 22, 2024
  50765dfc Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into dev-sx · 8bd8592c
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sj/service/ServiceHGSJ001.java
```
  宋祥 authored Aug 22, 2024
  8bd8592c Browse Files
- 1.fixBug: 空格字符串判断 · 26ca7c10
  宋祥 authored Aug 22, 2024
  
  26ca7c10 Browse Files
- 1.增加项目管理页面 · 4346e24e
  宋祥 authored Aug 22, 2024
  
  4346e24e Browse Files
- 1.增加工序下拉框 · 9260453c
  宋祥 authored Aug 22, 2024
  
  9260453c Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 1e3904d7
  宋祥 authored Aug 22, 2024
  
  1e3904d7 Browse Files
- 1.数据库连接 · acb676dc
  宋祥 authored Aug 22, 2024
  
  acb676dc Browse Files
- 1.还原数据库连接 · 7c8c4b97
  宋祥 authored Aug 22, 2024
  
  7c8c4b97 Browse Files
- 1.还原数据库连接 · 15684f77
  宋祥 authored Aug 22, 2024
  
  15684f77 Browse Files
- 1.修复BUG · 676e41ed
  宋祥 authored Aug 22, 2024
  
  676e41ed Browse Files
- 1.合并dev代码 · 882f75d6
  宋祥 authored Aug 22, 2024
  
  882f75d6 Browse Files
- 1.合并dev代码 · e9cdf7ea
  宋祥 authored Aug 22, 2024
  
  e9cdf7ea Browse Files
21 Aug, 2024 13 commits
- 1.合并dev代码 · bb3526f4
  宋祥 authored Aug 21, 2024
  
  bb3526f4 Browse Files
- 1.数据库连接 · 40c59e1a
  宋祥 authored Aug 21, 2024
  
  40c59e1a Browse Files
- 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