Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28744 -r28745 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28744) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28745) @@ -1675,43 +1675,42 @@ isExist = true; } }); + var isThereIdentificationCard = '否'; + if(td.isDisableIDCard == "否"){ + isThereIdentificationCard = '是'; + } + var tmpRow = $("#tousseItemTable > tbody > tr").length; //获取子元素,不包含孙子及以下的元素 + var timeStr = new Date().getTime(); + var errorDamageQmKey = td.id + "_" + timeStr; + var toussItem = { + row: tmpRow, + tousseItemId: '', + tousseName: td.name, + tousseDefinitionID: td.id, + applicationAmount: 0, + recycleAmount: 1, + loadedAmount: 0, + isCleanedEntirely: td.isCleanedEntirely, + tousseType: td.tousseType, + isThereIdentificationCard: isThereIdentificationCard, + isApplyEntireTousse: td.isApplyEntireTousse, + urgentAmount : 0, + tousseRemark:'', + errorDamageQmKey : errorDamageQmKey, + barcode : ti.barcode + }; if(!isExist){ - var isThereIdentificationCard = '否'; - if(td.isDisableIDCard == "否"){ - isThereIdentificationCard = '是'; - } - var tmpRow = $("#tousseItemTable > tbody > tr").length; //获取子元素,不包含孙子及以下的元素 - var timeStr = new Date().getTime(); - var errorDamageQmKey = td.id + "_" + timeStr; - var toussItem = { - row: tmpRow, - tousseItemId: '', - tousseName: td.name, - tousseDefinitionID: td.id, - applicationAmount: 0, - recycleAmount: 1, - loadedAmount: 0, - isCleanedEntirely: td.isCleanedEntirely, - tousseType: td.tousseType, - isThereIdentificationCard: isThereIdentificationCard, - isApplyEntireTousse: td.isApplyEntireTousse, - urgentAmount : 0, - tousseRemark:'', - errorDamageQmKey : errorDamageQmKey, - barcode : ti.barcode - }; addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle); - addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle); - //清除已删除的包 - cleanDeleteTousseItem(td.id); - addErrorDamageRemark(ti,tmpRow); - //未补充的丢失报损 - loadUnSupplementMaterial(msg,tmpRow,ti.barcode); - var orgUnitName = $('#depart').val(); - var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); - }else { - putTousseInTheBasket(index) } + addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle); + //清除已删除的包 + cleanDeleteTousseItem(td.id); + addErrorDamageRemark(ti,tmpRow); + //未补充的丢失报损 + loadUnSupplementMaterial(msg,tmpRow,ti.barcode); + var orgUnitName = $('#depart').val(); + var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg); + } }else{ //扫描标识牌实例条码 barcode = msg.idCardInstance.barcode;