问题修复17

op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java

@@ -191,6 +191,8 @@ public class ProOrderWorkorderController extends BaseController {
         excelCols.add(new ExcelCol("批号2", "batch2", 35));
         excelCols.add(new ExcelCol("批号3", "batch3", 35));
         excelCols.add(new ExcelCol("批号4", "batch4", 35));
+        excelCols.add(new ExcelCol("批号5", "batch5", 35));
+        excelCols.add(new ExcelCol("批号6", "batch6", 35));
         String titleName = "生产排产信息";
         SXSSFWorkbook workbook = null;
         try {

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -1501,7 +1501,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         if(CollectionUtils.isEmpty(workorderList)){
             return null;
         }
-        List<String> keys = Arrays.asList("batch1", "batch2", "batch3", "batch4");
+        List<String> keys = Arrays.asList("batch1", "batch2", "batch3", "batch4","batch5", "batch6");
         HashMap mapData = null;
         int xh=1;
         for(ProOrderWorkorder data:workorderList){