Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29672 -r29673 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29672) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29673) @@ -6265,8 +6265,6 @@ } createBasketUiElement(basket.containerBarcode,basket.id,basket.containerName,washClassifyType,basket.sequence,isIdCard) - var barcodeArray1 = []; - var idsArray1 = []; for(var j = 0 ; j < basket.classfiedItems.length ; j++){ var ci = record.classifyBaskets[i].classfiedItems[j]; var containerBarcode = record.classifyBaskets[i].containerBarcode; @@ -6333,22 +6331,25 @@ if((ci.tousseInstanceBarcode || '') !== ''){ if(sessionTousseInstance.hasOwnProperty(ci.tousseDefinitionID)){ sessionTousseInstance[ci.tousseDefinitionID].amount++; - sessionTousseInstance[ci.tousseDefinitionID].barcodeArray1.push(ci.tousseInstanceBarcode); - sessionTousseInstance[ci.tousseDefinitionID].idsArray1.push(ci.lastTousseInstanceId); + var barcodeArray = sessionTousseInstance[ci.tousseDefinitionID].barcodeArray1; + barcodeArray.push(ci.tousseInstanceBarcode); + sessionTousseInstance[ci.tousseDefinitionID].barcodeArray1 = barcodeArray; + var idsArray = sessionTousseInstance[ci.tousseDefinitionID].idsArray1; + idsArray.push(ci.lastTousseInstanceId); + sessionTousseInstance[ci.tousseDefinitionID].idsArray1 = idsArray; }else { - barcodeArray1.push(ci.tousseInstanceBarcode); - idsArray1.push(ci.lastTousseInstanceId); sessionTousseInstance[ci.tousseDefinitionID] = { name:ci.name, amount:1,//总数量 barcodeArray:[],//未入筐的条码 idsArray:[],//未入筐的id - barcodeArray1:barcodeArray1,//已入筐的条码 - idsArray1:idsArray1//已入筐的id + barcodeArray1:[ci.tousseInstanceBarcode],//已入筐的条码 + idsArray1:[ci.lastTousseInstanceId]//已入筐的id } } } - } + } + console.log(sessionTousseInstance) } } $('.btn-box').css('display','block');