Showing
1 changed file
with
13 additions
and
2 deletions
| ... | ... | @@ -288,8 +288,19 @@ |
| 288 | 288 | AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL) |
| 289 | 289 | </if> |
| 290 | 290 | <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked"> |
| 291 | - AND NOT (c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT') | |
| 292 | - AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)) | |
| 291 | + -- 没关联上合同表的数据(集合C),直接保留 | |
| 292 | + c.id IS NULL | |
| 293 | + OR | |
| 294 | + -- 关联上了,但不满足那4个特定条件的数据(集合B),保留 | |
| 295 | + NOT( | |
| 296 | + c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT') | |
| 297 | + AND c.status = 'FORMAL' | |
| 298 | + AND poi.type = 'PRODUCTION' | |
| 299 | + AND ( | |
| 300 | + c.price_spec_locked = 0 | |
| 301 | + OR c.price_spec_locked IS NULL | |
| 302 | + ) | |
| 303 | + ) | |
| 293 | 304 | </if> |
| 294 | 305 | </where> |
| 295 | 306 | ) t | ... | ... |