Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r40718 -r40725
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40718)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40725)
@@ -2463,9 +2463,10 @@
 				listeners: {
 					beforeedit: function (editor, context, eOpts) {
 						var record = context.record;
-						// if (record.data.errors.length > 0 || record.data.damages.length > 0) {
-						// 	return false;
-						// }
+						var text = record.raw.text || '';
+						if (!record.get('leaf') && text == '无篮筐汇总') {
+							return false;
+						}
 					},
 					afteredit: function (editor, context, eOpts) {
 						var record = context.record;
@@ -2479,6 +2480,9 @@
 						var unPackingAmount;
 						if (context.grid.id == 'waitPackingTreeGrid') {
 							parentUnPackingAmount = record.parentNode.get('unPackingAmount');
+							if(record.raw.text = '无篮筐汇总'){
+								parentUnPackingAmount = record.parentNode.get('amount')
+							}
 							maxAmount = record.raw.maxAmount;
 							unPackingAmount = record.get('unPackingAmount');
 						} else {
@@ -6464,7 +6468,7 @@
 									return true;
 								}
 							}else {
-								if(tousseName !== pTousseName){
+								if(tousseName !== pTousseName && pTousseName !== ''){
 									return true;
 								}
 							}