Commits · master · platform / hg-smart · GitLab

21 Nov, 2024 4 commits
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · e913ded6
  宋祥 authored Nov 21, 2024
  
  e913ded6 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 6d4d3df6
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/fw/sql/HGFW001.xml
	src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC006.java
	src/main/java/com/baosight/hggp/hg/zl/sql/HGZL003.xml
```
  liuyang authored Nov 21, 2024
  6d4d3df6 Browse Files
- 修复排序问题和其他入库提交问题 · dee1f2ae
  liuyang authored Nov 21, 2024
  
  dee1f2ae Browse Files
- 1.汉光反馈问题修复：售后服务、日常巡检单日期正序排；其他入库提交无效问题；调拨单确认失败；库存盘点提交失败 · 05d658c5
  宋祥 authored Nov 21, 2024
  
  05d658c5 Browse Files
20 Nov, 2024 3 commits
- 设备驾驶舱查询设备状态逻辑调整 · 647dec31
  liuyang authored Nov 20, 2024
  
  647dec31 Browse Files
- 修复物料清单来源类型默认为加工，设备日志添加新增接口 · 00b26146
  liuyang authored Nov 20, 2024
  
  00b26146 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · 673cbc8d
  宋祥 authored Nov 20, 2024
  
  673cbc8d Browse Files
19 Nov, 2024 31 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · cac4cbc1
  liuyang authored Nov 19, 2024
  
  cac4cbc1 Browse Files
- 修改备件文件颜色变化，新增目录默认给当前用户添加权限 · f56fb530
  liuyang authored Nov 19, 2024
  
  f56fb530 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · 03e14556
  宋祥 authored Nov 19, 2024
  
  03e14556 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 137b0824
  宋祥 authored Nov 19, 2024
  
  137b0824 Browse Files
- 1.库存盘点不校验实物数量 · b62c5776
  宋祥 authored Nov 19, 2024
  
  b62c5776 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 0ce07397
  宋祥 authored Nov 19, 2024
  
  0ce07397 Browse Files
- 1.固定文档库表格高度 · 6f7a8f05
  宋祥 authored Nov 19, 2024
  
  6f7a8f05 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · 674b9381
  宋祥 authored Nov 19, 2024
  
  674b9381 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · fa9173ee
  宋祥 authored Nov 19, 2024
  
  fa9173ee Browse Files
- 1.日期不显示问题修复 · 3ba3947b
  宋祥 authored Nov 19, 2024
  
  3ba3947b Browse Files
- 驾驶舱细节优化 · 3e9263f6
  zhangzhen authored Nov 19, 2024
  
  3e9263f6 Browse Files
- 调整销售执行情况排序 · fff5e67b
  liuyang authored Nov 19, 2024
  
  fff5e67b Browse Files
- 调整设备驾驶舱显示设备逻辑 · 6d87e6c7
  liuyang authored Nov 19, 2024
  
  6d87e6c7 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1d9778cd
  宋祥 authored Nov 19, 2024
  
  1d9778cd Browse Files
- 1.代码字段写错了 · 411ddeb5
  宋祥 authored Nov 19, 2024
  
  411ddeb5 Browse Files
- 驾驶舱细节优化 · de014bef
  zhangzhen authored Nov 19, 2024
  
  de014bef Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart · a58484da
  宋祥 authored Nov 19, 2024
  
  a58484da Browse Files
- 调整驾驶舱设备时长显示 · f744b188
  liuyang authored Nov 19, 2024
  
  f744b188 Browse Files
- 驾驶舱细节优化 · aae00522
  zhangzhen authored Nov 19, 2024
  
  aae00522 Browse Files
- 1.还原正式环境数据库信息 · 289851c9
  宋祥 authored Nov 19, 2024
  
  289851c9 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 798b1a29
  liuyang authored Nov 19, 2024
  
  798b1a29 Browse Files
- 调整驾驶舱工厂选择 · 257cf447
  liuyang authored Nov 19, 2024
  
  257cf447 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 0032ef6d
  宋祥 authored Nov 19, 2024
  
  0032ef6d Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 1c28407a
  宋祥 authored Nov 19, 2024
  
  1c28407a Browse Files
- 1.fixBug：修复日常巡检单保存数据丢失问题 · f912d671
  宋祥 authored Nov 19, 2024
  
  f912d671 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f788d171
  江和松 authored Nov 19, 2024
  
  f788d171 Browse Files
- 抛帐管理数据源修改 · 21f87c85
  江和松 authored Nov 19, 2024
  
  21f87c85 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · b29eb67c
  宋祥 authored Nov 19, 2024
  
  b29eb67c Browse Files
- 1.库存盘点去掉公司限制 · ade0b15e
  宋祥 authored Nov 19, 2024
  
  ade0b15e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d96cfe11
  宋祥 authored Nov 19, 2024
  
  d96cfe11 Browse Files
- 1.fixBug：修复日常巡检单保存数据丢失问题 · cd31faac
  宋祥 authored Nov 19, 2024
  
  cd31faac Browse Files
18 Nov, 2024 2 commits
- 驾驶舱细节优化 · 2d000bb4
  zhangzhen authored Nov 18, 2024
  
  2d000bb4 Browse Files
- 1.日期格式化 · fa33466c
  宋祥 authored Nov 18, 2024
  
  fa33466c Browse Files