Commits · 82288acd9d269650d734a87fb1daf3074573c35c · 佟礼 / HYH.APSJ

20 Apr, 2026 3 commits
- Merge remote-tracking branch 'origin/tl' · 82288acd
  Tong Li authored Apr 20, 2026
  
  82288acd
- 物料需求 · bd586664
  Tong Li authored Apr 20, 2026
  
  bd586664
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  常数时间修改 · 6ad77e5d
  DESKTOP-VKRD9QF\Administration authored Apr 20, 2026
  
  6ad77e5d
17 Apr, 2026 4 commits
- bug · 587dadb1
  Tong Li authored Apr 17, 2026
  
  587dadb1
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  读取文件速度 · c561b222
  DESKTOP-VKRD9QF\Administration authored Apr 17, 2026
  
  c561b222
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  新建超工单30天提示 · 36968d43
  DESKTOP-VKRD9QF\Administration authored Apr 17, 2026
  
  36968d43
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  新建超工单30天提示 · 26461055
  DESKTOP-VKRD9QF\Administration authored Apr 17, 2026
  
  26461055
16 Apr, 2026 16 commits
- bug · 6fefd6ad
  Tong Li authored Apr 16, 2026
  
  6fefd6ad
- 禁用配套 · b5060c05
  Tong Li authored Apr 16, 2026
  
  b5060c05
- 禁用配套 · abbd34a4
  Tong Li authored Apr 16, 2026
  
  abbd34a4
- Merge remote-tracking branch 'origin/tl' · 6d63a60c
  Tong Li authored Apr 16, 2026
  
  6d63a60c
- 初始化优化 · 6f26eee5
  Tong Li authored Apr 16, 2026
  
  6f26eee5
- 初始化优化 · 087659cf
  Tong Li authored Apr 16, 2026
  
  087659cf
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  配套 · 874652bf
  DESKTOP-VKRD9QF\Administration authored Apr 16, 2026
  
  874652bf
- $DESKTOP-VKRD9QF\Administration's avatar$
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 7d27c0ff
  DESKTOP-VKRD9QF\Administration authored Apr 16, 2026
```
# Conflicts:
#	src/main/java/com/aps/entity/Algorithm/Chromosome.java
```
  7d27c0ff
- 设备日历生成太多 · 08991d0b
  Tong Li authored Apr 16, 2026
  
  08991d0b
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  物料配套 · 8231751e
  DESKTOP-VKRD9QF\Administration authored Apr 16, 2026
  
  8231751e
- 设备日历生成太多 · c7e03b35
  Tong Li authored Apr 16, 2026
  
  c7e03b35
- 优化 · f864f507
  Tong Li authored Apr 16, 2026
  
  f864f507
- Merge remote-tracking branch 'origin/master' · 6ba23982
  Tong Li authored Apr 16, 2026
  
  6ba23982
- re · f89cd03f
  Tong Li authored Apr 16, 2026
  
  f89cd03f
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 0f35c8f4
  DESKTOP-VKRD9QF\Administration authored Apr 16, 2026
  
  0f35c8f4
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  核数计算 · d632519e
  DESKTOP-VKRD9QF\Administration authored Apr 16, 2026
  
  d632519e
15 Apr, 2026 1 commit
- 优化 · 111874b6
  Tong Li authored Apr 15, 2026
  
  111874b6
13 Apr, 2026 1 commit
- v · 40085732
  Tong Li authored Apr 13, 2026
  
  40085732
12 Apr, 2026 1 commit
- Merge remote-tracking branch 'origin/tl' · f2a1529b
  Tong Li authored Apr 12, 2026
  
  f2a1529b
11 Apr, 2026 1 commit
- 变邻域+模拟退火+禁忌搜索 · f1998b61
  Tong Li authored Apr 11, 2026
  
  f1998b61
10 Apr, 2026 1 commit
- 变邻域+模拟退火+禁忌搜索 · 8a7de711
  Tong Li authored Apr 10, 2026
  
  8a7de711
03 Apr, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  缓存修改 · bb00017a
  DESKTOP-VKRD9QF\Administration authored Apr 03, 2026
  
  bb00017a
02 Apr, 2026 1 commit
- 混合算法 · 932c42d2
  Tong Li authored Apr 02, 2026
  
  932c42d2
01 Apr, 2026 2 commits
- 解码优化 · ad57430d
  Tong Li authored Apr 01, 2026
  
  ad57430d
- 算法优化 · 25c58c5b
  Tong Li authored Apr 01, 2026
  
  25c58c5b
27 Mar, 2026 2 commits

Merge remote-tracking branch 'origin/master' into tl · 9d08cc4f

Tong Li authored Mar 27, 2026

# Conflicts:
#	src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
#	src/main/java/com/aps/service/plan/PlanResultService.java
#	src/test/java/com/aps/demo/PlanResultServiceTest.java

9d08cc4f

算法优化 · 6abaed14
Tong Li authored Mar 27, 2026

6abaed14

26 Mar, 2026 4 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  插单修改 · f0698511
  DESKTOP-VKRD9QF\Administration authored Mar 26, 2026
  
  f0698511
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  插单修改 · 9fab7eca
  DESKTOP-VKRD9QF\Administration authored Mar 26, 2026
  
  9fab7eca
- 算法优化 · 47286670
  Tong Li authored Mar 26, 2026
  
  47286670
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  滚动排产修改 · a84189b4
  DESKTOP-VKRD9QF\Administration authored Mar 26, 2026
  
  a84189b4
25 Mar, 2026 2 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  聚焦甘特修改 · 503590db
  DESKTOP-VKRD9QF\Administration authored Mar 25, 2026
  
  503590db
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  优先级排序 · 513fcbc7
  DESKTOP-VKRD9QF\Administration authored Mar 25, 2026
  
  513fcbc7