Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28344 -r28346 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28344) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28346) @@ -1567,7 +1567,7 @@ if($('#depart').attr('value') == ''){ $('#depart').val(msg.tousseInstance.locationForDisplay) $('#departCode').val(msg.tousseInstance.location) - } + } var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2; // 对于已废弃的包,不检查其位置和所属科室的信息 if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart && msg.tousseInstance.status != '已废弃'){ @@ -1608,8 +1608,8 @@ } var loadedAmount = tousseIntoBasketFunction("",td.id,td.name,1,td.isCleanedEntirely,orgUnitName,barcode,"",td.tousseType); - - if(loadedAmount > 0){ + + if(loadedAmount > 0){ var tousseIsExist = false; $('#tousseItemTable').children().first().children().each(function(i,element){ if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){ @@ -2477,7 +2477,6 @@ return 0; } } - if(recycleAmount < 0){ var loadedAmount = parseInt($('#loadedAmount'+row).val()); var sum = 0; @@ -2604,7 +2603,6 @@ }else { return 0; } - if(isCleanedEntirely == "否"){ var materials = data.materials; if(materials == null){ @@ -2651,8 +2649,9 @@ idCardBarcode: idCardBarcode, basketGroupBarcodes: data.basketBarcode, putBasketMaxAmount : data.putBasketMaxAmount - }; - addBasketItemElement(basketItem); + }; + addBasketItemElement(basketItem); + refreshAllBasketTotalNum() } } });