Commits · 0ea5df47bc4c758d78338485983dbad528bfd196 · ximai / mes

06 Dec, 2024 1 commit
- token密钥调整 · 0ea5df47
  李驰骋 authored Dec 06, 2024
  
  0ea5df47
05 Dec, 2024 1 commit
- 报工工时不扣减休息时间 · f63922fb
  李驰骋 authored Dec 05, 2024
  
  f63922fb
04 Dec, 2024 3 commits
- 物料综合看板BUG修复 · 59298a39
  李驰骋 authored Dec 04, 2024
  
  59298a39
- Merge remote-tracking branch 'origin/dev' into dev · 9c98ce6a
  李驰骋 authored Dec 04, 2024
  
  9c98ce6a
- 报工工时BUG修复（日历查询问题） · bc7b7ba8
  李驰骋 authored Dec 04, 2024
  
  bc7b7ba8
28 Nov, 2024 4 commits
- 更新报表 · 19b1a5ac
  温志超 authored Nov 28, 2024
  
  19b1a5ac
- 更新报表 · d757157f
  温志超 authored Nov 28, 2024
  
  d757157f
- 更新报表 · e021825c
  温志超 authored Nov 28, 2024
  
  e021825c
- 更新报错 · 8467c89c
  温志超 authored Nov 28, 2024
  
  8467c89c
27 Nov, 2024 4 commits
- 更新报表 · b7946e2c
  温志超 authored Nov 27, 2024
  
  b7946e2c
- 报表更新 · 33222867
  温志超 authored Nov 27, 2024
  
  33222867
- Merge remote-tracking branch 'origin/dev' into dev · da9ec70b
  温志超 authored Nov 27, 2024
  
  da9ec70b
- 更新报表 · 40a655c1
  温志超 authored Nov 27, 2024
  
  40a655c1
25 Nov, 2024 7 commits
- 文档名称修改 · dbb9ff0f
  李驰骋 authored Nov 25, 2024
  
  dbb9ff0f
- APP更新包上传自动设置历史包为非最新版本 · 2f7ee091
  李驰骋 authored Nov 25, 2024
  
  2f7ee091
- 报工查询子查询不分页 · d5baa989
  李驰骋 authored Nov 25, 2024
  
  d5baa989
- 排班日历时间默认调整 · 3a37336d
  李驰骋 authored Nov 25, 2024
  
  3a37336d
- Merge remote-tracking branch 'origin/dev' into dev · ede6e3cf
  温志超 authored Nov 25, 2024
  
  ede6e3cf
- 更改用户复制BUG · dc7b77a4
  温志超 authored Nov 25, 2024
  
  dc7b77a4
- 工时计算调整为只在排班日历范围内的 · 0382c323
  李驰骋 authored Nov 25, 2024
  
  0382c323
23 Nov, 2024 4 commits
- 排产日志包名调整 · ebbda24d
  李驰骋 authored Nov 23, 2024
  
  ebbda24d
- 物料综合看板接口 · c34093f5
  李驰骋 authored Nov 23, 2024
  
  c34093f5
- Merge remote-tracking branch 'origin/dev' into dev · 703fa953
  李驰骋 authored Nov 23, 2024
```
# Conflicts:
#	mes/src/main/java/com/ximai/mes/pro/mapper/task/ProTaskWorkunitMapper.java
```
  703fa953
- 物料综合看板接口 · 478fb472
  李驰骋 authored Nov 23, 2024
  
  478fb472
22 Nov, 2024 9 commits
- 提交回滚排产逻辑 · 3cc641d9
  温志超 authored Nov 22, 2024
  
  3cc641d9
- Merge remote-tracking branch 'origin/dev' into dev · 7a58d1af
  温志超 authored Nov 22, 2024
  
  7a58d1af
- 更新排产工单状态查询 · 7dbd5e69
  温志超 authored Nov 22, 2024
  
  7dbd5e69
- 生产计划看板BUG修复 · 5dbe402e
  李驰骋 authored Nov 22, 2024
  
  5dbe402e
- Merge remote-tracking branch 'origin/dev' into dev · 8a37f12c
  李驰骋 authored Nov 22, 2024
  
  8a37f12c
- 生产计划看板BUG修复 · d1c1fcd2
  李驰骋 authored Nov 22, 2024
  
  d1c1fcd2
- 更新生产报工报表排产数量BUG · 1de8103f
  温志超 authored Nov 22, 2024
  
  1de8103f
- Merge remote-tracking branch 'origin/dev' into dev · cd58819d
  李驰骋 authored Nov 22, 2024
  
  cd58819d
- 物料看板接口测试数据 · 8532b5ba
  李驰骋 authored Nov 22, 2024
  
  8532b5ba
21 Nov, 2024 5 commits
- 取消更改 · f2635a8b
  温志超 authored Nov 21, 2024
  
  f2635a8b
- Merge remote-tracking branch 'origin/dev' into dev · a1e4ccee
  温志超 authored Nov 21, 2024
  
  a1e4ccee
- 更新作业段不可加工列表查询逻辑，以及增加用户复制权限逻辑 · 5271000e
  温志超 authored Nov 21, 2024
  
  5271000e
- 修复任务暂停操作没更改状态 · a0714286
  李驰骋 authored Nov 21, 2024
  
  a0714286
- 排产时排班日历只加载非节假日 · aa06d334
  李驰骋 authored Nov 21, 2024
  
  aa06d334
20 Nov, 2024 2 commits
- 配置端口更改 · cae636f3
  李驰骋 authored Nov 20, 2024
  
  cae636f3
- Merge remote-tracking branch 'origin/master' · 88ba0e63
  温志超 authored Nov 20, 2024
  
  88ba0e63