Commits · 67610206f1d334a0a5d58caf957e2b0016fb41fd · 竹天卫 / tianjin-cement

20 Nov, 2020 5 commits
- Merge remote-tracking branch 'origin/master' · 67610206
  qinhu authored Nov 20, 2020
```
# Conflicts:
#	cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java
#	cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java
```
  67610206
- word导出 · 9713c868
  qinhu authored Nov 20, 2020
  
  9713c868
- 非标产值：时间筛选 · 02b60fd2
  mengbali153 authored Nov 20, 2020
  
  02b60fd2
- 非标产值：时间筛选 · 49af994f
  mengbali153 authored Nov 20, 2020
  
  49af994f
- 非标产值：考核公值 · 671e0daa
  mengbali153 authored Nov 20, 2020
  
  671e0daa
19 Nov, 2020 1 commit
- 委托添加要求完成日期 · 1c6b308e
  竹天卫 authored Nov 19, 2020
  
  1c6b308e
18 Nov, 2020 8 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 9e529091
  竹天卫 authored Nov 18, 2020
  
  9e529091
- 化学式下标优化 · f3030eff
  竹天卫 authored Nov 18, 2020
  
  f3030eff
- 1.样品处置列表 · 554c846d
  qinhu authored Nov 18, 2020
```
2.产值加急3倍
3.质量控制样品历史记录
```
  554c846d
- 上传pdf的cell包 · 5dc6af87
  qinhu authored Nov 18, 2020
  
  5dc6af87
- pdf · 000322ae
  qinhu authored Nov 18, 2020
  
  000322ae
- 1.报告导出新模板 · 8cb23f81
  qinhu authored Nov 18, 2020
```
2.excel转pdf
```
  8cb23f81
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 90a286f8
  竹天卫 authored Nov 18, 2020
  
  90a286f8
- 委托流程更改完成发送样品处理合并到评审按钮中 · 82d2d6f6
  竹天卫 authored Nov 18, 2020
  
  82d2d6f6
17 Nov, 2020 2 commits
- 培训计划修改 · 5c92030d
  mengbali153 authored Nov 17, 2020
  
  5c92030d
- 测试修改检测项管理处理项管理 · f2148030
  竹天卫 authored Nov 17, 2020
  
  f2148030
16 Nov, 2020 4 commits
- 样品增加产地字段 · 990c1955
  竹天卫 authored Nov 16, 2020
  
  990c1955
- 样品增加产地字段 · e327978d
  竹天卫 authored Nov 16, 2020
  
  e327978d
- 飞镖产值修改 · 953a2575
  mengbali153 authored Nov 16, 2020
  
  953a2575
- 标量添加产地信息 · dc6bb533
  qinhu authored Nov 16, 2020
  
  dc6bb533
11 Nov, 2020 4 commits
- 准备演示版本111111 · 5dead76d
  竹天卫 authored Nov 11, 2020
  
  5dead76d
- 测试版本 · 893ef321
  竹天卫 authored Nov 11, 2020
  
  893ef321
- 测试服务器部署 · f2c85cbf
  竹天卫 authored Nov 11, 2020
  
  f2c85cbf
- 没有公式的检测项再校核的时候不显示 · ab437c8c
  竹天卫 authored Nov 11, 2020
  
  ab437c8c
10 Nov, 2020 5 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 82d7adf9
  竹天卫 authored Nov 10, 2020
  
  82d7adf9
- 优化访问链接 · 24137af2
  竹天卫 authored Nov 10, 2020
  
  24137af2
- 培训计划导出修改 · 1c704a11
  mengbali153 authored Nov 10, 2020
  
  1c704a11
- url · df0c56af
  mengbali153 authored Nov 10, 2020
  
  df0c56af
- 计划管理导出重制以及添加计划提醒定时任务 · 4b9ffd58
  mengbali153 authored Nov 10, 2020
  
  4b9ffd58
09 Nov, 2020 2 commits
- 人员附件功能 · 91527e92
  竹天卫 authored Nov 09, 2020
  
  91527e92
- 人员管理附件 · d493e619
  mengbali153 authored Nov 09, 2020
  
  d493e619
06 Nov, 2020 7 commits
- 质量审批,标准值为空bug · 83c54e8c
  qinhu authored Nov 06, 2020
  
  83c54e8c
- 非标产值审批调整 · bb0ce8d4
  mengbali153 authored Nov 06, 2020
  
  bb0ce8d4
- 非标产值审批调整 · 41d2f4d4
  mengbali153 authored Nov 06, 2020
  
  41d2f4d4
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · f87b3e8c
  竹天卫 authored Nov 06, 2020
  
  f87b3e8c
- 准备演示版本 · aeb95803
  竹天卫 authored Nov 06, 2020
  
  aeb95803
- Merge remote-tracking branch 'origin/master' · cbb1a805
  qinhu authored Nov 06, 2020
  
  cbb1a805
- 产值优化 · 69ec5a37
  qinhu authored Nov 06, 2020
  
  69ec5a37
05 Nov, 2020 2 commits
- 非标产值统计接口调整 · ea157e6e
  mengbali153 authored Nov 05, 2020
  
  ea157e6e
- 非标产值统计接口调整 · 7c556634
  mengbali153 authored Nov 05, 2020
  
  7c556634