Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r34118 -r34124 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 34118) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 34124) @@ -9909,14 +9909,13 @@ + " and ti.tousseType = '%s' " + " and ti.isPrinted = 1 " // 物品的打印状态为已打印的 + " and (ti.isTerminated = 0 or ti.isTerminated is null) " // 是否已终止状态为否 - + " and ti.sendOutAmount = 0 " // 发货数量属性为0 - + " and ip.deliverStatus = '%s' " // 发货状态为待发货 + //+ " and ti.sendOutAmount = 0 " // 发货数量属性为0 + //+ " and ip.deliverStatus = '%s' " // 发货状态为待发货 + " and ip.committedstatus = 1 ", // 未提交的单据不打印,处于暂存状态 TousseItem.class.getSimpleName(), InvoicePlan.class.getSimpleName(), OrgUnit.class.getSimpleName(), DisposableGoods.class.getSimpleName(), SupplyRoomConfig.class.getSimpleName(), TousseItem_PrintRecord.class.getSimpleName(), - SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY, DisposableGoods.TYPE_NAME, - InvoicePlan.DELIVERSTATUS_AWAITDELIVER); + SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY, DisposableGoods.TYPE_NAME); if(CollectionUtils.isNotEmpty(disposableGoodsList)){ sql += " and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("dg.id", disposableGoodsIds);