Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r29555 -r29564 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29555) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29564) @@ -4994,7 +4994,7 @@ // 配置项storageUseStorageSubtractWaitDeliver设置为true,则计算库存时还要扣除掉申请单上的待发货的物品的数量 boolean storageUseStorageSubtractWaitDeliver = ConfigUtils.getSystemSetConfigByNameBool("storageUseStorageSubtractWaitDeliver", false); if(storageUseStorageSubtractWaitDeliver){ - String tousseItemHql = String.format("from %s po where po.diposable = '%s' and po.amount > po.sendOutAmount and %s and %s", + String tousseItemHql = String.format("from %s po where po.diposable = '%s' and po.amount > po.sendOutAmount and (po.isTerminated is null or po.isTerminated = 0) and %s and %s", TousseItem.class.getSimpleName(), Constants.DIPOSABLE_TYPE_YES, SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.disposableGoodsId", disposableGoodsIdList), SqlUtils.getNonStringFieldNotInCollectionsPredicate("po.id", oldTousseItemIdList));