From 6c04caf7288a4cb77840072025d22845ca88e2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 22 Nov 2020 17:21:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=A4=A9=E6=B4=A5=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index 2e75537..cbc02b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -81,5 +81,9 @@ public class MesBoardLine extends BaseBean implements Serializable { @ApiParam("是否展示") private Integer isDisplay; + @Column(name = "OEE_RED_LINE_VALUE") + @ApiParam("OEE红线值") + private String oeeRedLineValue; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java index 8bcab46..1d95ab2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java @@ -59,4 +59,7 @@ public class MgnBoardListModel { @ApiParam("产线集合") private List workCenterList; + @ApiParam("平均OEE") + private Double oeePercent; + } From bf51e5bb7ab1f829fbfd8d77c7576e7b249ffb20 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 22 Nov 2020 20:08:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=BA=E5=9B=BA=E5=AE=9A=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index e651958..92d9c88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -28,7 +28,7 @@ public class WmsAutoPurchasePartModel extends Pager { private String unit; @ApiParam("物料数量") - private Integer qty; + private Double qty; @ApiParam("Erp库存地") private String erpWarehouse; @@ -44,8 +44,7 @@ public class WmsAutoPurchasePartModel extends Pager { private Integer preReceivingDay; - - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) { + public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty;