报表：入库订单明细报表数据查询

@@ -288,8 +288,19 @@
                 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
                 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
             </if>
             </if>
             <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
             <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
-                AND NOT (c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT')
-                AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL))
+                -- 没关联上合同表的数据（集合C），直接保留
+                c.id IS NULL
+                OR
+                -- 关联上了，但不满足那4个特定条件的数据（集合B），保留
+                NOT(
+                    c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
+                    AND c.status = 'FORMAL'
+                    AND poi.type = 'PRODUCTION'
+                    AND (
+                        c.price_spec_locked = 0
+                        OR c.price_spec_locked IS NULL
+                    )
+                )
             </if>
             </if>
         </where>
         </where>
         ) t
         ) t