Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r19492 -r19494 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19492) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 19494) @@ -2078,6 +2078,8 @@ } } } + boolean isNotInvoice = supplyRoomConfigManager.isRecyclingApplicationNotInvoiceDepart(application.getDepartCoding()); + isNotInvoice &= application.isRecyclingApplication(); List addTousseItems = new ArrayList(); //篮筐内的物品 for (RecyclingBasketItemVo json : itemJsonList) { @@ -2096,6 +2098,9 @@ continue; } appItem = newApplicationItem(idToTDMap, application, tousseName,tousseDefinitionID,amount); + if(isNotInvoice){ + appItem.setIsInvoice(Constants.STR_NO); + } applicationItemList.add(appItem); addTousseItems.add(json); appTousseItemMap.put(tousseDefinitionID, appItem); @@ -2209,7 +2214,7 @@ List tousseItems = new ArrayList(); application = newRecyclingApplication(record); record.setRecyclingApplication(application); - + boolean isNotInvoice = supplyRoomConfigManager.isRecyclingApplicationNotInvoiceDepart(application.getDepartCoding()); Map itemMap = new HashMap(); for (RecyclingBasketItemVo json : itemJsonList) { @@ -2230,7 +2235,11 @@ TousseDefinition td = getTousseDefinition(idToTDMap, tousseDefinitionID); item.setTousseType(td.getTousseType()); item.setTousseDefinitionId(td.getId()); - item.setIsInvoice(td.getIsInvoice()); + if(isNotInvoice){ + item.setIsInvoice(Constants.STR_NO); + }else{ + item.setIsInvoice(td.getIsInvoice()); + } item.setDiposable("否"); item.setIsCleanedEntirely(td.getIsCleanedEntirely()); item.setIsApplyEntireTousse(td.getIsApplyEntireTousse());