Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r19942 -r19999 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 19942) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 19999) @@ -803,11 +803,21 @@ public boolean isForeignTousseAppliaction() { return StringUtils.equals(TYPE_FOREIGNTOUSSEAPPLIACTION, type); } + + /** * 判断是否消毒物品申请单 * @return */ @Transient + public boolean isDiposableGoodsAppliaction() { + return StringUtils.equals(TYPE_DIPOSABLE_GOODS_APPLICATION_FORM, type); + } + /** + * 判断是否消毒物品申请单 + * @return + */ + @Transient public boolean isDisinfectGoodsAppliaction() { return StringUtils.equals(TYPE_DISINFECT_GOODS_APPLICATION_FORM, type); } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r19929 -r19999 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 19929) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 19999) @@ -4894,10 +4894,14 @@ Map datas = new HashMap(); Set invoicePlanIds = new HashSet<>(); boolean tousseTypeApplyToInvoiceForm = CssdUtils.getSystemSetConfigByNameBool("invoicePlanExtractedView_TousseTypeApplyToInvoiceForm", false); + boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan"); for (InvoicePlan invoicePlan : invoicePlans) { if (!invoicePlanManager.checkIsShowNoConBorrow(invoicePlan.getType(),invoicePlan.getBorrowConfirmStatus())){ continue; } + if(hideUnprintedDisposableGoodsInvoicePlan && (invoicePlan.isDiposableGoodsAppliaction() && (invoicePlan.getPrinted() != InvoicePlan.PRINT_STATUS_PRINTED))){ + continue; + } String recyclingStatus = invoicePlan.getRecyclingStatus(); boolean isComboForm = InvoicePlan.TYPE_COMBO_FORM .equals(invoicePlan.getType()); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r19992 -r19999 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 19992) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 19999) @@ -226,12 +226,16 @@ @Override public Collection getDepartInvoicePlan( Collection departCodes, String applyDate, String tousseType, TimeQuantum timeQuantum) { + boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan"); //查询发货计划 Collection invoicePlans = getInvoicePlanListByOrgUnitCodingsAndTousseType( departCodes, applyDate, tousseType); filterEmptyInvoicePlan(invoicePlans); Collection resultCol = new ArrayList(); for (final InvoicePlan invoicePlan : invoicePlans) { + if(hideUnprintedDisposableGoodsInvoicePlan && (invoicePlan.isDiposableGoodsAppliaction() && (invoicePlan.getPrinted() != InvoicePlan.PRINT_STATUS_PRINTED))){ + continue; + } InvoicePlanVo vo = CollectionUtils.find(resultCol, new Predicate() { @Override @@ -297,6 +301,7 @@ @Override public JSONArray getInvoicePlansByOrgAndTousseType( Collection departCodes, String applyDate, String tousseType) { + boolean hideUnprintedDisposableGoodsInvoicePlan = CssdUtils.getSystemSetConfigByNameBool("hideUnprintedDisposableGoodsInvoicePlan"); //查询发货计划 Collection invoicePlans = getInvoicePlanListByOrgUnitCodingsAndTousseTypeOnlyForInvoicePlanList( departCodes, applyDate, tousseType); @@ -310,6 +315,9 @@ if (!this.checkIsShowNoConBorrow(invoicePlan.getType(),invoicePlan.getBorrowConfirmStatus())){ continue; } + if(hideUnprintedDisposableGoodsInvoicePlan && (invoicePlan.isDiposableGoodsAppliaction() && (invoicePlan.getPrinted() != InvoicePlan.PRINT_STATUS_PRINTED))){ + continue; + } invoicePlanTemp = new JSONObject(); invoicePlanTemp.put("id",String.valueOf(invoicePlan.getId())); invoicePlanTemp.put("typeAndserialNumber",invoicePlan.getSerialNumber() + " " + invoicePlan.getType());