Commits · 83c1b227ecec08ca874ebd54f48eb7525bf7a036 · platform / hp-smart · GitLab

26 Feb, 2024 15 commits
- SC日志注解更新 · 83c1b227
  wancheng authored Feb 26, 2024
  
  83c1b227 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e56e514c
  wancheng authored Feb 26, 2024
  
  e56e514c Browse Files
- KC日志注解更新 · e80f9027
  wancheng authored Feb 26, 2024
  
  e80f9027 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · b4ed0c4c
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005B.java
```
  宋祥 authored Feb 26, 2024
  b4ed0c4c Browse Files
- 1.生产任务页面优化 · c9362783
  宋祥 authored Feb 26, 2024
  
  c9362783 Browse Files
- 日志查询js更新 · e0999391
  wancheng authored Feb 26, 2024
  
  e0999391 Browse Files
- BI日志注解更新 · df9e7a63
  wancheng authored Feb 26, 2024
  
  df9e7a63 Browse Files
- BI日志注解更新 · 120e3436
  wancheng authored Feb 26, 2024
  
  120e3436 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 5ec59085
  wancheng authored Feb 26, 2024
  
  5ec59085 Browse Files
- RZ日志注解更新 · 935d7ccc
  wancheng authored Feb 26, 2024
  
  935d7ccc Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 908e7a07
  liulei authored Feb 26, 2024
  
  908e7a07 Browse Files
- 生产计划列表不展示项目号，计划单号放在首列，查询条件去除项目号 · 347f51c1
  liulei authored Feb 26, 2024
  
  347f51c1 Browse Files
- RZ日志注解更新 · 0d3fa2fb
  wancheng authored Feb 26, 2024
  
  0d3fa2fb Browse Files
- PZ日志注解更新 · db940891
  wancheng authored Feb 26, 2024
  
  db940891 Browse Files
- KC日志注解更新 · 4a1bb7d1
  wancheng authored Feb 26, 2024
  
  4a1bb7d1 Browse Files
23 Feb, 2024 12 commits
- ZL日志注解 · 718d84a9
  wancheng authored Feb 23, 2024
  
  718d84a9 Browse Files
- SC日志注解 · 93628cea
  wancheng authored Feb 23, 2024
  
  93628cea Browse Files
- 配置日志注解 · e2172dd1
  wancheng authored Feb 23, 2024
  
  e2172dd1 Browse Files
- 库存日志注解 · 96c99a74
  wancheng authored Feb 23, 2024
  
  96c99a74 Browse Files
- 日志查询 · 0b77910d
  wancheng authored Feb 23, 2024
  
  0b77910d Browse Files
- 1.生产库存收发存统计 · 3891d88f
  宋祥 authored Feb 23, 2024
  
  3891d88f Browse Files
- 1.优化：录入单据日期的页面默认都显示当天 · 2bf7b156
  宋祥 authored Feb 23, 2024
  
  2bf7b156 Browse Files
- 1.优化：生产计划模块所有列表操作移动到第一列 · be79c99f
  宋祥 authored Feb 23, 2024
  
  be79c99f Browse Files
- 生产订单任务详情 · 17dc06ec
  liulei authored Feb 23, 2024
  
  17dc06ec Browse Files
- 报屏获取公司代码优化 · c4ca7466
  wancheng authored Feb 23, 2024
  
  c4ca7466 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · caaee74d
  宋祥 authored Feb 23, 2024
  
  caaee74d Browse Files
- 1.fixBug:物料清单，生产计划表部门字段错误问题修正 · c07ed071
  宋祥 authored Feb 23, 2024
  
  c07ed071 Browse Files
22 Feb, 2024 9 commits
- 生产日报页面优化 · 661921db
  wancheng authored Feb 22, 2024
  
  661921db Browse Files
- 1.fixBug:生产任务查询无数据问题修复 · 4eada0c5
  宋祥 authored Feb 22, 2024
  
  4eada0c5 Browse Files
- 1.fixBug:修复生产计划页面查询参数不生效问题 · 482118fc
  宋祥 authored Feb 22, 2024
  
  482118fc Browse Files
- 1.修复日期查询条件的BUG · c308a9ea
  宋祥 authored Feb 22, 2024
  
  c308a9ea Browse Files
- 1.合并代码 · c3d993e8
  宋祥 authored Feb 22, 2024
  
  c3d993e8 Browse Files
- Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev · f8421a9d
```
 Conflicts:
	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java
	src/main/webapp/HP/SC/HPSC003.js
	src/main/webapp/HP/SC/HPSC003.jsp
	src/main/webapp/HP/SC/HPSC005.jsp
```
  宋祥 authored Feb 22, 2024
  f8421a9d Browse Files
- 1.fixBug:物料清单已派工时不能删除 · 69bea29a
```
2.新增物料计划提交不生效问题修复
```
  宋祥 authored Feb 22, 2024
  69bea29a Browse Files
- 操作日志； · 17666132
  wuwenlong authored Feb 22, 2024
  
  17666132 Browse Files
- 生产计划、生产订单 · 8fef1e5d
  liulei authored Feb 22, 2024
  
  8fef1e5d Browse Files
21 Feb, 2024 4 commits
- Revert "20240220问题" · 11ffad45
  liulei authored Feb 21, 2024
  
  11ffad45 Browse Files
- 20240220问题 · 0b0689ad
  liulei authored Feb 21, 2024
  
  0b0689ad Browse Files
- 报屏页面优化 · 849ca138
  wancheng authored Feb 21, 2024
  
  849ca138 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 8af6de4c
  宋祥 authored Feb 21, 2024
  
  8af6de4c Browse Files