Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r20876 -r20962 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 20876) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 20962) @@ -1886,7 +1886,7 @@ var errorDamageQmKey = toussItem.errorDamageQmKey?toussItem.errorDamageQmKey:""; var b = true; $('#tousseItemTable').children().first().children().each(function(i,element){ - if($('#tousseDefinitionID'+i).val() == tousseDefinitionID){ + if(($('#tousseDefinitionID'+i).val() == tousseDefinitionID)||(tousseType == '消毒物品' && $('#tousseName'+i).val() == tousseName)){ //显示的列表中是否有该器械包 if($('#deleted'+i).val() == '0'){ alertDiv(tousseName + ",回收列表已存在!"); Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r20942 -r20962 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20942) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20962) @@ -2141,7 +2141,7 @@ } boolean isNotInvoice = supplyRoomConfigManager.isRecyclingApplicationNotInvoiceDepart(application.getDepartCoding()); isNotInvoice &= application.isRecyclingApplication(); - List addTousseItems = new ArrayList(); +// List addTousseItems = new ArrayList(); //篮筐内的物品 for (RecyclingBasketItemVo json : itemJsonList) { String tousseName = json.getTousseName(); @@ -2163,7 +2163,7 @@ appItem.setIsInvoice(Constants.STR_NO); } applicationItemList.add(appItem); - addTousseItems.add(json); +// addTousseItems.add(json); appTousseItemMap.put(tousseDefinitionID, appItem); isNewAddTousse = true; }