| 
					
				 | 
			
			
				@@ -336,7 +336,7 @@ public class OrderGsmExportUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * 经编机规格分布 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 经编机匹配明细 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param sheet   sheet 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param bomList 库存 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -414,7 +414,7 @@ public class OrderGsmExportUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     * 白坯布库存--全量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 经编规格分布 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param sheet sheet 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param infos 库存 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -444,29 +444,29 @@ public class OrderGsmExportUtil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             cells[13].setCellValue(info.getFd24()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             cells[14].setCellValue(info.getFd25()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[15].setCellValue(info.getCd10()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[16].setCellValue(info.getCd11()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[17].setCellValue(info.getCd12()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[18].setCellValue(info.getCd13()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[19].setCellValue(info.getCd14()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[20].setCellValue(info.getCd15()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[21].setCellValue(info.getCd16()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[22].setCellValue(info.getCd17()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[23].setCellValue(info.getCd18()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[24].setCellValue(info.getCd19()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[15].setCellValue(info.getCd10()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[16].setCellValue(info.getCd11()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[17].setCellValue(info.getCd12()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[18].setCellValue(info.getCd13()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[19].setCellValue(info.getCd14()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[20].setCellValue(info.getCd15()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[21].setCellValue(info.getCd16()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[22].setCellValue(info.getCd17()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[23].setCellValue(info.getCd18()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[24].setCellValue(info.getCd19()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+// 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[25].setCellValue(info.getFd19()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[26].setCellValue(info.getFd20()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[27].setCellValue(info.getFd21()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[28].setCellValue(info.getFd22()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//            cells[29].setCellValue(info.getFd23()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[25].setCellValue(info.getFd19()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[26].setCellValue(info.getFd20()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[27].setCellValue(info.getFd21()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[28].setCellValue(info.getFd22()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[29].setCellValue(info.getFd23()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[30].setCellValue(info.getFd7()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[31].setCellValue(info.getFd8()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[32].setCellValue(info.getFd9()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[33].setCellValue(info.getFd10()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[34].setCellValue(info.getFd11()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            cells[35].setCellValue(info.getFd12()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[15].setCellValue(info.getFd7()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[16].setCellValue(info.getFd8()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[17].setCellValue(info.getFd9()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[18].setCellValue(info.getFd10()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[19].setCellValue(info.getFd11()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cells[20].setCellValue(info.getFd12()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |