From a94b5dd0b034269ef27b864f0c408679ceb7e007 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 1 Dec 2020 21:37:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cbc02b8..0768d03 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 @@ -48,7 +48,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "PLAN_TAKT") @ApiParam("计划节拍") - private Integer planTakt; + private Double planTakt; @Column(name = "PASS_PERCENT_MAX") @ApiParam("良品率上限") @@ -60,7 +60,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "CAR_RUN_TIME") @ApiParam("小车运行时间（分）") - private Integer carRunTime; + private Double carRunTime; @Column(name = "TEST_CAR_SUM") @ApiParam("调试车数") From 785152dbfa1c47d3c136e8a1759a7d5184ed8233 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 1 Dec 2020 23:11:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E4=BA=88=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 1496c14..b49778e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -80,8 +80,9 @@ public class WmsInterfaceDataRecord extends BaseBean { @Column(name = "ERP_DOC_NO") private String erpDocNo; + // 必须有默认值 @ApiParam("ERP状态代码") - @Column(name = "ERP_STATUS_CODE") + @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''") private String erpStatusCode; @ApiParam("ERP状态描述")