Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java =================================================================== diff -u -r14697 -r14710 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java (.../CustomRecyclingApplicationAction.java) (revision 14697) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java (.../CustomRecyclingApplicationAction.java) (revision 14710) @@ -231,7 +231,7 @@ } } recyclingApplication.setIncludeRecyclingItems(InvoicePlan.SIGNED_TRUE); - recyclingApplication.setIncludeInvoiceItems(InvoicePlan.SIGNED_TRUE); + recyclingApplication.setIncludeInvoiceItems(InvoicePlan.SIGNED_FALSE); recyclingApplication.setType(RecyclingApplication.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM);// 申请单 recyclingApplication.setApplicationItems(items); recyclingApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java =================================================================== diff -u -r14407 -r14710 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 14407) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java (.../SupplyRoomConfig.java) (revision 14710) @@ -260,6 +260,13 @@ this.invoiceOrigin = invoiceOrigin; } + public boolean invoiceOriginRecycling(){ + if(INVOICE_ORIGIN_RECYCLING.equals(invoiceOrigin)){ + return true; + } + return false; + } + public Double getCustomToussePrice() { return customToussePrice; }