From adfec8957d74a61349ef331af393d49658cdd3eb Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 9 Jul 2021 10:11:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E6=97=B6=E6=AE=B5=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 9555a82..e14fff5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -54,6 +49,10 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @ApiParam("是否跨天") private Integer isSpanday; + @Column(name = "SEQ") + @ApiParam("顺序") + private String seq; + @Transient @ApiParam("班次名称") private String shiftName; From 5c62f1b0d555a9e74474a0a3f5699c863bdbc457 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 9 Jul 2021 11:21:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E6=97=B6=E6=AE=B5=E6=96=B0=E5=A2=9E=E9=A1=BA=E5=BA=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index e14fff5..01e3cda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -51,7 +51,7 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("顺序") - private String seq; + private Integer seq; @Transient @ApiParam("班次名称") From 4297c59ef497cf1d5fd29745de3f54887a1c81b6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 9 Jul 2021 11:23:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ---- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) 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 f946878..857ba08 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 @@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -13,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.math.BigDecimal; /** * @Description: @@ -33,7 +30,6 @@ import java.math.BigDecimal; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "MODIFY_DATE_TIME"), - @Index(columnList = "PART_NO"), @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) 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 ad8be6a..164d56f 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 @@ -32,9 +32,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = { @Index(columnList = "JIS_PLAN_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("MES_客户JIT预装队列BOM") public class MesQueueJitPlanBom extends BaseBean implements Serializable {