From 2bd7650d4868b8c6510a25e9f0bb1b0bdfe96311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 28 Sep 2020 11:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC=E7=BA=B3po?= =?UTF-8?q?jo=E4=B8=AD=E6=89=80=E6=9C=89Double=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/IfDefectData.java | 4 +++- .../i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 +++- .../i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java | 4 +++- .../i3plus/pojo/mes/bean/IfProductOffLine.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 +++- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardEquDetail.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 4 +++- .../i3plus/pojo/mes/bean/MesBoardWorkCell.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 +++- .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesCustomerPart.java | 4 +++- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesLocation.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 8 +++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesPackageTrans.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesPartSample.java | 4 +++- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 ++++-- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/bean/MesProdWorkCenter.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 7 ++++-- .../pojo/mes/bean/MesQcOrderApprovalStatus.java | 4 +++- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 7 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderBom.java | 4 +++- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++++--- .../i3plus/pojo/mes/bean/MesQueueShipping.java | 4 +++- .../pojo/mes/bean/MesQueueShippingDetail.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 +++- .../i3plus/pojo/mes/bean/MesScatterPartCfgBom.java | 2 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 4 +++- .../pojo/mes/bean/MesSpcControlCoefficient.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java | 10 ++++++--- .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 5 +++-- .../i3plus/pojo/mes/bean/MesTorqueDetail.java | 10 ++++++--- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 7 ++++-- .../pojo/mes/bean/MesWorkCellPointGroup.java | 7 ++++-- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 25 +++++++++++++++------- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 25 +++++++++++++++------- 63 files changed, 271 insertions(+), 110 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index ae079bb..289babc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 98d4fc0..991b3a1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 280de6b..bab82d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("包装批次") private String lotNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index e26bbcd..005e0d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable { @ApiParam("子物料编码") private String itemPartNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("拉动数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index d1dcee7..001d4cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,7 +43,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("包装条码") private String packageNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -66,7 +68,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 74de05a..25c6e0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index c9b462d..4693daa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料物料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index bb50de6..561bd95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,7 +47,8 @@ public class IfRawPartData extends BaseBean implements Serializable { @ApiParam("原料条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 16462e9..6902d49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "纵坐标") private Double yAxes = 0d; 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 2df2ad6..80d3a4e 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("时段产能") private Integer hourCapacity; - @Column(name = "STOP_TIME") + @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("停机时间") private Double stopTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 59d5305..1140335 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a5a8a52..96d5dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index aec9dcf..62e56c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 92bcd86..71e21af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @ApiParam("客户物料颜色") private String customerPartColor; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 26ca667..54d14d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6a682d7..d57df5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("生产工单号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 3bbe40e..06a48ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index b17f81d..00839db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String keyDataName; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 752cdd2..c7a6e6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 581368f..2ab848c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 698ffde..0e42446 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable { @ApiParam("模具代码") private String mouldCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 43454da..bd5d000 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @Column(name = "OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE") private Double oee; - @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE目标值") private Double targetOee; - @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE警戒值") private Double minOee; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index bc7b401..5637728 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index dac14a4..37a9793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable { @ApiParam("包装规格名称") private String specName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") private Double qty = 0d; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量2", example = "0") private Double qty2; - @Column(name = "QTY3") + @Column(name = "QTY3", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量3", example = "0") private Double qty3; - @Column(name = "QTY4") + @Column(name = "QTY4", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量4", example = "0") private Double qty4; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 4c1f98a..e1e09fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "PACK_SPEC_QTY") + @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("包装规格数量") private Double packSpecQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java index 230f503..77c9ed0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index f26050e..95ae538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; - @Column(name = "PART_SPEC_QTY") + @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("标准包规数量") private Double partSpecQty; @@ -128,7 +130,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "包装数量") private Double qty2; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java index 4b756ee..9ad4d4b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index ac42795..7689354 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable { @ApiParam("关联物料号") private String itemPartNo; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index d5f6ed3..55bd48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,11 +53,13 @@ public class MesPlanOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; - @Column(name = "DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("分解数量") private Double decomposeQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 94ceddd..91b3ecd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -68,7 +68,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String kpSn; - @Column(name = "KP_QTY") + @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "原材料数量", example = "0") private Double kpQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index ed640d7..b463839 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("料箱编号") private String rackNo; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9a1af3..4cd5e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 0f176b5..76c61d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6c488a..2a00ea2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -104,11 +105,13 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测值配置编号") private String checkCfgNo; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 0ff6d06..ed50194 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,11 +50,13 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @Column(name = "FINISH_QTY") + @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已检数量") private Double finishQty = 0D; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java index c1774c7..2b8d481 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -45,7 +46,8 @@ public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 6fefde1..fb90c4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -80,11 +81,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("已检数量") private Integer finishQty; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 4a6ca87..8035a05 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("车号") private String carNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 5ecb56c..dd46d65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index cde084a..93f729c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..04d6155 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("选配码") private String vehicleCode; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 5177ba9..f7eedab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("道口") private String dockNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 88771e3..5162f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index e1066b7..61ad875 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index dff8934..1a8a0d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,11 +49,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -112,7 +115,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; - @Column(name = "FINSIH_QTY") + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已生产数量") private Double finsihQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index bc23151..3337e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 6f0005e..575899c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,11 +68,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "qty") + @Column(name = "qty", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index ee3e3b5..dd7a8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index fd2e7c3..f1b5039 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -64,7 +64,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable { @ApiParam("零件标志值") private String partFlagValue; - @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "用量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index a95f2be..f562fd3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -162,11 +163,13 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("是否截至顺序号") private Integer isEndSeq; - @Column(name = "MULTIMEDIA_PLUG_QTY") + @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; - @Column(name = "QUALIFIED_COUNT") + @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("应收合格数") private Double qualifiedCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8263d3e..6f4c169 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,7 +70,8 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工单编号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 3fd79bb..fe879fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("下班时间") private String endTime; - @Column(name = "WORK_TIMES") + @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("作业时长") private Double workTimes; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ef567e2..ae77fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesShiftRest extends BaseBean implements Serializable { @ApiParam("开始时间") private String startTime; - @Column(name = "REST_TIMES") + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java index 4c896fc..a90ab6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,7 +45,8 @@ public class MesSpcControlCoefficient extends BaseBean implements Serializable { @ApiParam("系数描述") private String coefficientDesc; - @Column(name = "COEFFICIENT_VALUE") + @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("系数值") private Double coefficientValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java index 774a869..f1c2cfd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,15 +37,18 @@ public class MesSpcKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String kdName; - @Column(name = "NOMINAL_VALUE") + @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公称值") private Double nominalValue; - @Column(name = "SPEC_USL") + @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格上限") private Double specUsl; - @Column(name = "SPEC_LSL") + @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格下限") private Double specLsl; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 7cd1e59..e159d8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -57,7 +57,7 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; @@ -86,7 +86,8 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "绑定物料类型") private Integer bindPartType = 20; - @Column(name = "FEED_WARNING_QTY") + @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "投料预警值") private Double feedWarningQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 56743f5..e303080 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -35,15 +36,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大值") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小值") private Double lowerLimit; - @Column(name = "TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 571dd6c..0739b8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -70,7 +71,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位等级") private Integer grade; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 9ab0cb3..fb8ef53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index b539f74..4ca4471 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,11 +52,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("主队列编号") private String orderNo; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0d056b6..7582002 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,23 +51,28 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -146,15 +152,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6213888..18be551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,23 +48,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -139,15 +145,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty;