Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32809 -r32814
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32809)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32814)
@@ -2314,6 +2314,7 @@
 			id :"save_print",
 			text:'<span style="font-weight: bold;">' +  packingBtnText + '</span>',
 			handler : function() {
+				//reloadBasketTreeGrid(false);return
 				packingTousseBtnClick0(this,true);
 //				packing = true;
 //				this.disable();
@@ -4651,12 +4652,15 @@
 				for(var i=0;i<pNode.childNodes.length;i++){
 					var amount = pNode.childNodes[i].get('amount');
 					var maxAmount = pNode.childNodes[i].get('maxAmount');
-					amountSum += parseInt(amount);
+					var checked = pNode.childNodes[i].get('checked');
+					if(checked){
+						amountSum += parseInt(amount);
+					}
 				}
-				if(parentChecked == true && parentAmout <= amountSum){
-					if(parentAmout == amountSum){
-						pNode.remove();
-					}else {
+				//父器械包选中的情况下，子记录必然是选中的
+				if(parentChecked == true){
+					//场景1：父器械包的数量小于子记录的总数量，以父包数量为准，从上到下扣减
+					if(parentAmout < amountSum){
 						var removeArr = [];
 						for(var i=0;i<pNode.childNodes.length;i++){
 							var maxAmount = pNode.childNodes[i].get('maxAmount');
@@ -4683,27 +4687,60 @@
 								pNode.set('maxAmount',parentMaxAmount-parentAmout);
 							}
 						}
+					}else {
+						//场景2：父器械包的数量大于等于子记录的总数量，以子记录的数量为准，根据每条记录修改的数量扣减
+						var removeArr = [];
+						for(var i=0;i<pNode.childNodes.length;i++){
+							var maxAmount = pNode.childNodes[i].get('maxAmount');
+							var amount = pNode.childNodes[i].get('amount');
+							var newAmount = maxAmount - amount;
+							parentMaxAmount = parentMaxAmount - amount;
+							pNode.childNodes[i].set('amount',newAmount);
+							pNode.childNodes[i].set('maxAmount',newAmount);
+							pNode.childNodes[i].set("checked", false);
+							if(newAmount == 0){
+								removeArr.push(pNode.childNodes[i])
+							}
+						}
+						if(parentMaxAmount == 0){
+							pNode.remove();
+						}else {
+							pNode.set('amount',parentMaxAmount);
+							pNode.set('maxAmount',parentMaxAmount);
+							pNode.set('checked',false);
+							for(var j=0;j<removeArr.length;j++){
+								var node = removeArr[j];
+								node.remove();
+							}
+						}
 					}
 				}else {
-					var amountSum = 0;
+					//父器械包未选中的情况下，子记录包含选中和未选中
+					//选中的记录要扣减，未选中的要还原
+					var removeArr = [];
 					for(var i=0;i<pNode.childNodes.length;i++){
 						var amount = pNode.childNodes[i].get('amount');
 						var maxAmount = pNode.childNodes[i].get('maxAmount');
 						var checked = pNode.childNodes[i].get('checked');
 						if(checked == true){
-							if(amount == maxAmount){
-								pNode.childNodes[i].remove();
-							}else {
-								var newAmount = maxAmount - amount;
-								pNode.childNodes[i].set('amount',newAmount);
-								pNode.childNodes[i].set('maxAmount',newAmount);
-								pNode.childNodes[i].set("checked", false);
+							var newAmount = maxAmount - amount;
+							pNode.childNodes[i].set('amount',newAmount);
+							pNode.childNodes[i].set('maxAmount',newAmount);
+							pNode.childNodes[i].set("checked", false);
+							parentMaxAmount = parentMaxAmount - amount;
+							if(newAmount == 0){
+								removeArr.push(pNode.childNodes[i])
 							}
+						}else {
+							pNode.childNodes[i].set('amount',maxAmount);
 						}
-						amountSum += parseInt(pNode.childNodes[i].get('amount'));
 					}
-					pNode.set('amount',amountSum);
-					pNode.set('checked',false);
+					pNode.set('amount',parentMaxAmount);
+					pNode.set('maxAmount',parentMaxAmount);
+					for(var j=0;j<removeArr.length;j++){
+						var node = removeArr[j];
+						node.remove();
+					}
 				}
 			});
 		}