Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13513 -r13514 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13513) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13514) @@ -1107,7 +1107,7 @@ TousseDefinition td = getTousseDefinition(idToTDMap,appItem.getTousseDefinitionId()); if (amount != 0) { - newDisinfectGoodsTousseDefinition(record, + newUnPackingTousseTousseInstanceOrDisinfectGoodsDefinition(record, application, amount, isNewAddTousse, td, appItem,json); } } @@ -1173,7 +1173,7 @@ tousseItems.add(item); //不装配不追溯物品 - newDisinfectGoodsTousseDefinition(record, + newUnPackingTousseTousseInstanceOrDisinfectGoodsDefinition(record, application, item.getRecyclingAmount(), true, td,item,json); } application.setApplicationItems(tousseItems); @@ -1193,7 +1193,17 @@ } } - private void newDisinfectGoodsTousseDefinition( + /** + * 创建消毒物品定义 或不装配的的物品器械包实例 + * @param record + * @param application + * @param amount + * @param isNewAddTousse + * @param td + * @param appItem + * @param basketItemJson + */ + private void newUnPackingTousseTousseInstanceOrDisinfectGoodsDefinition( RecyclingRecord record, RecyclingApplication application, Integer amount, boolean isNewAddTousse, TousseDefinition td,TousseItem appItem,JSONObject basketItemJson) {