Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r29581 -r29603 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29581) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 29603) @@ -3338,7 +3338,7 @@ // 遍历器械包节点 Ext4.each(selNodes, function(pNode){ var packingAmount = pNode.get('amount'); - if(packingAmount > 0){ + if(packingAmount > 0 && pNode.childNodes.length == 0){ totalPackingAmount += packingAmount; } }); @@ -3349,7 +3349,7 @@ var selLength = selNodes.length; Ext4.each(selNodes, function(pNode) { var packingAmount = pNode.get('amount'); - if(packingAmount > 0){ + if(packingAmount > 0 && pNode.childNodes.length == 0){ totalPackingAmount += packingAmount; } }); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp =================================================================== diff -u -r29591 -r29603 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 29591) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 29603) @@ -195,7 +195,7 @@ var newUnconfirmedAmount = 0; var amountNotNull = false; for(var j = 0 ; j < newJsonArray.length ; j++){ - if(newJsonArray[j].materialDefinitionId == materialDefinitionId && newJsonArray[j].tousseBarcode == tousseBarcode){ + if(newJsonArray[j].materialDefinitionId == materialDefinitionId){ newUnconfirmedAmount += newJsonArray[j].amount; } } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js =================================================================== diff -u -r29591 -r29603 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 29591) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 29603) @@ -96,7 +96,8 @@ {name : 'materialCost'}, {name : 'washOperator'}, {name : 'errorRemark'}, - {name : 'washTime'}, + {name : 'washTime'}, + {name : 'additionalPerson'}, {name : 'additionalTime'} ];