预装箱单列表导出

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1428,23 +1428,27 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         cell.setCellStyle(cellStyle4);
                     }
                 }
-                CellRangeAddress region2 = new CellRangeAddress( mainLength+1, mainLength+1,6, 5+list.getSizeTables().size());
-                sheet.addMergedRegion(region2);
+                if((5+list.getSizeTables().size())-6>0){
+                    CellRangeAddress region2 = new CellRangeAddress( mainLength+1, mainLength+1,6, 5+list.getSizeTables().size());
+                    sheet.addMergedRegion(region2);
+                }
                 row = sheet.createRow(mainLength+1);
                 for (int i=0;i<x;i++){
                     Cell cell = row.createCell(i);//横向
                     cell.setCellStyle(cellStyle);
-                    if(i>6&&i<5+list.getSizeTables().size()){
+                    if(i>=6&&i<6+list.getSizeTables().size()){
                         //row.createCell(6).setCellValue("size");
                         Cell cell2= row.createCell(6);
                         cell2.setCellStyle(cellStyle2);
+                        System.out.println("第"+(mainLength+1)+"行数据的smallPo\t"+list.getOrderNumber());
                         cell2.setCellValue("size");
                         continue;
                     }else if(i<6){
                         cell.setCellValue(args2[i]);
                         cell.setCellStyle(cellStyle);
                     }
-                    else if(i>5+list.getSizeTables().size()&&i<10+list.getSizeTables().size()){
+                    else if(i>=5+list.getSizeTables().size()&&i<9+list.getSizeTables().size()){
+                        System.out.println("i\t"+i);
                         cell.setCellValue(args2[i-list.getSizeTables().size()]);
                         cell.setCellStyle(cellStyle);
                     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -1105,7 +1105,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}
 		}
 		for (SyPreAssembledPackingList entity : lists){//主表获取子表数据
-			System.out.println("entity.name\t"+entity.getInventoryCurrencyName());
 			SyPreAssembledPackingList list=bigDecimalMaps.get(entity.getGroupName());
 			entity.setTotal(list.getTotal());
 			//entity.setPrice(list.getPrice());