Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r12684 -r12713
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12684)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12713)
@@ -164,22 +164,25 @@
 //	                	showResult('还有标识牌未补充,请先补充打印标识牌！');
 //	                    return false;
 //	                }
-	                var suppleStr = '';
+	                var materialArray = new Array();
 	                for(var i=0;i<errors.length;i++) {
-	                    if(top.Ext4.getCmp('supplementItem_' + i)!=null){
-	                        if(suppleStr=='') {
-	                            suppleStr += errors[i].materialName + ':';
-	                            suppleStr += top.Ext4.getCmp('supplementItem_' + i).getValue();
-	                        } else {
-	                            suppleStr += ';';
-	                            suppleStr += errors[i].materialName + ':';
-	                            suppleStr += top.Ext4.getCmp('supplementItem_' + i).getValue();
-	                        }
+	                	var inputElement = top.Ext4.getCmp('supplementItem_' + i);
+	                    if(inputElement != null){
+	                    	var m_name = errors[i].materialName;
+	                    	var m_amount = inputElement.getValue();
+	                    	var len = materialArray.length;
+	                    	materialArray[len] = {};
+	                    	materialArray[len].materialName = m_name; 
+	                    	materialArray[len].amount = m_amount; 
 	                    }
 	                }
 	                Ext4.Ajax.request({
 	                    url :  WWWROOT + '/disinfectSystem/packingAction!materialSupplement.do',
-	                    params : {packingTaskId : taskid,suppleStr : suppleStr},
+	                    params : {
+	                    	packingTaskId : taskid,
+	                    	suppleStr : Ext4.encode(materialArray),
+	                    	type : type_lost
+	                    },
 	                    success : function(response, options) {
 	                    	var result = Ext4.decode(response.responseText);
 	                        showResult(result.msg);
@@ -189,7 +192,6 @@
                             	rootNode.cascade(function(n) {
 									if(n.get('leaf') && n.get('taskId') == taskid){
 										n.set('errors',new Array());
-//										n.set('errors',deleteAllErrorsExcludeIDCard(n.get('errors')));
 										return;
 									}
 								 });
@@ -369,24 +371,30 @@
 	                    return false;
 	                }
 	                var notAdditialMaterialNum = 0;//没有补充的材料数量
-	                var suppleStr = '';
+	                
+	                var materialArray = new Array();
 	                for(var i=0;i<damages.length;i++) {
-	                    if(suppleStr.length > 0){
-	                        suppleStr += ";";
-	                    }
-	                    suppleStr += damages[i].materialName + ":"+damages[i].amount;
+	                    var len = materialArray.length;
+                    	materialArray[len] = {};
+                    	materialArray[len].materialName = damages[i].materialName; 
+                    	materialArray[len].amount = damages[i].amount; 
 	                }
-	                if(!suppleStr){
+	                
+	                if(materialArray.length == 0){
 	                    showResult('当前没有可补充的器械或补充的数量为0！');
 	                    return false;
 	                }
 	                Ext4.Ajax.request({
-	                    url :  WWWROOT + '/disinfectSystem/recyclingDamageRecordAction!damageMaterialSupplement.do',
-	                    params : {suppleStr : suppleStr},
+	                	url :  WWWROOT + '/disinfectSystem/packingAction!materialSupplement.do',
+	                    params : {
+	                    	packingTaskId : taskid,
+	                    	suppleStr : Ext4.encode(materialArray),
+	                    	type : type_damage
+	                    },
 	                    success : function(response, options) {
 	                        var obj = Ext4.JSON.decode(response.responseText);
+	                        showResult(obj.msg);
 	                        if(obj.success){
-	                            
 	                        	//更新待装配篮筐数据
                             	var rootNode = Ext4.getCmp('basketTreeGrid').getRootNode();
                             	rootNode.cascade(function(n) {
@@ -396,17 +404,14 @@
 									}
 								 });
 	                            Ext4.getCmp('waitPackingTreeGrid').getStore().reload();
-	                            showResult(obj.msg);
-	                            if(Ext4.getCmp('damageSupplyBtn')){
+	                            /*if(Ext4.getCmp('damageSupplyBtn')){
 	                                notAdditialMaterialNum +=  obj.count;
 	                                if(notAdditialMaterialNum>0){
 	                                    Ext4.getCmp('damageSupplyBtn').setText('补充报损器材(<span style="color:red;font-weight: bold;font-size: 12px;">'+notAdditialMaterialNum+'</span>)');
 	                                }else{
 	                                    Ext4.getCmp('damageSupplyBtn').hide();
 	                                }
-	                            }
-	                        }else{
-	                            showResult(obj.msg);
+	                            }*/
 	                        }
 	                        suppleWin.close();
 	                    },