Commits · 184205418c64e0d07411d7754a62e521a1d937ba · 佟礼 / HYH.APSJ · GitLab

19 Jan, 2026 3 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  取消固定日期 · 18420541
  DESKTOP-VKRD9QF\Administration authored Jan 19, 2026
  
  18420541
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 5942f615
  DESKTOP-VKRD9QF\Administration authored Jan 19, 2026
  
  5942f615
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  取消固定日期 · 748d7839
  DESKTOP-VKRD9QF\Administration authored Jan 19, 2026
  
  748d7839
16 Jan, 2026 7 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  修改yml文件 · 8bf9f906
  DESKTOP-VKRD9QF\Administration authored Jan 16, 2026
  
  8bf9f906
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工序设备字段新增 · 019c2aa2
  DESKTOP-VKRD9QF\Administration authored Jan 16, 2026
  
  019c2aa2
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  取消固定日期 · b5cc8179
  DESKTOP-VKRD9QF\Administration authored Jan 16, 2026
  
  b5cc8179
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · d209cd62
  DESKTOP-VKRD9QF\Administration authored Jan 16, 2026
  
  d209cd62
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  修改工单订单设备 · 20d04adf
  DESKTOP-VKRD9QF\Administration authored Jan 16, 2026
  
  20d04adf
- bug · 15136f5f
  Tong Li authored Jan 16, 2026
  
  15136f5f
- 拖动 · f1da4f73
  Tong Li authored Jan 16, 2026
  
  f1da4f73
15 Jan, 2026 10 commits
- Merge remote-tracking branch 'origin/master' · d1891608
  Tong Li authored Jan 15, 2026
  
  d1891608
- 拖动 · 138726ae
  Tong Li authored Jan 15, 2026
  
  138726ae
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  修改工单订单设备 · bc3adbc4
  DESKTOP-VKRD9QF\Administration authored Jan 15, 2026
  
  bc3adbc4
- $DESKTOP-VKRD9QF\Administration's avatar$
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 3c9b2b71
  DESKTOP-VKRD9QF\Administration authored Jan 15, 2026
```
# Conflicts:
#	src/main/java/com/aps/service/Algorithm/ScheduleOperationService.java
```
  3c9b2b71
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  修改工单订单设备 · fd7c1d51
  DESKTOP-VKRD9QF\Administration authored Jan 15, 2026
  
  fd7c1d51
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  修改工单订单设备 · 5d14db2f
  DESKTOP-VKRD9QF\Administration authored Jan 15, 2026
  
  5d14db2f
- 优化非分配排序 · df2cb5cb
  Tong Li authored Jan 15, 2026
  
  df2cb5cb
- 优化非分配排序 · dd36e456
  Tong Li authored Jan 15, 2026
  
  dd36e456
- 优化 · 4965288c
  Tong Li authored Jan 15, 2026
  
  4965288c
- 优化 · 5c497ad5
  Tong Li authored Jan 15, 2026
  
  5c497ad5
14 Jan, 2026 11 commits
- 删除固定开始日期 · 22c58033
  Tong Li authored Jan 14, 2026
  
  22c58033
- 拖到,固定开始日期，锁定 · 37065872
  Tong Li authored Jan 14, 2026
  
  37065872
- 拖到 · 236185e3
  Tong Li authored Jan 14, 2026
  
  236185e3
- 多线程优化 · a1aaee69
  Tong Li authored Jan 14, 2026
  
  a1aaee69
- 多线程优化 · 4d0bfa78
  Tong Li authored Jan 14, 2026
  
  4d0bfa78
- Merge remote-tracking branch 'origin/master' into tl · e90e9ad9
  Tong Li authored Jan 14, 2026
  
  e90e9ad9
- 多线程 · e44843a1
  Tong Li authored Jan 14, 2026
  
  e44843a1
- 取消追踪application.yml文件，加入.gitignore忽略规则 · e6f1b3f0
  Tong Li authored Jan 14, 2026
  
  e6f1b3f0
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  行程并发修改 · 35f0e8bb
  DESKTOP-VKRD9QF\Administration authored Jan 14, 2026
  
  35f0e8bb
- 多线程 · a3e69687
  Tong Li authored Jan 14, 2026
  
  a3e69687
- 多线程 · 254b5ff2
  Tong Li authored Jan 14, 2026
  
  254b5ff2
13 Jan, 2026 9 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 028384c3
  DESKTOP-VKRD9QF\Administration authored Jan 13, 2026
```
# Conflicts:
#	src/main/java/com/aps/service/Algorithm/MachineCalculator.java
```
  028384c3
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  设备修改 · a9eadadd
  DESKTOP-VKRD9QF\Administration authored Jan 13, 2026
  
  a9eadadd
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  订单修改 · 9b615f1b
  DESKTOP-VKRD9QF\Administration authored Jan 13, 2026
  
  9b615f1b
- 速度优化 · c4aa3908
  Tong Li authored Jan 13, 2026
  
  c4aa3908
- 速度优化 · 358ccc01
  Tong Li authored Jan 13, 2026
  
  358ccc01
- 速度优化 · cafa81e8
  Tong Li authored Jan 13, 2026
  
  cafa81e8
- 速度优化 · 0109a2a8
  Tong Li authored Jan 13, 2026
  
  0109a2a8
- 速度优化 · b519007b
  Tong Li authored Jan 13, 2026
  
  b519007b
- 速度优化 · 96d69acd
  Tong Li authored Jan 13, 2026
  
  96d69acd