Commits · 4967ea775da64e1cfa772550d97e085fa91caf06 · 佟礼 / HYH.APSJ · GitLab

25 Dec, 2025 5 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · 4967ea77
  DESKTOP-VKRD9QF\Administration authored Dec 25, 2025
  
  4967ea77
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  日历设置 · e87aa83b
  DESKTOP-VKRD9QF\Administration authored Dec 25, 2025
  
  e87aa83b
- 遗传算法-增加可中断 · 9362e4ee
  Tong Li authored Dec 25, 2025
  
  9362e4ee
- Merge remote-tracking branch 'origin/tl' · b8789253
  Tong Li authored Dec 25, 2025
  
  b8789253
- 遗传算法-增加约束和基准日期 · 485980ba
  Tong Li authored Dec 25, 2025
  
  485980ba
24 Dec, 2025 6 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · 5abf2c44
  DESKTOP-VKRD9QF\Administration authored Dec 24, 2025
  
  5abf2c44
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  时间配置表设置 · 246b9472
  DESKTOP-VKRD9QF\Administration authored Dec 24, 2025
  
  246b9472
- Merge remote-tracking branch 'origin/tl' · 89da235d
  Tong Li authored Dec 24, 2025
  
  89da235d
- 遗传算法-优化 · d0c355df
  Tong Li authored Dec 24, 2025
  
  d0c355df
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · ccf6728c
  DESKTOP-VKRD9QF\Administration authored Dec 24, 2025
  
  ccf6728c
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工序链接修改 · 6aaa43d8
  DESKTOP-VKRD9QF\Administration authored Dec 24, 2025
  
  6aaa43d8
23 Dec, 2025 7 commits
- 遗传算法-优化 · dd5f7afc
  Tong Li authored Dec 23, 2025
  
  dd5f7afc
- 遗传算法-优化 · 992e95ae
  Tong Li authored Dec 23, 2025
  
  992e95ae
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · dcf3cafd
  DESKTOP-VKRD9QF\Administration authored Dec 23, 2025
  
  dcf3cafd
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  日历设置 · 243d5000
  DESKTOP-VKRD9QF\Administration authored Dec 23, 2025
  
  243d5000
- 遗传算法-物料需求 · c11b1563
  Tong Li authored Dec 23, 2025
  
  c11b1563
- $DESKTOP-VKRD9QF\Administration's avatar$
  Merge branch 'jdt' · 4d1991b5
  DESKTOP-VKRD9QF\Administration authored Dec 23, 2025
```
# Conflicts:
#	src/main/resources/application.yml
```
  4d1991b5
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  日历设置 · 48b0ff56
  DESKTOP-VKRD9QF\Administration authored Dec 23, 2025
  
  48b0ff56
22 Dec, 2025 4 commits
- 遗传算法-物料需求 · 5cd21818
  Tong Li authored Dec 22, 2025
  
  5cd21818
- 遗传算法-物料缓存 · 5d00b320
  Tong Li authored Dec 22, 2025
  
  5d00b320
- Merge remote-tracking branch 'origin/tl' · 01233646
  Tong Li authored Dec 22, 2025
  
  01233646
- 遗传算法-bom · fc28f637
  Tong Li authored Dec 22, 2025
  
  fc28f637
19 Dec, 2025 9 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  redis 设置 · ed06e909
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  ed06e909
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  移动工作块 · 2a8e9ba8
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  2a8e9ba8
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/master' into jdt · de289521
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  de289521
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  公共接口 · 19269290
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  19269290
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · 0b047fab
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  0b047fab
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  日历 · 480f12c6
  DESKTOP-VKRD9QF\Administration authored Dec 19, 2025
  
  480f12c6
- 遗传算法-移动多工单，删除订单 · c44201cc
  Tong Li authored Dec 19, 2025
  
  c44201cc
- Merge remote-tracking branch 'origin/tl' · b779f0fc
  Tong Li authored Dec 19, 2025
```
# Conflicts:
#	result/chromosome_result_B571EF6682DB463AB2977B1055A74112.json
#	schedule_log.txt
#	src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
```
  b779f0fc
- 遗传算法-移动多工单，删除订单 · fc778193
  Tong Li authored Dec 19, 2025
  
  fc778193
18 Dec, 2025 9 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  返回数据修改 · a5a1c4a7
  DESKTOP-VKRD9QF\Administration authored Dec 18, 2025
  
  a5a1c4a7
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  返回数据修改 · 25512e9d
  DESKTOP-VKRD9QF\Administration authored Dec 18, 2025
  
  25512e9d
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'jdt' · bdb0cf2b
  DESKTOP-VKRD9QF\Administration authored Dec 18, 2025
  
  bdb0cf2b
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  返回数据修改 · 92089e30
  DESKTOP-VKRD9QF\Administration authored Dec 18, 2025
  
  92089e30
- Merge remote-tracking branch 'origin/tl' · c66c0216
  Tong Li authored Dec 18, 2025
  
  c66c0216
- 遗传算法-优化 · bb843694
  Tong Li authored Dec 18, 2025
  
  bb843694
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  返回数据修改 · 9d9c753b
  DESKTOP-VKRD9QF\Administration authored Dec 18, 2025
  
  9d9c753b
- 遗传算法-优化 · a17d29cb
  Tong Li authored Dec 18, 2025
  
  a17d29cb
- 遗传算法-优化 · ee5baba2
  Tong Li authored Dec 18, 2025
  
  ee5baba2