Commits · 0fd596191a634cc0bdd0bb201fcbca1f39164464 · ximai / mes-pad

13 Mar, 2024 1 commit
- 报工限制改为报工数不超过排产数 · 0fd59619
  李驰骋 authored Mar 13, 2024
  
  0fd59619
12 Mar, 2024 11 commits
- update:注释刀具的提示 · e472ed5b
  张海景 authored Mar 12, 2024
  
  e472ed5b
- update:修改上下机状态 · 5cc33ef7
  张海景 authored Mar 12, 2024
  
  5cc33ef7
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 34616f8d
  chenzj authored Mar 12, 2024
  
  34616f8d
- 修改异常报告的bug · 1bbbf3e1
  chenzj authored Mar 12, 2024
  
  1bbbf3e1
- Merge remote-tracking branch 'origin/dev' into dev · e828d416
  李驰骋 authored Mar 12, 2024
  
  e828d416
- 质检显示首检按钮 · 9b1eb39c
  李驰骋 authored Mar 12, 2024
  
  9b1eb39c
- update:修改上下机接口传参 · 3112ee7a
  张海景 authored Mar 12, 2024
  
  3112ee7a
- 修改界面颜色 · c89145db
  chenzj authored Mar 12, 2024
  
  c89145db
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 992ee9e5
  chenzj authored Mar 12, 2024
```
# Conflicts:
#	pages/mes/prodReport/index.vue
```
  992ee9e5
- 修改开始作业和暂停作业传回的参数 · e4df7608
  chenzj authored Mar 12, 2024
  
  e4df7608
- update:提交预览pdf测试文件 · a93b3703
  张海景 authored Mar 12, 2024
  
  a93b3703
11 Mar, 2024 6 commits
- update:修改开始按钮加接口判断 · 525190e4
  张海景 authored Mar 11, 2024
  
  525190e4
- update:修改过滤可加工数量和背景色 · 934324cc
  张海景 authored Mar 11, 2024
  
  934324cc
- 修复暂停作业bug · e1f9027f
  chenzj authored Mar 11, 2024
  
  e1f9027f
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 56227fcf
  chenzj authored Mar 11, 2024
  
  56227fcf
- 生产报工报工人自动带入 · b71fd28a
  chenzj authored Mar 11, 2024
  
  b71fd28a
- 生产报工人自动带入和自己选择 · fda1fb0d
  chenzj authored Mar 11, 2024
  
  fda1fb0d
10 Mar, 2024 1 commit
- update:修改上机扫描和下机扫描 · 55147a8f
  张海景 authored Mar 10, 2024
  
  55147a8f
09 Mar, 2024 9 commits
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 8a5b5bd6
  chenzj authored Mar 09, 2024
  
  8a5b5bd6
- update:修改侧边栏和logo宽度 · ac7aec34
  张海景 authored Mar 09, 2024
  
  ac7aec34
- update:修改zb-table组件加上选中方法 · 59d0b6fe
  张海景 authored Mar 09, 2024
  
  59d0b6fe
- 投料校验再次添加taskId参数 · f62a9a80
  李驰骋 authored Mar 09, 2024
  
  f62a9a80
- Merge remote-tracking branch 'origin/dev' into dev · aac174dd
  李驰骋 authored Mar 09, 2024
  
  aac174dd
- 合格/不合格数量字段名调整 · 6e1852a9
  李驰骋 authored Mar 09, 2024
  
  6e1852a9
- update:修改刀模板上下机传参和接口 · 9e0f6f89
  张海景 authored Mar 09, 2024
  
  9e0f6f89
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 01068f2c
  chenzj authored Mar 09, 2024
  
  01068f2c
- 生产报工报工人自动带入 · 1479db3e
  chenzj authored Mar 09, 2024
  
  1479db3e
08 Mar, 2024 1 commit
- 状态改变添加taskWorkunitId字段 · 8d489203
  李驰骋 authored Mar 08, 2024
  
  8d489203
07 Mar, 2024 2 commits
- update:修改刀模板上下机传参 · cb026df5
  张海景 authored Mar 07, 2024
  
  cb026df5
- fix:修复领料和反冲料一进来就提示保存成功的提示 · 27e35b8e
  张海景 authored Mar 07, 2024
  
  27e35b8e
06 Mar, 2024 6 commits
- 报工默认为为待加工数 · 1bff5e0e
  李驰骋 authored Mar 06, 2024
  
  1bff5e0e
- 修复了暂停作业的bug · f5011fb3
  chenzj authored Mar 06, 2024
  
  f5011fb3
- update:修改生产管理下拉显示 · 03d0e30c
  张海景 authored Mar 06, 2024
  
  03d0e30c
- 修改查看图片bug · 31051125
  chenzj authored Mar 06, 2024
  
  31051125
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · d02c76fd
  chenzj authored Mar 06, 2024
  
  d02c76fd
- 领料申请功能优化 · 65d421b1
  chenzj authored Mar 06, 2024
  
  65d421b1
05 Mar, 2024 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · 14902d46
  李驰骋 authored Mar 05, 2024
  
  14902d46
- 生产报工添加待加工数量 · 7e75a761
  李驰骋 authored Mar 05, 2024
  
  7e75a761
04 Mar, 2024 1 commit
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · eeb76cd9
  chenzj authored Mar 04, 2024
  
  eeb76cd9