Commits · 848ac32ed3fb1d05a569a54eed724c4d185075c4 · platform / hp-smart · GitLab

20 Nov, 2024 5 commits
- Merge remote-tracking branch 'origin/dev' into dev · 848ac32e
  zhangzhen authored Nov 20, 2024
  
  848ac32e Browse Files
- 界面展示优化 · 64f8b736
  zhangzhen authored Nov 20, 2024
  
  64f8b736 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev · a02491b7
  宋祥 authored Nov 20, 2024
  
  a02491b7 Browse Files
- 1.入库质检按质检日期倒序 · 65db7c11
  宋祥 authored Nov 20, 2024
  
  65db7c11 Browse Files
- 界面展示优化 · f83f8b3c
  zhangzhen authored Nov 20, 2024
  
  f83f8b3c Browse Files
19 Nov, 2024 8 commits
- 1.修复生产计划没有单重问题 · 8a208d1e
  liuyang authored Nov 19, 2024
  
  8a208d1e Browse Files
- 1.修复生产计划没有单重问题 · 323abbb2
  liuyang authored Nov 19, 2024
  
  323abbb2 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · a054f5b9
  liuyang authored Nov 19, 2024
  
  a054f5b9 Browse Files
- 1.销售合同添加金额计算 · 9542fb70
```
2.修复物料清单生成模板功能bug
3.修改采购计划，采购申请，采购订单据逻辑
```
  liuyang authored Nov 19, 2024
  9542fb70 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1e8f8ce7
  宋祥 authored Nov 19, 2024
  
  1e8f8ce7 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev · 0b0b26c3
  宋祥 authored Nov 19, 2024
  
  0b0b26c3 Browse Files
- 1.库存收发存，日期字段名称错误问题 · 6524d461
  宋祥 authored Nov 19, 2024
  
  6524d461 Browse Files
- 鸿鹏抛帐管理代码提交 · dbaedf35
  江和松 authored Nov 19, 2024
  
  dbaedf35 Browse Files
18 Nov, 2024 6 commits
- 1.销售合同添加金额计算 · 435eb41c
```
2.修复物料清单生成模板功能bug
3.修改采购计划，采购申请，采购订单据逻辑
```
  liuyang authored Nov 19, 2024
  435eb41c Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · a1d133e7
  liuyang authored Nov 18, 2024
  
  a1d133e7 Browse Files
- 生产计划添加排产功能 · 94397c7b
  liuyang authored Nov 18, 2024
  
  94397c7b Browse Files
- 设备驾驶舱页面显示 · ac45f1a3
  liuyang authored Nov 18, 2024
  
  ac45f1a3 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev · b98976d3
  宋祥 authored Nov 18, 2024
  
  b98976d3 Browse Files
- 1.还原跳转路径前缀 · 3e95dffa
  宋祥 authored Nov 18, 2024
  
  3e95dffa Browse Files
17 Nov, 2024 4 commits
- 设备驾驶舱接口调整 · b61f6cb6
  liuyang authored Nov 17, 2024
  
  b61f6cb6 Browse Files
- 工序质检单 · 48db1503
  liuyang authored Nov 17, 2024
  
  48db1503 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · 3fb1220f
```
 Conflicts:
	src/main/java/com/baosight/hpjx/hp/zl/tools/HPZLTools.java
```
  liuyang authored Nov 17, 2024
  3fb1220f Browse Files
- 工序质检单 · 40914985
  liuyang authored Nov 17, 2024
  
  40914985 Browse Files
16 Nov, 2024 3 commits
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev · bb4ce4f6
  宋祥 authored Nov 16, 2024
  
  bb4ce4f6 Browse Files
- 1.入库质检单功能 · f915bb66
  宋祥 authored Nov 16, 2024
  
  f915bb66 Browse Files
- 优化鸿鹏生产驾驶舱页面显示和接口 · c1f1566f
  liuyang authored Nov 16, 2024
  
  c1f1566f Browse Files
14 Nov, 2024 4 commits
- 修复设备选择日期保存bug · f005940c
  liuyang authored Nov 14, 2024
  
  f005940c Browse Files
- 1.调整企业管理界面布局 · 848d08d2
  宋祥 authored Nov 14, 2024
  
  848d08d2 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev · 5807c29f
  宋祥 authored Nov 14, 2024
  
  5807c29f Browse Files
- 1.增加ADMIN虚拟企业处理 · a3eb91e5
  宋祥 authored Nov 14, 2024
  
  a3eb91e5 Browse Files
13 Nov, 2024 4 commits
- 添加条件过滤 · a0b0212e
  liuyang authored Nov 13, 2024
  
  a0b0212e Browse Files
- 调整同步日志逻辑 · 1584d1b3
  liuyang authored Nov 13, 2024
  
  1584d1b3 Browse Files
- 调整同步日志逻辑 · f8a9cedc
  liuyang authored Nov 13, 2024
  
  f8a9cedc Browse Files
- 调整同步日志逻辑 · 2fc6c608
  liuyang authored Nov 13, 2024
  
  2fc6c608 Browse Files
12 Nov, 2024 3 commits
- 增加导出功能、列表所有字段增加排序功能、筛选条件与列表字段同步 · 9aea2f1b
  liuyang authored Nov 12, 2024
  
  9aea2f1b Browse Files
- 增加导出功能、列表所有字段增加排序功能、筛选条件与列表字段同步 · 0f520ea4
  liuyang authored Nov 12, 2024
  
  0f520ea4 Browse Files
- 增加导出功能、列表所有字段增加排序功能、筛选条件与列表字段同步 · 5e718e12
  liuyang authored Nov 12, 2024
  
  5e718e12 Browse Files
11 Nov, 2024 3 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · be74b706
```
 Conflicts:
	src/main/webapp/HP/SC/HPSC001.jsp
	src/main/webapp/HP/SC/HPSC011.jsp
```
  liuyang authored Nov 11, 2024
  be74b706 Browse Files
- 增加导出功能、列表所有字段增加排序功能、筛选条件与列表字段同步 · 62e91eca
  liuyang authored Nov 11, 2024
  
  62e91eca Browse Files
- 1.修改模版文件 · d746a1da
  宋祥 authored Nov 11, 2024
  
  d746a1da Browse Files