Commits · 24ffe414eb027b4d0a12684b903303ac0e283883 · 佟礼 / HYH.APSJ

02 Feb, 2026 1 commit

Merge remote-tracking branch 'origin/tl' · 24ffe414

Tong Li authored Feb 02, 2026

# Conflicts:
#	src/main/java/com/aps/entity/basic/Order.java
#	src/main/java/com/aps/service/impl/LanuchServiceImpl.java

24ffe414

30 Jan, 2026 2 commits
- bom · ae62deba
  Tong Li authored Jan 30, 2026
  
  ae62deba
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  公共分页和list查询修改和info修改 · 1b901fdf
  DESKTOP-VKRD9QF\Administration authored Jan 30, 2026
  
  1b901fdf
29 Jan, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  公共分页和list查询修改,设备字段修改 · 8105cd67
  DESKTOP-VKRD9QF\Administration authored Jan 29, 2026
  
  8105cd67
27 Jan, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  info接口修改，增加订单供给关系接口 · bf07ccef
  DESKTOP-VKRD9QF\Administration authored Jan 27, 2026
  
  bf07ccef
26 Jan, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  公共分页和list查询修改,设备字段修改 · 5330e8fc
  DESKTOP-VKRD9QF\Administration authored Jan 26, 2026
  
  5330e8fc
23 Jan, 2026 4 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · c0f28f4f
  DESKTOP-VKRD9QF\Administration authored Jan 23, 2026
  
  c0f28f4f
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  离散参数修改，公共分页和list查询修改 · 5b593fe9
  DESKTOP-VKRD9QF\Administration authored Jan 23, 2026
  
  5b593fe9
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  离散参数修改，公共分页和list查询修改 · fa5b9c03
  DESKTOP-VKRD9QF\Administration authored Jan 23, 2026
  
  fa5b9c03
- 订单配套 · 653269ef
  Tong Li authored Jan 23, 2026
  
  653269ef
22 Jan, 2026 4 commits
- 处理时间 · 9e01001a
  Tong Li authored Jan 22, 2026
  
  9e01001a
- 设备日历缓存 · d98a5bf6
  Tong Li authored Jan 22, 2026
  
  d98a5bf6
- Merge remote-tracking branch 'origin/tl' · a6a8f36f
  Tong Li authored Jan 22, 2026
  
  a6a8f36f
- 效率系数 · 3c0b67c4
  Tong Li authored Jan 22, 2026
  
  3c0b67c4
21 Jan, 2026 4 commits
- 单件工时不在外面计算，和订单数量一起算 · 06ae8e1c
  Tong Li authored Jan 21, 2026
  
  06ae8e1c
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge remote-tracking branch 'origin/jdt' · 8ceb95e8
  DESKTOP-VKRD9QF\Administration authored Jan 21, 2026
  
  8ceb95e8
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  撤销修改和移动工单修改 · 08d4180a
  DESKTOP-VKRD9QF\Administration authored Jan 21, 2026
  
  08d4180a
- 准备时间，前处理时间，后处理时间都从工序取 · a6b17e54
  Tong Li authored Jan 21, 2026
  
  a6b17e54
20 Jan, 2026 2 commits
- 换型，拖动 · 13d1cc93
  Tong Li authored Jan 20, 2026
  
  13d1cc93
- 换型，拖动 · eb9004a2
  Tong Li authored Jan 20, 2026
  
  eb9004a2
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