From 606653ec0c1c53a5c96758c32be8c0a9f46abf6c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 8 Jul 2021 13:54:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=EF=BC=8C=E7=8F=AD=E6=AC=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 6060bdd..45541ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -241,6 +241,14 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctNo; + @Column(name="WO_NO") + @ApiParam("ERP工单号") + public String woNo; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 2521606f5b9a4ae4dcca53aad84a054ed8df2bda Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 8 Jul 2021 15:43:13 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=A0=E6=8E=89=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/MesDefectRecord.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java | 1 - .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 1 - .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 5 +---- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 1 - .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java | 5 +---- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 2 -- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java | 2 -- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 3 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java | 2 -- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 4 +--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 4 +--- 13 files changed, 7 insertions(+), 30 deletions(-) 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 c334517..aa811fc 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 @@ -29,8 +29,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "SERIAL_NUMBER") }) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java index 80bf60d..59937ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_LOCK_CACHE", indexes = { @Index(columnList = "JIT_ACTUAL_NO"), - @Index(columnList = "WO_TYPE"), @Index(columnList = "STATUS") }) @Api("MES_JIT队列锁定池") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index 834816f..842037c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_JIT_ORDER_CACHE", indexes = { @Index(columnList = "JIT_ACTUAL_NO"), - @Index(columnList = "WO_TYPE"), @Index(columnList = "STATUS") }) @Api("MES_JIT队列订单池") 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 60ff8fd..73f6281 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 @@ -27,13 +27,10 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), - @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "WORK_CENTER_CODE"), - @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "WORK_ORDER_NO") + @Index(columnList = "WORK_CELL_CODE") }) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { 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 0f467f2..1001690 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 @@ -29,9 +29,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("客户JIT生产队列散件清单") public class MesQueueJitActualBom extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index ac002dd..43c1799 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -27,7 +27,6 @@ import java.io.Serializable; @Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = { @Index(columnList = "JIS_ACTUAL_NO"), - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO"), @Index(columnList = "PRODUCE_CTGY_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index ca66e1a..b56f6e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -27,10 +27,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = { - @Index(columnList = "JIS_PLAN_NO"), - @Index(columnList = "ORGANIZE_CODE"), - @Index(columnList = "PRODUCE_CTGY_CODE"), - @Index(columnList = "PART_NO") + @Index(columnList = "JIS_PLAN_NO") }) @Api("MES_客户JIT预装队列明细") public class MesQueueJitPlanDetail extends BaseBean implements Serializable { 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 aecb239..bcc8308 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 @@ -28,8 +28,6 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO"), - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) 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 ebf2f29..9bf9ff4 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 @@ -28,9 +28,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_BOM", indexes = { - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "ORDER_NO"), - @Index(columnList = "PART_NO"), @Index(columnList = "PRODUCE_CTGY_CODE") }) @Api("MES_生产队列散件清单") 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 3816fc1..8f57b8f 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 @@ -30,8 +30,7 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO"), @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "QUEUE_GROUP_NO"), - @Index(columnList = "PRODUCE_CATEGORY_CODE") + @Index(columnList = "QUEUE_GROUP_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"}) }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java index 01a4829..d426b22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetailRecord.java @@ -26,9 +26,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = { - @Index(columnList = "ORDER_NO"), @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "QUEUE_GROUP_NO"), @Index(columnList = "PRODUCE_CATEGORY_CODE") }) @Api("生产队列明细记录表") 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 dd254da..fffb2db 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 @@ -33,9 +33,7 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), - @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "QUEUE_SEQ"), - @Index(columnList = "QUEUE_DETAIL_SEQ") + @Index(columnList = "WORK_CELL_CODE") }) @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { 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 1f8e24f..873cd2d 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 @@ -28,11 +28,9 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = { - @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE"), - @Index(columnList = "QUEUE_GROUP_NO"), - @Index(columnList = "ORDER_NO") + @Index(columnList = "QUEUE_GROUP_NO") }) @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { 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 03/11] =?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 04/11] =?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 05/11] =?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 { From d2ec6e27a598ce2794179a5150559727226d4d0b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 9 Jul 2021 22:17:37 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5?= 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 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..5831465 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 @@ -211,10 +211,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("包规数量") private Double packageQty; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; @Transient @ApiParam("缺陷代码") From f0c0a4038c3f774923d7ed5724975c761b522670 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 9 Jul 2021 23:22:12 +0800 Subject: [PATCH 07/11] =?UTF-8?q?ua=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 46d5f1e..ac9830d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -6758,4 +6758,37 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPC_TYPE { + + UA(10, "UA"), + DA(20, "DA"); + + private int value; + private String code; + + OPC_TYPE(int value, String code) { + this.value = value; + this.code = code; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + } + } From 09e380d1f2f3d051655e5ac89f7f008eedcf6ab0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 10 Jul 2021 17:08:55 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 37fc2ec..ff9b3c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -50,6 +50,7 @@ public class WmsPOMaster extends BaseBean { */ @Column(name = "PO_TYPE") @ApiParam("单据类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_TYPE.class, refForeignKey = "value", value = "description") public String poType; /** @@ -89,6 +90,7 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生成任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "IS_PART") @@ -121,6 +123,7 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isSn; @Column(name = "CONTAINER_NO") @@ -177,6 +180,7 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("看板状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description") private Integer boardStatus; @Transient From 804401e12c882866afeaec1907e1a6e3e2165a98 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 12 Jul 2021 13:31:43 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ce8d025..3354e36 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -238,6 +238,11 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } From 9910420ea8cd0a2414f002b970fb0a2cdc8163a1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Jul 2021 15:50:31 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 6 ++++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 5dc8c0c..f4f3b4d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -26,4 +26,8 @@ public class CancelPlanRule extends BaseRule { @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; + + @Column(name="RECORD_RIGHT_EDGE") + @ApiParam(value ="记录工作右边界") + private Boolean recordRightEdge; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java index c95f55d..7e820e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java @@ -52,4 +52,8 @@ public class HeuristicOptimize extends BaseRule { @Column(name="OPTIMIZE_INTERVAL") @ApiParam(value ="优化间隔") private String optimizeInterval; + + @Column(name="MAX_WAITING_LIMIT") + @ApiParam(value ="最大等待时间限制") + private Boolean maxWaitingLimit; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 7fce6f7..3235ae8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -68,6 +68,11 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @Column(name="MAX_SPACE_TIME") + @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String maxSpaceTime; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 1008891..7623752 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -166,14 +166,20 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; + @ApiParam(value ="工作左边界") + private Date leftEdge; + + @ApiParam(value ="工作右边界") + private Date rightEdge; + @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean hasOptimized = false; + // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; public BaseOrder getOrder() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 4e7cb39..2ff8c15 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -124,6 +124,12 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="是否组炉") private Boolean hasCominbed = false; + @ApiParam(value ="资源生产开始") + @FieldAnnotation(display = false) + @Transient + @RippleAnnotation(dependence = {"PrevPlan.resProduceBegin"}, method = "calcPositive") + private Date resProduceBegin; + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient From 52b70927b3a5ac6c55c3fe10a2e3d6511b2312d8 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 16 Jul 2021 12:25:19 +0800 Subject: [PATCH 11/11] =?UTF-8?q?ptl=E4=BA=AE=E7=81=AF=E5=A2=9E=E5=8A=A0ba?= =?UTF-8?q?ckoff=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index cdd6725..8eeef68 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -5,16 +5,10 @@ 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.Version; +import javax.persistence.*; import java.io.Serializable; /** @@ -71,4 +65,7 @@ public class PtlControl extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; + @Column(name = "BACKOFF") + @ApiParam("是否需要回调") + private Integer backoff; }