Commits · e5065dde68e72a77efddb64dde412ddd09a026b3 · platform / hg-smart · GitLab

29 May, 2024 4 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · e5065dde
```
# Conflicts:
#	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
```
  yukang authored May 29, 2024
  e5065dde Browse Files
- 收款单 · f01d48dc
  yukang authored May 29, 2024
  
  f01d48dc Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 36a51ac2
```
 Conflicts:
	src/main/resources/resources/ibatis/sqlmap-config.xml
```
  liuyang authored May 29, 2024
  36a51ac2 Browse Files
- 2024-05-29 销售出库单 · 0db191ff
  liuyang authored May 29, 2024
  
  0db191ff Browse Files
28 May, 2024 19 commits
- 项目立项bugfix; · c958f4d3
  wuwenlong authored May 28, 2024
  
  c958f4d3 Browse Files
- 项目立项bugfix; · 71b27644
  wuwenlong authored May 28, 2024
  
  71b27644 Browse Files
- 项目立项bugfix; · 22ac8838
  wuwenlong authored May 28, 2024
  
  22ac8838 Browse Files
- 项目立项bugfix · 50d9760f
  wuwenlong authored May 28, 2024
  
  50d9760f Browse Files
- 报工dev; · 949c2f7e
  wuwenlong authored May 28, 2024
  
  949c2f7e Browse Files
- 排产新增按重量计算工时；报工dev · 571a9ee9
  wuwenlong authored May 28, 2024
  
  571a9ee9 Browse Files
- 生产派工bugfix · 5a8c0799
  wuwenlong authored May 28, 2024
  
  5a8c0799 Browse Files
- 生产派工bugfix · a2721199
  wuwenlong authored May 28, 2024
  
  a2721199 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ef399452
  wuwenlong authored May 28, 2024
  
  ef399452 Browse Files
- 生产派工bugfix · 8b17c89c
  wuwenlong authored May 28, 2024
  
  8b17c89c Browse Files
- 其他入库单，其他出库单 · e7bbc605
  wancheng authored May 28, 2024
  
  e7bbc605 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 70cc4e2c
  wuwenlong authored May 28, 2024
  
  70cc4e2c Browse Files
- 生产计划重量计算 · 81b7829e
  wuwenlong authored May 28, 2024
  
  81b7829e Browse Files
- 生产任务日期逻辑调整2 · 4964e91c
  YG6494 authored May 28, 2024
  
  4964e91c Browse Files
- 優化調整 · 80f8ef06
  13420 authored May 28, 2024
  
  80f8ef06 Browse Files
- 结算单管理-增加收款付款剩余金额 · 6f61712b
  yukang authored May 28, 2024
  
  6f61712b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 864eb65a
  yukang authored May 28, 2024
  
  864eb65a Browse Files
- 结算单管理-增加收款付款剩余金额 · 46f30bf6
  yukang authored May 28, 2024
  
  46f30bf6 Browse Files
- 生产任务日期逻辑调整 · 357b8919
  YG6494 authored May 28, 2024
  
  357b8919 Browse Files
27 May, 2024 15 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 451053c1
  liuyang authored May 27, 2024
  
  451053c1 Browse Files
- 2024-05-27 修复设备管理因用户层级无法查询所属公司问题修复 · ff6dabc3
  liuyang authored May 27, 2024
  
  ff6dabc3 Browse Files
- 2024-05-27 修复工序设置、工艺流程、工序单价用户所属公司属于工厂导致无法查询问题 · b3636202
  liuyang authored May 27, 2024
  
  b3636202 Browse Files
- 1.生产入库单的生成数据接口 · 45b56188
  江和松 authored May 27, 2024
  
  45b56188 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · e7fbac6b
  liuyang authored May 27, 2024
  
  e7fbac6b Browse Files
- 销售开票更改文件名 · 1eabfc30
  13420 authored May 27, 2024
  
  1eabfc30 Browse Files
- 2024-05-27 · d5ffacd8
```
1、更改设备计划重复添加提示
2、维保申请附件删除逻辑调整
3、设备点检详情点检附件多条上传
4、设备保养详情保养附件多条上传
```
  liuyang authored May 27, 2024
  d5ffacd8 Browse Files
- 1.重量计算处理 · 28459713
  江和松 authored May 27, 2024
  
  28459713 Browse Files
- 结算单管理-条件过滤优化 · cf7adc10
  yukang authored May 27, 2024
  
  cf7adc10 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · c49692c2
  yukang authored May 27, 2024
  
  c49692c2 Browse Files
- 優化調整 · d8883c9d
  13420 authored May 27, 2024
  
  d8883c9d Browse Files
- 销售开票，收款单部分代码 · 927adddc
  13420 authored May 27, 2024
  
  927adddc Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · 74500db0
  yukang authored May 27, 2024
  
  74500db0 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 2925a238
  liuyang authored May 27, 2024
  
  2925a238 Browse Files
- 2024-05-24 · f03db3cf
```
1、设备保养逻辑调整
```
  liuyang authored May 27, 2024
  f03db3cf Browse Files
25 May, 2024 2 commits
- 1.附件必须选择，如果未选择就不展示上传 · f2035183
  江和松 authored May 25, 2024
  
  f2035183 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 6198d2bf
  liuyang authored May 25, 2024
  
  6198d2bf Browse Files