Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r17622 -r17989
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17622)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17989)
@@ -1241,6 +1241,18 @@
 		typeAhead : false,
 		allowBlank : true
 	},{
+		columnWidth :.5,
+		xtype : 'textfield',
+		fieldLabel : '备注',
+		componentCls:'formItemMgn',
+		id : 'remark',
+		name : 'remark',
+		maxLength : '100',
+		labelWidth:60,
+		anchor : '95%',
+		allowBlank : true,
+		labelAlign:'right'
+	},{
 		columnWidth :.99,
 		xtype : 'panel',
 		border: false,
@@ -1703,6 +1715,12 @@
 		hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 	}
 }
+function getSelAmount(){
+	var basketTree = Ext4.getCmp('basketTreeGrid');
+	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+	var selAmount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
+	return selAmount;
+}
 // 设置包装类型只读
 function setPackageTypeReadOnlyByCondition(){
 	 var bRet = false;
@@ -1740,6 +1758,19 @@
 	 return bRet;
 
 }
+// 清空备注
+function clearRemarkByCondition(){
+//	 var bRet = false;
+//	 var basketTree = Ext4.getCmp('basketTreeGrid');
+//	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+//	 var selNodes = basketTree.getView().getChecked();
+//	 var selLength = selNodes.length;
+//	 
+//	 var selCount = basketTree.getView().getChecked().length + waitPackingTreeGrid.getView().getChecked().length;
+//	 if(selCount > 1){
+//		 Ext4.getCmp('remark').setValue();
+//	 }
+}
 function deselectCheckAll(){
 	var checkAllTaskNode = Ext4.getCmp('checkAllTaskNode');
 	checkAllTaskNode.setValue(false);
@@ -1894,6 +1925,7 @@
     packed = packingTousse(false,basketBarcode,taskId,tousseName,tousseType,1,packageType,sterilingType,supplierName,department,urgentAmount);
     if(packed){
     	addTaskItemsToDelete(tousseItemsToDelete,tousseName,taskId,1);
+    	Ext4.getCmp('remark').setValue();
     }
     // 一次打印
 	printLabelsAfterPacking();
@@ -2028,6 +2060,43 @@
 	 }
 	 return bRet;
 }
+function validateRemark(){
+	
+	var remark = Ext4.getCmp('remark');
+	if(isUndefinedOrNullOrEmpty(remark)){
+		return true;
+	}
+	var totalPackingAmount = 0;
+	var basketTree = Ext4.getCmp('basketTreeGrid');
+	 var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+	 {
+		 var selNodes = basketTree.getView().getChecked();
+		 var selLength = selNodes.length;
+		// 遍历器械包节点
+		 Ext4.each(selNodes, function(pNode){
+			 var packingAmount = pNode.get('amount');
+			 if(packingAmount > 0){
+				 totalPackingAmount += packingAmount;
+			 }
+		});
+	 }
+	 {
+       	// 选择统计的敷料包选项全打印
+       	var selNodes = waitPackingTreeGrid.getView().getChecked();
+       	var selLength = selNodes.length;
+   		Ext4.each(selNodes, function(pNode) {
+   			var packingAmount = pNode.get('amount');
+			 if(packingAmount > 0){
+				 totalPackingAmount += packingAmount;
+			 }
+   		});
+	 }
+	 if(totalPackingAmount > 1){
+		 showResult("备注不为空时，只能装配一个包!");
+	     return false;
+	 }
+	 return true;
+}
 var packing = false;
 // 装配按钮调用
 function packingTousseBtnClick(){
@@ -2040,7 +2109,10 @@
 //	if(ifCheckedPackingTasksHaveEmptyPackageType()){
 //		return ;
 //	}
-	
+	// 备注不为空时只能装配一个包实例
+	if(!validateRemark()){
+		return;
+	}
 	// 首先处理标识牌的打印
 	var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode');
 	if(scanScanIDCardBarcode.isVisible(true)){
@@ -2243,6 +2315,7 @@
           showResult('请选择要打印的行!');
        }
 	 }
+	 Ext4.getCmp('remark').setValue();
      Ext4.getCmp('sterilingType').setValue(null);
      Ext4.getCmp('packageType').setValue(null);
      Ext4.getCmp('packageType').enable();
@@ -2315,7 +2388,7 @@
     		return false;
     	}
     }
-    
+    var remark = Ext4.getCmp('remark').getValue();
     var params = {
     		taskIds: taskIds,
     		inspector: inspector,
@@ -2342,7 +2415,8 @@
 			frequency: frequency,
 			confirmContinue: '',
 			urgentAmount: urgentAmount,
-			tousseWeight: tousseWeight
+			tousseWeight: tousseWeight,
+			remark: remark
 	}
     DWREngine.setAsync(false);
     // 调用服务端的装配器械包的代码
@@ -2598,6 +2672,7 @@
       checkchange:function( node, checked, eOpts ){
         	 resetScanIDCardBarcodeVisibility(node);
         	 setPackageTypeReadOnlyByCondition();
+        	 clearRemarkByCondition();
         	 if(!checked){
         		 deselectCheckAll();
         	 }
@@ -2858,6 +2933,7 @@
         checkchange:function( node, checked, eOpts ){
         	resetScanIDCardBarcodeVisibilityWaitPacking(node);
         	setPackageTypeReadOnlyByCondition();
+        	clearRemarkByCondition();
         },
         itemcontextmenu : taskItemMenu
         },