| 
					
				 | 
			
			
				@@ -442,7 +442,9 @@ var rationGLJOprObj = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         sheetCommonObj.cleanData(me.sheet, me.setting, -1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        var rstArr = [], dummyR = {gljId: 0, consumeAmt:0}, newAddArr = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        var rstArr = [], dummyR = {gljId: 0, consumeAmt:0}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            newAddArr = [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            validGlj = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         for (var i = 0; i < result.data.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             dummyR.gljId = result.data[i].ID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             rstArr.push(me.createRationGljDisplayItem(dummyR, result.data[i])); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -461,14 +463,23 @@ var rationGLJOprObj = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     newAddArr.push(rstArr[i]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            me.cache["_GLJ_" + me.currentRationItem.ID] = cacheArr.concat(newAddArr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            //新增的定额人材机,按照输入的编码排序 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            for (let code of codes) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                let fGlj = _.find(newAddArr, function (glj) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    return glj.code === code; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                if (fGlj) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    validGlj.push(fGlj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            me.cache["_GLJ_" + me.currentRationItem.ID] = cacheArr.concat(validGlj); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             let recoveryArr = me.getRecoveryArr(me.tempCacheArr, result.data); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if(recoveryArr.length > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 me.cache["_GLJ_" + me.currentRationItem.ID] = me.cache["_GLJ_" + me.currentRationItem.ID].concat(recoveryArr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         me.showGljItems(me.currentRationItem.ID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        if (newAddArr.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if (validGlj.length > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             me.updateRationItem(function () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 me.sheet.getParent().focus(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             }); 
			 |