From 247240ddda1cb09f328886e7b5c88ec18260b4b6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 13 Nov 2024 16:41:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/plan/controller/ProOrderWorkorderController.java | 2 ++ .../com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 3fbf61a3a..cb30c4264 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/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 { diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 284857d25..bc28b7a3f 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/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 keys = Arrays.asList("batch1", "batch2", "batch3", "batch4"); + List keys = Arrays.asList("batch1", "batch2", "batch3", "batch4","batch5", "batch6"); HashMap mapData = null; int xh=1; for(ProOrderWorkorder data:workorderList){