From 13f712161047ae2c6ff255f012b4ed1e61e105ff Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Jul 2020 18:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 98a5b80..adcf618 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1967,7 +1967,7 @@ public class MesEnumUtil { MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), - BOARD_PLAN_CAPACITY(520, "BOARD_PLAN_CAPACITY", "计划产能看板导入"); + BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"); private int value; private String service; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 3af83ef..fec2dbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -66,7 +66,7 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @Column(name = "STOP_TIME") @ApiParam("停机时间") - private Integer stopTime; + private Double stopTime; @Column(name = "ACTUAL_CAPACITY") @ApiParam("今日产量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 9d66acd..72615c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -49,7 +49,7 @@ public class BoardModel { private Integer monthPlanCapacity; @ApiParam("停机时间") - private Integer stopTime; + private double stopTime; @ApiParam("时段产能") private Integer hourCapacity;