Commits · e6d1ee93526b29991620b5674d1bdfcb1e8d2144 · 佟礼 / HYH.APSJ

05 Feb, 2026 4 commits
- $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
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 3 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