Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r30271 -r30351 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30271) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30351) @@ -6242,15 +6242,18 @@ recycled = true; } } - } + } if(!recycled && recyclingStatus != "已回收" && recyclingStatus != '已接收'){ if(applicationitems[i].diposable == '否' && applicationitems[i].isRecycling == '是' && applicationitems[i].tousseType != '敷料包' && applicationitems[i].tousseType != '自制物品'){ var errorDamageQmKey = applicationitems[i].errorDamageQmKey; if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){ var timeStr = new Date().getTime(); errorDamageQmKey = applicationitems[i].tousseDefinitionId + "_" + timeStr; } - var recyclingAmount = applicationitems[i].recyclingTempAmout || 0; + var recyclingAmount = applicationitems[i].recyclingTempAmout; + if(!recyclingAmount){ + recyclingAmount = applicationitems[i].amount; + } // 如果状态为已清点,则将回收数量改为已清点的数量,显示在界面上 if (recyclingStatus == '已清点'){ recyclingAmount = applicationitems[i].tallyAmount; @@ -6275,7 +6278,8 @@ tousseRemark : '', errorDamageQmKey : errorDamageQmKey, spelling:applicationitems[i].spelling - }; + }; + console.log(toussItem) addToussItem(toussItem,false); canTerminateTousseItemIds.push(applicationitems[i].id); row++;