Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13493 -r13504 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13493) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13504) @@ -1141,7 +1141,7 @@ if(SupplyRoomConfig.INVOICE_ORIGIN_RECYCLING.equals(invoiceOrigin)){ List tousseItems = new ArrayList(); - application = newRecyclingApplication(record,tousseItems); + application = newRecyclingApplication(record); record.setRecyclingApplication(application); for (JSONObject json : itemJsonList) { @@ -1178,6 +1178,8 @@ application, item.getRecyclingAmount(), true, td,item,json); } } + application.setApplicationItems(tousseItems); + invoicePlanManager.computeAndSetStatus(application); } }else{ for (JSONObject json : itemJsonList) { @@ -1219,7 +1221,7 @@ } private RecyclingApplication newRecyclingApplication( - RecyclingRecord recyclingRecord, List tousseItems) { + RecyclingRecord recyclingRecord) { RecyclingApplication application; application = new RecyclingApplication(); application.setSerialNumber(serialNumManager @@ -1237,13 +1239,8 @@ application.setSettleAccountsDepart(recyclingRecord.getDepart()); application.setSettleAccountsDepartCoding(recyclingRecord.getDepartCode()); application.setPrinted(InvoicePlan.PRINT_STATUS_UNPRINT); - - //设置处理科室 application.setHandleDepart(AcegiHelper.getLoginUser().getCurrentOrgUnitName()); application.setHandleDepartCoding(AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); - - application.setApplicationItems(tousseItems); - invoicePlanManager.computeAndSetStatus(application); recyclingApplicationManager.saveOrUpdate(application); return application; }