Commit ca3b532df351b101c3e80c25a7f87a6960a066fe

Authored by 房远帅
1 parent 80d0edd1

报表:库存入库订单明细报表3

@@ -283,6 +283,8 @@ @@ -283,6 +283,8 @@
283 </if> 283 </if>
284 <if test="vo.inventoryUnlockedOnly != null and vo.inventoryUnlockedOnly"> 284 <if test="vo.inventoryUnlockedOnly != null and vo.inventoryUnlockedOnly">
285 AND c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT') 285 AND c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT')
  286 + AND c.status ='FORMAL'
  287 + AND poi.type='PRODUCTION'
286 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL) 288 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
287 </if> 289 </if>
288 <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked"> 290 <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">