Commits · e92ae76f5cb3928c8fa9d94f90add64b1fe4e39e · platform / hg-smart · GitLab

21 May, 2024 16 commits
- Merge remote-tracking branch 'origin/dev' into dev · e92ae76f
  wuwenlong authored May 21, 2024
  
  e92ae76f Browse Files
- 生产订单详情DEV · 93722f45
  wuwenlong authored May 21, 2024
  
  93722f45 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 9254f200
  江和松 authored May 21, 2024
  
  9254f200 Browse Files
- 物料清单附件详情功能修改 · 03041e56
  江和松 authored May 21, 2024
  
  03041e56 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 96615de4
  liuyang authored May 21, 2024
  
  96615de4 Browse Files
- 2024-05-20 设备监控 · 4044c143
  liuyang authored May 21, 2024
  
  4044c143 Browse Files
- 生产订单dev · c1d997c4
  wuwenlong authored May 21, 2024
  
  c1d997c4 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 35b67767
  wuwenlong authored May 21, 2024
  
  35b67767 Browse Files
- 生产订单dev · 17737bc4
  wuwenlong authored May 21, 2024
  
  17737bc4 Browse Files
- 物料清单明细页面删除、修改，关联生产计划单bug修改 · afb96ac9
  江和松 authored May 21, 2024
  
  afb96ac9 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3125b7e4
  yukang authored May 21, 2024
  
  3125b7e4 Browse Files
- 签证单管理 · 82e42e9e
  yukang authored May 21, 2024
  
  82e42e9e Browse Files
- 生产计划排产 · e5e8cbd4
  wuwenlong authored May 21, 2024
  
  e5e8cbd4 Browse Files
- 2024-05-20 计算类型枚举 · 37e3a63a
  liuyang authored May 21, 2024
  
  37e3a63a Browse Files
- 生产计划排产 · 93b2d3e8
  wuwenlong authored May 21, 2024
  
  93b2d3e8 Browse Files
- 签证单管理 · d0289a14
  13420 authored May 21, 2024
  
  d0289a14 Browse Files
20 May, 2024 24 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 9805cadd
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
```
  liuyang authored May 20, 2024
  9805cadd Browse Files
- 2024-05-20 优化工序设置添加计算类型 · 366ef3cd
  liuyang authored May 20, 2024
  
  366ef3cd Browse Files
- 物料清单明细页面删除、修改，关联生产计划单 · 7f3438bb
  江和松 authored May 20, 2024
  
  7f3438bb Browse Files
- 物料清单明细页面操作处理、提交处理，生成生产计划等操作 · 1269c0e9
  江和松 authored May 20, 2024
  
  1269c0e9 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · 2954f6b8
  yukang authored May 20, 2024
  
  2954f6b8 Browse Files
- 合同管理 · 12f0def9
  yukang authored May 20, 2024
  
  12f0def9 Browse Files
- 生产计划排产 · 47ffc452
  wuwenlong authored May 20, 2024
  
  47ffc452 Browse Files
- 生产计划排产 · 03d02cd4
  wuwenlong authored May 20, 2024
  
  03d02cd4 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 7a186899
  wuwenlong authored May 20, 2024
  
  7a186899 Browse Files
- 生产计划排产 · aa8d63dd
  wuwenlong authored May 20, 2024
  
  aa8d63dd Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 6c624d22
  yukang authored May 20, 2024
  
  6c624d22 Browse Files
- 合同管理 · 3e13ed28
  yukang authored May 20, 2024
  
  3e13ed28 Browse Files
- 2024-05-20 优化设备预警 · 45307280
  liuyang authored May 20, 2024
  
  45307280 Browse Files
- 2024-05-20 优化库存档案 · ce891bcb
  liuyang authored May 20, 2024
  
  ce891bcb Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 957363dd
  liuyang authored May 20, 2024
  
  957363dd Browse Files
- 2024-05-20 优化库存档案 · 8d88e3de
  liuyang authored May 20, 2024
  
  8d88e3de Browse Files
- 合同管理 · 94eb1b65
  yukang authored May 20, 2024
  
  94eb1b65 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · 34e3e974
```
# Conflicts:
#	src/main/java/com/baosight/hggp/common/DdynamicEnum.java
```
  yukang authored May 20, 2024
  34e3e974 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · e2a30dfe
  liuyang authored May 20, 2024
  
  e2a30dfe Browse Files
- 2024-05-20 优化工艺流程详情 · 9c3bc30e
  liuyang authored May 20, 2024
  
  9c3bc30e Browse Files
- 生产计划dev; · 510c8c5a
  wuwenlong authored May 20, 2024
  
  510c8c5a Browse Files
- 产品类型枚举 · 8601809c
  wuwenlong authored May 20, 2024
  
  8601809c Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · ce17bdb0
  liuyang authored May 20, 2024
  
  ce17bdb0 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e32cfb58
  wuwenlong authored May 20, 2024
  
  e32cfb58 Browse Files