Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13504 -r13513 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13504) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13513) @@ -1105,9 +1105,9 @@ } //不装配不追溯物品 TousseDefinition td = getTousseDefinition(idToTDMap,appItem.getTousseDefinitionId()); - if (amount != 0 && TousseDefinition.STR_NO.equals(td.getIsPacking())) { + if (amount != 0) { - newUnPackingTousseDefinitionOrTousseInstance(record, + newDisinfectGoodsTousseDefinition(record, application, amount, isNewAddTousse, td, appItem,json); } } @@ -1173,10 +1173,8 @@ tousseItems.add(item); //不装配不追溯物品 - if (TousseDefinition.STR_NO.equals(td.getIsPacking())) { - newUnPackingTousseDefinitionOrTousseInstance(record, - application, item.getRecyclingAmount(), true, td,item,json); - } + newDisinfectGoodsTousseDefinition(record, + application, item.getRecyclingAmount(), true, td,item,json); } application.setApplicationItems(tousseItems); invoicePlanManager.computeAndSetStatus(application); @@ -1195,7 +1193,7 @@ } } - private void newUnPackingTousseDefinitionOrTousseInstance( + private void newDisinfectGoodsTousseDefinition( RecyclingRecord record, RecyclingApplication application, Integer amount, boolean isNewAddTousse, TousseDefinition td,TousseItem appItem,JSONObject basketItemJson) { @@ -1216,8 +1214,10 @@ basketItemJson.put("tousseDefinitionID", createInstanceTD.getId()); } //创建不装配、不追溯的包实例 - recyclingApplicationManager.newUnPackingTousseInstance( - createInstanceTD, amount, application, record); + if(TousseDefinition.STR_NO.equals(td.getIsPacking())){ + recyclingApplicationManager.newUnPackingTousseInstance( + createInstanceTD, amount, application, record); + } } private RecyclingApplication newRecyclingApplication(