Commits · 5c145c432d6b0fda824de67b657f7e622b13f194 · platform / hp-smart · GitLab

25 Jan, 2024 36 commits
- Merge remote-tracking branch 'origin/dev' into dev · 5c145c43
  宋祥 authored Jan 25, 2024
  
  5c145c43 Browse Files
- 1.关闭附件上传弹窗时，不新增空文件 · abbc4c96
  宋祥 authored Jan 25, 2024
  
  abbc4c96 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e31eeea2
  yukang authored Jan 25, 2024
  
  e31eeea2 Browse Files
- 生产计划、生产订单附件查看 · 5570f0bb
  yukang authored Jan 25, 2024
  
  5570f0bb Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a1779c19
  宋祥 authored Jan 25, 2024
  
  a1779c19 Browse Files
- 1.用户组调整为角色 · 2ec31d71
  宋祥 authored Jan 25, 2024
  
  2ec31d71 Browse Files
- 采购订单； · 7b3c2f4f
  wuwenlong authored Jan 25, 2024
  
  7b3c2f4f Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · c4082276
  宋祥 authored Jan 25, 2024
  
  c4082276 Browse Files
- 1.统计人名称和时间 · f2c10680
  宋祥 authored Jan 25, 2024
  
  f2c10680 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f757f9e5
  yukang authored Jan 25, 2024
  
  f757f9e5 Browse Files
- 1.可查询删除的数据 · bb664e92
  宋祥 authored Jan 25, 2024
  
  bb664e92 Browse Files
- 相关BUG修改优化 · 4a41c971
  yukang authored Jan 25, 2024
  
  4a41c971 Browse Files
- 1.优化上传附件弹窗和回调操作 · 57f9617d
  宋祥 authored Jan 25, 2024
  
  57f9617d Browse Files
- 1.定时备份数据库BUG修复 · f96ceae4
  宋祥 authored Jan 25, 2024
  
  f96ceae4 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d1edf618
  yukang authored Jan 25, 2024
  
  d1edf618 Browse Files
- 1.上传时间字段错误修复 · ceab032e
  宋祥 authored Jan 25, 2024
  
  ceab032e Browse Files
- 生产入库单 HPKC003 / 附件查看公共代码 · f9207f51
  yukang authored Jan 25, 2024
  
  f9207f51 Browse Files
- 1.上传文件ID为空时直接返回 · 4899c891
  宋祥 authored Jan 25, 2024
  
  4899c891 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ef7b3d4e
  宋祥 authored Jan 25, 2024
  
  ef7b3d4e Browse Files
- 1.库存收发存汇总 · 67647045
```
2.库存备份
```
  宋祥 authored Jan 25, 2024
  67647045 Browse Files
- 实体类命名规范 · 4944c97d
  yukang authored Jan 25, 2024
  
  4944c97d Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 71d94636
```
# Conflicts:
#	src/main/webapp/HP/SC/HPSC002.js
```
  yukang authored Jan 25, 2024
  71d94636 Browse Files
- 相关BUG修改优化 · b8049e85
```
销售管理  HPSC001
项目档案  HPSC011
物料清单  HPSC002
生产计划  HPSC003
```
  yukang authored Jan 25, 2024
  b8049e85 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f0cd30e1
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java
#	src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java
```
  宋祥 authored Jan 25, 2024
  f0cd30e1 Browse Files
- 1.物料清单多附件管理 · 9fe1ab9f
  宋祥 authored Jan 25, 2024
  
  9fe1ab9f Browse Files
- 采购订单； · 47f061eb
  wuwenlong authored Jan 25, 2024
  
  47f061eb Browse Files
- 采购订单； · 80620a6b
  wuwenlong authored Jan 25, 2024
  
  80620a6b Browse Files
- 1.采购入库实体类和XML · 55d67351
  宋祥 authored Jan 25, 2024
  
  55d67351 Browse Files
- 1.采购入库实体类和XML · f2d28b86
  宋祥 authored Jan 25, 2024
  
  f2d28b86 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 5364f889
  宋祥 authored Jan 25, 2024
  
  5364f889 Browse Files
- 1.也去模块查询语句增加企业编码参数 · e692e838
  宋祥 authored Jan 25, 2024
  
  e692e838 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 97f2ec05
  yukang authored Jan 25, 2024
  
  97f2ec05 Browse Files
- 项目名称模糊查询 · 859334fa
  yukang authored Jan 25, 2024
  
  859334fa Browse Files
- 1.去除查询时的企业编码设置， · 3ab3d937
  宋祥 authored Jan 25, 2024
  
  3ab3d937 Browse Files
- Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev · a6a95e25
```
 Conflicts:
	src/main/webapp/HP/KC/HPKC005.jsp
```
  宋祥 authored Jan 25, 2024
  a6a95e25 Browse Files
- 1.库存收发存字段调整 · 04dcf5ec
  宋祥 authored Jan 25, 2024
  
  04dcf5ec Browse Files
24 Jan, 2024 4 commits
- 1.库存模块仓库档案根据存货类型联动 · 6d0d0eaa
  wasx8023 authored Jan 24, 2024
  
  6d0d0eaa Browse Files
- 查询按钮统一优化 · d148b68e
  wuwenlong authored Jan 24, 2024
  
  d148b68e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1d14d371
```
# Conflicts:
#	src/main/webapp/HP/SC/HPSC011.jsp
```
  wuwenlong authored Jan 24, 2024
  1d14d371 Browse Files
- 库存管理opt · 1b40a0c1
  wuwenlong authored Jan 24, 2024
  
  1b40a0c1 Browse Files