diff --git a/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java index 8ffb064..204cb9f 100644 --- a/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java @@ -172,7 +172,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { @Override public void exportCableCopTask(ProductionPlanOrderQueryData data, HttpServletResponse response) { - exportOrderExcel(data, ORDER_TYPE_CABLE_COP, "线缆COP任务单", "线缆COP任务单", response); + exportOrderExcel(data, ORDER_TYPE_CABLE_COP, "部件任务单", "部件任务单", response); } @Override @@ -1052,7 +1052,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { throw new I18nException("lc.production.task.type.required"); } if (!StringUtils.hasText(resolveCableCopNodeCodeByTaskType(data.getTaskType()))) { - throw new XJException("线缆/COP任务类型仅支持:线缆自制、COP自制"); + throw new XJException("部件任务类型仅支持:线缆自制、COP自制、其他"); } } else if (ORDER_TYPE_MACHINING.equals(orderType)) { if (!StringUtils.hasText(data.getModelNo())) { @@ -1131,6 +1131,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { if (!StringUtils.hasText(nodeCode)) { nodeList.add(buildNode("lineProduction", "线缆生产", 1)); nodeList.add(buildNode("copProduction", "COP生产", 2)); + nodeList.add(buildNode("otherProduction", "其他", 3)); return nodeList; } nodeList.add(buildNode(nodeCode, resolveCableCopNodeNameByNodeCode(nodeCode), 1)); @@ -1176,6 +1177,9 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { return null; } String value = taskType.trim(); + if (value.contains("其他") || value.contains("其它")) { + return "otherProduction"; + } if (value.contains("线缆")) { return "lineProduction"; } @@ -1192,6 +1196,9 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { if ("copProduction".equals(nodeCode)) { return "COP生产"; } + if ("otherProduction".equals(nodeCode)) { + return "其他"; + } return nodeCode; } @@ -1859,6 +1866,9 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { if ("copProduction".equals(nodeCode)) { return "LC_CABLE_COP_COP_PRODUCTION"; } + if ("otherProduction".equals(nodeCode)) { + return "LC_CABLE_COP_COP_PRODUCTION"; + } return null; } if (ORDER_TYPE_RENOVATION.equals(orderType)) {