Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r25688 -r25746 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 25688) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 25746) @@ -271,7 +271,7 @@ @Override public Collection getWaitDeliverGoods(Collection invoicePlans, String applyDate , String tousseTypeArg,String disposableGoodsType,String sterilingMethods){ - + Date out_beginTime = new Date(); Date out_endTime = new Date(); SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); @@ -282,7 +282,8 @@ Boolean recyclingedDeliver = config.getAfterRecyclingTousseDeliver(); Set disposableGoodsTypeSet = buildDisposableGoodsTypeSet(disposableGoodsType); Map datas = new HashMap(); - Set invoicePlanIds = new HashSet<>(); + // 没有阅读过的发货计划单的id集合 + Set unReadedInvoicePlanIds = new HashSet<>(); boolean tousseTypeApplyToInvoiceForm = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedView_TousseTypeApplyToInvoiceForm", false); boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan"); boolean invoicePlanExtractedForm_useTtsName = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedForm_useTtsName"); @@ -528,7 +529,7 @@ vo.getTousseItems().add(tousseItemVo); } if(!invoicePlan.readed()){ - invoicePlanIds.add(invoicePlan.getId()); + unReadedInvoicePlanIds.add(invoicePlan.getId()); } } } @@ -549,8 +550,8 @@ } } //更新申请单已读状态 - if(!invoicePlanIds.isEmpty()){ - String idsStr = StringUtils.join(invoicePlanIds, ','); + if(!unReadedInvoicePlanIds.isEmpty()){ + String idsStr = StringUtils.join(unReadedInvoicePlanIds, ','); String sql = "update invoicePlan set readed = " + InvoicePlan.READED + " where id in (" + idsStr + ")"; objectDao.excuteSQL(sql); }