Commits · 4b381c3621a2f1c1427a7eb04797a19fd7290df6 · 竹天卫 / tianjin-cement

20 Oct, 2020 6 commits
- 补提交 · 4b381c36
  qinhu authored Oct 20, 2020
  
  4b381c36
- 1.优化样品检测统计 · 744b734e
  qinhu authored Oct 20, 2020
```
2.工作产值统计
```
  744b734e
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 1097cf30
  竹天卫 authored Oct 20, 2020
  
  1097cf30
- 优化委托 · 24f1891d
  竹天卫 authored Oct 20, 2020
  
  24f1891d
- 存储柜--添加redis实现和删除货柜 · 062f06d3
  qinhu authored Oct 20, 2020
  
  062f06d3
- 存储柜--添加redis实现和删除货柜 · 66a664ae
  qinhu authored Oct 20, 2020
  
  66a664ae
19 Oct, 2020 6 commits
- 优化委托流程 · c9062b66
  竹天卫 authored Oct 19, 2020
  
  c9062b66
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · db30b97e
  竹天卫 authored Oct 19, 2020
  
  db30b97e
- 非平行样可以多个人检测 · ff4939e8
  竹天卫 authored Oct 19, 2020
  
  ff4939e8
- 存储柜管理 · 7e3f6dc6
  qinhu authored Oct 19, 2020
  
  7e3f6dc6
- 小样管理---存储二维码生成 · d14f5572
  qinhu authored Oct 19, 2020
  
  d14f5572
- 委托平行样可以派发给三个以上的人检测 · 77a00448
  竹天卫 authored Oct 19, 2020
  
  77a00448
18 Oct, 2020 4 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · df036b76
  竹天卫 authored Oct 18, 2020
  
  df036b76
- 标样管理标样材料需要看到历史的上传附件 · 2cb80504
  竹天卫 authored Oct 18, 2020
  
  2cb80504
- 标准产值 · cd8e18c0
  mengbali153 authored Oct 18, 2020
  
  cd8e18c0
- 非标产值 · fc0eef77
  mengbali153 authored Oct 18, 2020
  
  fc0eef77
16 Oct, 2020 8 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · de2b762a
  竹天卫 authored Oct 16, 2020
  
  de2b762a
- 修改bug 校核计算是如果是平行样检测，把每个人的计算结果返回展示用于比较误差值 · 1d37edd7
  竹天卫 authored Oct 16, 2020
  
  1d37edd7
- 报告导出-工业分析 · 39928e83
  qinhu authored Oct 16, 2020
  
  39928e83
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 64168ce1
  竹天卫 authored Oct 16, 2020
  
  64168ce1
- 123 · 42aa1c3e
  竹天卫 authored Oct 16, 2020
  
  42aa1c3e
- Merge remote-tracking branch 'origin/master' into master · 5366470d
  mengbali153 authored Oct 16, 2020
  
  5366470d
- 标准产值 · f666a56f
  mengbali153 authored Oct 16, 2020
  
  f666a56f
- 委托单导出 · a6943c59
  qinhu authored Oct 16, 2020
  
  a6943c59
15 Oct, 2020 12 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · d089079d
  竹天卫 authored Oct 15, 2020
  
  d089079d
- 更改会议纪要提出的问题 · 516822b9
  竹天卫 authored Oct 15, 2020
  
  516822b9
- 质量导出---去掉null · 6165377f
  qinhu authored Oct 15, 2020
  
  6165377f
- 质量导出---部门 · bc112b05
  qinhu authored Oct 15, 2020
  
  bc112b05
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 8f760b2f
  竹天卫 authored Oct 15, 2020
  
  8f760b2f
- 设备管理完成 · 7c153b78
  竹天卫 authored Oct 15, 2020
  
  7c153b78
- 报告导出--十元素(模板补提交) · 61d593fd
  qinhu authored Oct 15, 2020
  
  61d593fd
- 报告导出--十元素 · 63df5f63
  qinhu authored Oct 15, 2020
  
  63df5f63
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 09781204
  竹天卫 authored Oct 15, 2020
  
  09781204
- 接口优化 websocket消息推送功能 · c9bbce78
  竹天卫 authored Oct 15, 2020
  
  c9bbce78
- 非标产值 · 29e2b3a1
  mengbali153 authored Oct 15, 2020
  
  29e2b3a1
- 非标产值 · e2ac5f2a
  mengbali153 authored Oct 15, 2020
  
  e2ac5f2a
14 Oct, 2020 2 commits
- 能力管理--联调 · 12c03198
  mengbali153 authored Oct 14, 2020
```
历史档案--联调
非标产值--联调
```
  12c03198
- Merge remote-tracking branch 'origin/master' into master · 8d2df675
  mengbali153 authored Oct 14, 2020
  
  8d2df675
13 Oct, 2020 2 commits
- 质量检测-对接导出 · 9327a7c0
  qinhu authored Oct 13, 2020
  
  9327a7c0
- Merge remote-tracking branch 'origin/master' into master · 19d624d5
  mengbali153 authored Oct 13, 2020
  
  19d624d5