Commits · b22eefd2d709f635c896ff180600b3fc138bb518 · platform / hg-smart · GitLab

17 May, 2024 6 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · b22eefd2
```
# Conflicts:
#	src/main/java/com/baosight/hggp/common/DdynamicEnum.java
#	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
#	src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java
#	src/main/resources/resources/ibatis/sqlmap-config.xml
```
  yukang authored May 17, 2024
  b22eefd2 Browse Files
- 合同管理 · c13e830a
  yukang authored May 17, 2024
  
  c13e830a Browse Files
- 生成生产计划dev; · 1aff9cbe
  wuwenlong authored May 17, 2024
  
  1aff9cbe Browse Files
- 生成生产计划dev; · 23e40119
  wuwenlong authored May 17, 2024
  
  23e40119 Browse Files
- 2024-05-17 存货档案功能优化 · cb38f304
  liuyang authored May 17, 2024
  
  cb38f304 Browse Files
- 2024-05-17 存货预警查询 · 222b3360
  liuyang authored May 17, 2024
  
  222b3360 Browse Files
16 May, 2024 11 commits
- 生产计划dev; · bba4eb9a
  wuwenlong authored May 16, 2024
  
  bba4eb9a Browse Files
- 生产计划dev; · 658fd30d
  wuwenlong authored May 16, 2024
  
  658fd30d Browse Files
- 生产计划dev; · aed10bc9
  wuwenlong authored May 16, 2024
  
  aed10bc9 Browse Files
- 生产计划dev; · ea910f49
  wuwenlong authored May 16, 2024
  
  ea910f49 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 6b8c6fb9
  wuwenlong authored May 16, 2024
  
  6b8c6fb9 Browse Files
- 生产计划dev; · 5c7f4446
  wuwenlong authored May 16, 2024
  
  5c7f4446 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a568a105
  liuyang authored May 16, 2024
  
  a568a105 Browse Files
- 2024-05-16 存货档案添加导入和流程关联 · 09e9280c
  liuyang authored May 16, 2024
  
  09e9280c Browse Files
- 2024-05-16 存货档案添加导入和流程关联 · 6e56a112
  liuyang authored May 16, 2024
  
  6e56a112 Browse Files
- 合同管理 · 6c8f42bf
  yukang authored May 16, 2024
  
  6c8f42bf Browse Files
- 1.入库质量异议单 · 5f6cc8b7
  宋祥 authored May 16, 2024
  
  5f6cc8b7 Browse Files
15 May, 2024 9 commits
- 2024-05-15 工序单价 · aebb67c0
  liuyang authored May 15, 2024
  
  aebb67c0 Browse Files
- 蓝图清单功能提交 · c24c5700
  江和松 authored May 15, 2024
  
  c24c5700 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 13a6d086
  liuyang authored May 15, 2024
  
  13a6d086 Browse Files
- 2024-05-15 设备预警 · f600ccf3
  liuyang authored May 15, 2024
  
  f600ccf3 Browse Files
- 1.质量 · ef56de18
  宋祥 authored May 15, 2024
  
  ef56de18 Browse Files
- 1.质量巡检单 · fa7f83d3
  宋祥 authored May 15, 2024
  
  fa7f83d3 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · b1447e8f
```
# Conflicts:
#	src/main/java/com/baosight/hggp/common/DdynamicEnum.java
#	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml
```
  yukang authored May 15, 2024
  b1447e8f Browse Files
- 合同管理 · cf39224a
  yukang authored May 15, 2024
  
  cf39224a Browse Files
- 2024-05-15 设备台账详情优化 · 5cb88b85
  liuyang authored May 15, 2024
  
  5cb88b85 Browse Files
14 May, 2024 11 commits
- 2024-05-14 设备台账详情 · 01b933a4
  liuyang authored May 14, 2024
  
  01b933a4 Browse Files
- 2024-05-14 设备台账详情 · ffe45f56
  liuyang authored May 14, 2024
  
  ffe45f56 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 7e92ce00
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC002.xml
```
  liuyang authored May 14, 2024
  7e92ce00 Browse Files
- 2024-05-14 设备台账详情 · 321ac87f
  liuyang authored May 14, 2024
  
  321ac87f Browse Files
- 1.生产领料 · b8c068e8
  宋祥 authored May 14, 2024
  
  b8c068e8 Browse Files
- 项目人员-附件详情dev； · 5dd83e45
  wuwenlong authored May 14, 2024
  
  5dd83e45 Browse Files
- 项目人员-附件详情dev； · c880522f
  wuwenlong authored May 14, 2024
  
  c880522f Browse Files
- 1.语法错误修正 · 7ad122db
  宋祥 authored May 14, 2024
  
  7ad122db Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a818f806
  liuyang authored May 14, 2024
  
  a818f806 Browse Files
- 2024-05-14 库存 · d3aa2e40
  liuyang authored May 14, 2024
  
  d3aa2e40 Browse Files
- 配置管理更新 · a7cb6df0
  wancheng authored May 14, 2024
  
  a7cb6df0 Browse Files
13 May, 2024 3 commits
- 项目人员dev； · 49f5f711
  wuwenlong authored May 13, 2024
  
  49f5f711 Browse Files
- 项目人员dev； · 601ea124
  wuwenlong authored May 13, 2024
  
  601ea124 Browse Files
- 项目人员dev； · 9fe21d84
  wuwenlong authored May 13, 2024
  
  9fe21d84 Browse Files