Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13004 -r13062 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13004) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13062) @@ -166,6 +166,20 @@ changeRecycleAmount(row); } +function cleanDeleteTousseItem(tousseDefinitionID){ + var length = tousseArray.length; + for(var i = 0;i < length ; i++){ + var t_basketBarcode = tousseArray[i].basketBarcode; + var t_amount = tousseArray[i].amount; + var t_tousseDefinitionID = tousseArray[i].tousseDefinitionID; + if(t_basketBarcode == '' && t_amount < 0 && t_tousseDefinitionID == tousseDefinitionID){ + //删除 + tousseArray.splice(i,1); + break; + } + } +} + function deleteTousseItem(row){ $('#tousseItemsTr'+row).hide(); $('#deleted'+row).val('1'); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp =================================================================== diff -u -r12625 -r13062 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 12625) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 13062) @@ -37,6 +37,9 @@ isApplyEntireTousse: isApplyEntireTousse }; window.parent.addToussItem(toussItem); + //已删除又添加该物品jsonArray处理 + window.parent.cleanDeleteTousseItem(tousseDefinitionId); + closeLayer(); }