Commits · 490858d684b79efe129ad732b3bea745e3d257a2 · 佟礼 / HYH.APSJ

15 Jun, 2026 2 commits
- bug · 490858d6
  Tong Li authored Jun 15, 2026
  
  490858d6
- 1、物料约束不勾选，则采购检验时长为0 · 57cd90f1
  Tong Li authored Jun 15, 2026
```
2、如果采购订单到货时间晚于基准日期+采购,检验时长，则不使用
3、瓶颈设备瓶颈工序过滤掉无限产能设备
```
  57cd90f1
12 Jun, 2026 2 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  优化器启用 · 9d489cbf
  DESKTOP-VKRD9QF\Administration authored Jun 12, 2026
  
  9d489cbf
- 倒排配套 · f366bb13
  Tong Li authored Jun 12, 2026
  
  f366bb13
11 Jun, 2026 7 commits
- bug · ff663b04
  Tong Li authored Jun 11, 2026
  
  ff663b04
- Merge remote-tracking branch 'origin/master' · 19477178
  Tong Li authored Jun 11, 2026
  
  19477178
- bug · 4977989e
  Tong Li authored Jun 11, 2026
  
  4977989e
- bug · 2a8a76cc
  Tong Li authored Jun 11, 2026
  
  2a8a76cc
- bug · d316b05b
  Tong Li authored Jun 11, 2026
  
  d316b05b
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 6da2535b
  DESKTOP-VKRD9QF\Administration authored Jun 11, 2026
  
  6da2535b
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  日志 · 90219e38
  DESKTOP-VKRD9QF\Administration authored Jun 11, 2026
  
  90219e38
10 Jun, 2026 2 commits
- 优化 · f322e462
  Tong Li authored Jun 10, 2026
  
  f322e462
- CP · 6c291a36
  Tong Li authored Jun 10, 2026
  
  6c291a36
08 Jun, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  设备日历 · fef1ef87
  DESKTOP-VKRD9QF\Administration authored Jun 08, 2026
  
  fef1ef87
04 Jun, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  倒排冲突 · cf038922
  DESKTOP-VKRD9QF\Administration authored Jun 04, 2026
  
  cf038922
03 Jun, 2026 2 commits
- Merge remote-tracking branch 'origin/tl' · ae460151
  Tong Li authored Jun 03, 2026
  
  ae460151
- 倒排配套 · 5767b7da
  Tong Li authored Jun 03, 2026
  
  5767b7da
02 Jun, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  倒排冲突 · c5c9a28b
  DESKTOP-VKRD9QF\Administration authored Jun 02, 2026
  
  c5c9a28b
29 May, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 2f7a699b
  DESKTOP-VKRD9QF\Administration authored May 29, 2026
  
  2f7a699b
28 May, 2026 3 commits
- Merge remote-tracking branch 'origin/tl' · 813959ca
  Tong Li authored May 28, 2026
  
  813959ca
- 倒排 · 78d8bf59
  Tong Li authored May 28, 2026
  
  78d8bf59
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  插单和工单查询 · f3011df8
  DESKTOP-VKRD9QF\Administration authored May 28, 2026
  
  f3011df8
27 May, 2026 6 commits
- Merge remote-tracking branch 'origin/master' · bc529e67
  Tong Li authored May 27, 2026
  
  bc529e67
- 初始话 · a8b02830
  Tong Li authored May 27, 2026
  
  a8b02830
- 优先级 · 78d5f5e4
  Tong Li authored May 27, 2026
  
  78d5f5e4
- Merge remote-tracking branch 'origin/master' into tl · 7d322d24
  Tong Li authored May 27, 2026
```
# Conflicts:
#	src/test/java/com/aps/demo/PlanResultServiceTest.java
```
  7d322d24
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 85fa9adb
  DESKTOP-VKRD9QF\Administration authored May 27, 2026
  
  85fa9adb
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  插单和工单查询 · 59ee6455
  DESKTOP-VKRD9QF\Administration authored May 27, 2026
  
  59ee6455
26 May, 2026 8 commits
- 倒排 · 8cd195f9
  Tong Li authored May 26, 2026
  
  8cd195f9
- Merge remote-tracking branch 'origin/master' · c977460e
  Tong Li authored May 26, 2026
  
  c977460e
- 倒排 · 2bf4f011
  Tong Li authored May 26, 2026
  
  2bf4f011
- Merge remote-tracking branch 'origin/tl' · fb4f76cb
  Tong Li authored May 26, 2026
```
# Conflicts:
#	src/test/java/com/aps/demo/PlanResultServiceTest.java
```
  fb4f76cb
- bom · 8ab612f9
  Tong Li authored May 26, 2026
  
  8ab612f9
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · ffd1e0bc
  DESKTOP-VKRD9QF\Administration authored May 26, 2026
  
  ffd1e0bc
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  插单和工单查询 · 78900059
  DESKTOP-VKRD9QF\Administration authored May 26, 2026
  
  78900059
- 优先级 · 7e90812c
  Tong Li authored May 26, 2026
  
  7e90812c
25 May, 2026 4 commits
- 配套 · c22e2e70
  Tong Li authored May 25, 2026
  
  c22e2e70
- 配套 · 97cf7497
  Tong Li authored May 25, 2026
  
  97cf7497
- Merge remote-tracking branch 'origin/master' · 96bd6495
  Tong Li authored May 25, 2026
  
  96bd6495
- 配套 · 2841516f
  Tong Li authored May 25, 2026
  
  2841516f