Commits · 08c5cbf16829d3f32585fe87f5218c8128323340 · 佟礼 / HYH.APSJ

06 Feb, 2026 3 commits
- bom · 08c5cbf1
  Tong Li authored Feb 06, 2026
  
  08c5cbf1
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 2dfa8789
  DESKTOP-VKRD9QF\Administration authored Feb 06, 2026
  
  2dfa8789
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  bom修改 · 4275b051
  DESKTOP-VKRD9QF\Administration authored Feb 06, 2026
  
  4275b051
05 Feb, 2026 12 commits
- Merge remote-tracking branch 'origin/tl' · 5b14438d
  Tong Li authored Feb 05, 2026
  
  5b14438d
- bom · c3efeaed
  Tong Li authored Feb 05, 2026
  
  c3efeaed
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 316ec27e
  DESKTOP-VKRD9QF\Administration authored Feb 05, 2026
  
  316ec27e
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  返回时间修改 · a7f09c7c
  DESKTOP-VKRD9QF\Administration authored Feb 05, 2026
  
  a7f09c7c
- Merge remote-tracking branch 'origin/tl' · c63d407d
  Tong Li authored Feb 05, 2026
  
  c63d407d
- bom · 9dbee6c0
  Tong Li authored Feb 05, 2026
  
  9dbee6c0
- Merge remote-tracking branch 'origin/tl' · f465ed23
  Tong Li authored Feb 05, 2026
  
  f465ed23
- bom · dbe81dd1
  Tong Li authored Feb 05, 2026
  
  dbe81dd1
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · e6d1ee93
  DESKTOP-VKRD9QF\Administration authored Feb 05, 2026
  
  e6d1ee93
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工单增加工艺信息 · 0b51cb1f
  DESKTOP-VKRD9QF\Administration authored Feb 05, 2026
  
  0b51cb1f
- Merge remote-tracking branch 'origin/tl' · c5fa84a8
  Tong Li authored Feb 05, 2026
  
  c5fa84a8
- bom · f0fc8121
  Tong Li authored Feb 05, 2026
  
  f0fc8121
04 Feb, 2026 5 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · f0abbd39
  DESKTOP-VKRD9QF\Administration authored Feb 04, 2026
  
  f0abbd39
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  下发修改 · be91d0a7
  DESKTOP-VKRD9QF\Administration authored Feb 04, 2026
  
  be91d0a7
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  更新设备缓存修改 · 073a70b1
  DESKTOP-VKRD9QF\Administration authored Feb 04, 2026
  
  073a70b1
- Merge remote-tracking branch 'origin/tl' · cf20c30c
  Tong Li authored Feb 04, 2026
  
  cf20c30c
- bom · 5256f110
  Tong Li authored Feb 04, 2026
  
  5256f110
03 Feb, 2026 12 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · c5ab1f7a
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
```
# Conflicts:
#	src/main/java/com/aps/entity/Algorithm/OrderMaterialRequirement.java
#	src/main/java/com/aps/service/impl/LanuchServiceImpl.java
```
  c5ab1f7a
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  下发修改 · d3e54c0e
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  d3e54c0e
- bom · fbd9c404
  Tong Li authored Feb 03, 2026
  
  fbd9c404
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · b71da8c1
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  b71da8c1
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  物料下发 · 7f32284b
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  7f32284b
- Merge remote-tracking branch 'origin/tl' · 923683e8
  Tong Li authored Feb 03, 2026
  
  923683e8
- bom · a79225eb
  Tong Li authored Feb 03, 2026
  
  a79225eb
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工单供给关系 · 6717a371
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  6717a371
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 51cf694a
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  51cf694a
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工单供给关系 · d080df16
  DESKTOP-VKRD9QF\Administration authored Feb 03, 2026
  
  d080df16
- bom · 250695e0
  Tong Li authored Feb 03, 2026
  
  250695e0
- 排产逻辑 · d5dfcb6f
  Tong Li authored Feb 03, 2026
  
  d5dfcb6f
02 Feb, 2026 3 commits

bom · 35468cd2
Tong Li authored Feb 02, 2026

35468cd2

Merge remote-tracking branch 'origin/tl' · 7a3f8cfc

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

7a3f8cfc

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