diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index b5e57f6..116abff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -62,7 +62,7 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE") + @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index b912f5c..6c1beda 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -22,11 +22,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) + } +) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 0684e76..863a6fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,20 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) + } +) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index bb13a85..bb60da6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -24,11 +24,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 6c7b997..472f846 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -27,14 +27,15 @@ import java.io.Serializable; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})} + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) + } ) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index e93c938..c8dcab7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -25,11 +25,14 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 1af12f5..a266608 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -25,15 +25,18 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a4d542..f2162b2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8065877030194822855L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 4d63bfa..8382b3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -23,12 +23,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("客户信息") public class MesCustOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 4990079075654538033L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("订单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 5de7a4a..8c1b09f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -27,12 +27,14 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO"}) }) @Api("设备作业任务") public class MesEquTask extends BaseBean implements Serializable { private static final long serialVersionUID = -3351277499164455197L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 43dfa07..e164c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -27,16 +27,18 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO", "EQUIPMENT_CODE"}) }) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 3317290109159353376L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; - @Column(name = "EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE", nullable = false) @ApiParam("设备代码") private String equipmentCode; 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 94a9281..79fe8cb 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 @@ -22,11 +22,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +}) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index de95f5d..5c44dcd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; 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 955791a..01be425 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 @@ -24,11 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6773005820598583458L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; 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 81f7d5e..9f84b79 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 @@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -33,11 +30,14 @@ import java.io.Serializable; @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"}) }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6984193022328810942L; - @Column(name = "SERIAL_NUMBER") + // 联合唯一索引必须加:, nullable = false + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") private String serialNumber; @@ -65,7 +65,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件号") private String itemPartNo; - @Column(name = "KP_SN") + @Column(name = "KP_SN", nullable = false) @ApiParam("原材料条码") private String kpSn; 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 7619062..c0f20d1 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 @@ -29,12 +29,13 @@ import java.math.BigDecimal; @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = -1630924042562178494L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; 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 81604e5..8b8a70c 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 @@ -29,11 +29,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) }) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452106180601417L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; 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 dff413d..589f92e 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 @@ -25,15 +25,17 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 7840873844253353896L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; 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 1e50789..30d074e 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 @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo;