From bc5beeba7d9c8b8fa2e2b8521384700ae9dfb98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Dec 2019 10:26:03 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=82=E9=85=8D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 14 ++++++++------ .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 14 ++++++++------ .../i3plus/pojo/softswitch/bean/BsSuitRecordParam.java | 5 ++++- .../i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java | 10 +++++----- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 403d234..fc7941e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -9,11 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_DATA_DETAIL") +@Table(name = "BS_SUIT_DATA_DETAIL",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), + @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME") +}) @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 260df43..bf91b56 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -9,11 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Transient; + +import javax.persistence.*; import java.util.List; /** @@ -28,7 +25,12 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_RECORD") +@Table(name = "BS_SUIT_RECORD",indexes = { + @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), + @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME"), + @Index(name="index_process_time",columnList = "PROCESS_TIME"), +}) @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index 5b384ce..979b61d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -9,6 +9,7 @@ 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; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "SUIT_RECORD_PARAM") +@Table(name = "SUIT_RECORD_PARAM",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index e00832f..b2cebdb 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -9,10 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : 请求适配记录 @@ -26,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_SUIT_REQUEST_RECORD") +@Table(name = "BS_SUIT_REQUEST_RECORD",indexes = { + @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), +}) @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { From 222e1b020d1227fa799643c2a5e2528ced4b9bac Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 19:27:12 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 2589083..0eaaeaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; - @Column(name="TYPE") + @Column(name="IMPORT_TYPE") @ApiParam(value ="导入类型") @FieldAnnotation(defaultValue = "REPLACE") - private ApsEnumUtil.IMPORT_DETAIL_TYPE type; + private ApsEnumUtil.IMPORT_DETAIL_TYPE importType; + + @Column(name="SKIP_ROWS") + @ApiParam(value ="跳过行数") + @FieldAnnotation(defaultValue = "0") + private Integer skipRows; @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") From efb29aa8f4d8fc479862d0b834478d3c29dcfd28 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 9 Dec 2019 19:48:00 +0800 Subject: [PATCH 03/15] =?UTF-8?q?task=20`1294-1`=20=E6=9F=A5=E6=89=BEworkc?= =?UTF-8?q?ell=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) 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 b4fff69..87fcaeb 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 @@ -120,9 +120,9 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Transient @ApiParam("返回信息") @@ -187,7 +187,7 @@ public class MesProduceSn extends BaseBean implements Serializable { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", resultMsg='" + resultMsg + '\'' + ", operateType=" + operateType + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index d25f92d..89717dc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 9fc108a..4232d0d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -76,7 +76,7 @@ public class MesHqlPack { public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); - DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); +// DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return packBean; } 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 02de63d..824d9a8 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 @@ -117,9 +117,9 @@ public class MesProduceSn extends BaseBean { @ApiParam("条码类型") private Integer snType; - @Column(name = "TRAY") + @Column(name = "TRAY_NO") @ApiParam("托盘号") - private String tray; + private String trayNo; @Column(name="OPERATE_TYPE") @ApiParam("操作类型") @@ -184,7 +184,7 @@ public class MesProduceSn extends BaseBean { ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + ", snType=" + snType + - ", tray='" + tray + '\'' + + ", trayNo='" + trayNo + '\'' + ", operateType=" + operateType + ", resultMsg='" + resultMsg + '\'' + '}'; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 40c70b2..dd0909a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; From 68bba613e3972981db07a10dd51f2259739a086c Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:35:29 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 2 -- 2 files changed, 14 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index e032535..52363f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; import java.util.Date; import java.util.List; @@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode { public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } - - @JsonBackReference - public List getUpperOrders() { - return BeanRelation.list(this, EBaseOrder.UpperOrders); - } - - @JsonBackReference - public List getLowerOrders() { - return BeanRelation.list(this, EBaseOrder.LowerOrders); - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index e4c5238..28e4b51 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -5,6 +5,4 @@ public enum EBaseOrder { Material, PrevRelations, PostRelations, - UpperOrders, - LowerOrders } From f5181072b5702c5d519274023e6a33da4459a024 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 9 Dec 2019 20:48:39 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/pcn/repository/MesESOPRepository.java | 17 ------ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 62 ---------------------- .../pojo/mes/repository/MesESOPRepository.java | 17 ------ 4 files changed, 158 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java deleted file mode 100644 index 548ed5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java deleted file mode 100644 index 9f76128..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesESOP; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesESOPRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java deleted file mode 100644 index 0ea3263..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.bean; - - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesESOP extends BaseBean { - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java deleted file mode 100644 index 367ef81..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; -import cn.estsh.i3plus.pojo.mes.bean.MesESOP; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesESOPRepository extends BaseRepository { -} From a1a3d1e838c743c585ed30eb61cc0ee9eff6d448 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 10 Dec 2019 09:30:03 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E3=80=90Bug=E6=B8=85=E5=8D=95=E3=80=91--?= =?UTF-8?q?----------------------------?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 39 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 2 +- .../cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 51 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 49 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++-- 5 files changed, 144 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java 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 385c27e..c63485e 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 @@ -1347,6 +1347,45 @@ public class WmsEnumUtil { return valueOf(val); } } + /** + * 库存移动单状态状态:10=新建,20=已处理,30=处理出错 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMSSHIPPING_ORDER_STATUS { + CREATE(10, "新建"), + PENDING(20, "已处理"), + ERROR(30, "处理出错"); + + private int value; + private String description; + + WMSSHIPPING_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 库存移动单明细状态 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 6342635..741493d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -30,7 +30,7 @@ import javax.persistence.*; @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO") }) -@Api("库存移动单主表信息") +@Api("库存移动单处理成功后的记录") public class WmsMoveToERP extends BaseBean { private static final long serialVersionUID = -6223527594941733060L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java new file mode 100644 index 0000000..530bdee --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +@Data +public class WmsCarDto implements Serializable { + + @Column(name="CAR_NO") + @ApiParam(value ="车牌号") + private String carNo; + + @Column(name="CAR_DESC") + @ApiParam(value ="车辆描述") + private String carDesc; + + @Column(name="MAX_CAPACITY") + @ApiParam(value ="载重量(KG)") + private String maxCapacity; + + @Column(name="DRIVER_NO") + @ApiParam(value ="默认驾驶员") + private String driverNo; + + @Column(name="PHONE") + @ApiParam(value ="车主电话") + private String phone; + + @Column(name="VENDOR_NO") + @ApiParam(value ="所属供应商") + private String vendorNo; + + @Transient + @ApiParam("司机名称") + private String driverNameRdd; + + @Transient + @ApiParam(value = "供应商名称") + private String vendorNameRdd; + + @ApiParam(value = "是否删除，默认否") + private Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + private Integer isValid = 1; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java new file mode 100644 index 0000000..b4bbd06 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.io.Serializable; + +@Data +public class WmsTmsDriverDto implements Serializable { + + @Column(name="DRIVER_NO") + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @Column(name="DRIVER_NAME") + @ApiParam(value ="驾驶员姓名") + private String driverName; + + @Column(name="SEX") + @ApiParam(value ="驾驶员性别") + private Integer sex; + + @Column(name="AGE") + @ApiParam(value ="驾驶员年龄") + private String age; + + @Column(name="ID_NO") + @ApiParam(value ="驾驶员身份证号") + private String idNo; + + @Column(name="ADRESS") + @ApiParam(value ="驾驶员籍贯") + private String adress; + + @Column(name="PHONE") + @ApiParam(value ="车牌号") + private String phone; + + @Column(name="LOGIN_NO") + @ApiParam(value =" 登录账号") + private String loginNo; + + @ApiParam("是否删除，默认否") + private Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + private Integer isValid = 1; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 882630d..c1d0d98 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -44,14 +44,14 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - // 封装有效状态、删除状态、创建人和创建时间 - DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); + DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } + // 封装有效状态、删除状态、创建人和创建时间 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr; } From 571ab9bd3e445ca600d6b1da399e9396360f385a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 10 Dec 2019 11:08:42 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 4232d0d..d7a6052 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -69,14 +69,12 @@ public class MesHqlPack { /** * 根据打印模板的模板代码查询模板信息 * - * @param organizeCode * @param mesLabelTemplate * @return */ - public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { + public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); -// DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return packBean; } From c6c57dd82979153dac781ba548daefbcf7e097f7 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 10 Dec 2019 11:49:41 +0800 Subject: [PATCH 08/15] =?UTF-8?q?task=20`1294-1`=20=E6=9F=A5=E6=89=BEworkc?= =?UTF-8?q?ell=E7=9A=84=E6=97=B6=E5=80=99=E9=9C=80=E8=A6=81=E5=B8=A6?= =?UTF-8?q?=E4=B8=8A=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index 092f887..597b60a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean { @ApiParam("设备代码") private String equipmentCode; + @Override + public String toString() { + return "MesDatasource{" + + "dsCode='" + dsCode + '\'' + + ", dsName='" + dsName + '\'' + + ", dsType='" + dsType + '\'' + + ", dsHost='" + dsHost + '\'' + + ", dsPort=" + dsPort + + ", dsUser='" + dsUser + '\'' + + ", dsPassword='" + dsPassword + '\'' + + ", dsDbName='" + dsDbName + '\'' + + ", equipmentCode='" + equipmentCode + '\'' + + '}'; + } } From b9844c255ba037ed738350587884b6e4ae2581cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 10 Dec 2019 11:53:19 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/MesPpDetails.java | 62 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 66 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/MesPpTemplate.java | 58 +++++++++++++++++++ .../wms/repository/MesPpDetailsRepository.java | 17 ++++++ .../pojo/wms/repository/MesPpMasterRepository.java | 17 ++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 37 ++++++++++++ 7 files changed, 310 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java 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 385c27e..4e61405 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 @@ -4304,4 +4304,57 @@ public class WmsEnumUtil { } } + /** + * 生产计划主表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_MASTER_STATUS { + CREATE(10,"CREATE", "创建"), + PLANNED(20,"PLANNED", "已计划"), + CLOSE(30,"CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_MASTER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java new file mode 100644 index 0000000..b87c776 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpDetails.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : MES_生产计划主明细表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PP_DETAILS") +@Api("MES_生产计划明细表") +public class MesPpDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592727L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="ITEM") + @ApiParam("行号") + private Integer item; + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "工单数量", example = "0") + public Double qty; + + public Integer getItem() { + return item == null ? 0 : this.item.intValue(); + } + + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java new file mode 100644 index 0000000..e9d4e61 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description : MES_生产计划主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-09 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PP_MASTER") +@Api("MES_生产计划主表") +public class MesPpMaster extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592726L; + + @Column(name="WROKORDER_NO") + @ApiParam("工单号") + private String woekorderNo; + + @Column(name="PDLINE_NO") + @ApiParam("产线代码") + private String pdlineNo; + + @Column(name="PLAN_PRODUCT_TIME") + @ApiParam("生产日期") + private String planProductTime; + + @Column(name="SHIFT_NO") + @ApiParam("班次代码") + private String shitNo; + + @Column(name="START_PRODUCT_TIME") + @ApiParam("开始生产时间") + private String startProductTime; + + @Column(name="END_PRODUCT_TIME") + @ApiParam("结束生产时间") + private String endProductTime; + + @Column(name="ORDER_STATUS") + @ApiParam(value = "单据状态", example = "0") + private Integer orderStatus = 0; + + public Integer getOrderStatus() { + return orderStatus == null ? 0 : this.orderStatus.intValue(); + } + + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java new file mode 100644 index 0000000..d091e87 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : 生产计划模板 +* @Reference : +* @author: jessica.chen +* @date: 2019/12/10 17:10 +* @Modify: +*/ + +@Data +@Api(value="生产计划模板",description = "生产计划模板") +public class MesPpTemplate extends BaseBean { + + private static final long serialVersionUID = 2167743108452607913L; + + @ApiParam(value = "工单号") + @AnnoOutputColumn + private String woekorderNo; + + @ApiParam(value = "产线代码") + @AnnoOutputColumn + private String pdlineNo; + + @ApiParam(value = "生产日期") + @AnnoOutputColumn + private String planProductTime; + + @ApiParam(value = "班次代码") + @AnnoOutputColumn + private String shitNo; + + @ApiParam(value = "开始生产时间") + @AnnoOutputColumn + private String startProductTime; + + @ApiParam(value = "结束生产时间") + @AnnoOutputColumn + private String endProductTime; + + @ApiParam(value = "零件号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "零件描述") + @AnnoOutputColumn + private String partNameRdd; + + @ApiParam(value = "工单数量") + @AnnoOutputColumn + private Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java new file mode 100644 index 0000000..a3b81da --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description :MES_生产计划明细表 + * @Reference : + * @Author : jessica,chen + * @CreateDate : 2019-11-27 14:49 + * @Modify: + **/ +@Repository +public interface MesPpDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java new file mode 100644 index 0000000..eac4d74 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsFile; +import org.springframework.stereotype.Repository; + +/** + * @Description :MES_生产计划主表 + * @Reference : + * @Author : jessica,chen + * @CreateDate : 2019-11-27 14:49 + * @Modify: + **/ +@Repository +public interface MesPpMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a6f89a5..4dc76c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2574,4 +2574,41 @@ public class WmsHqlPack { return result; } + /** + * 生产计划主表信息分页查询条件 + * + * @param mesPpMaster + * @return + */ + public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result); + DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result); + DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result); + DdlPreparedPack.getStringSmallerPack(mesPpMaster.getEndProductTime(), "endProductTime", result); + + getStringBuilderPack(mesPpMaster, result); + + return result; + } + + /** + * 生产计划明细表信息分页查询条件 + * + * @param mesPpDetails + * @return + */ + public static DdlPackBean packHqlMesPpDetails(MesPpDetails mesPpDetails) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result); + + getStringBuilderPack(mesPpDetails, result); + + return result; + } + } From da2cfd77b0bd64130795a19c6df8fae94f5ead12 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 10 Dec 2019 14:55:52 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E3=80=90=20=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=89=AB=E6=8F=8F=E9=9B=B6=E4=BB=B6=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E7=B4=AF=E8=AE=A1=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=BE=BE=E5=88=B0=E9=9B=B6=E4=BB=B6=E6=A0=87=E5=8C=85=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=8D=B0=E6=9D=A1=E7=A0=81+?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=9A=84=E7=95=8C=E9=9D=A2=E3=80=91=E3=80=90?= =?UTF-8?q?bug6704=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a7f54ae..590f11c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "加密编码") private String encryptionNo; + @Column(name = "LAST_CS_TIME") + @ApiParam(value = "末次盘点时间") + private String lastCsTime; + + @Transient + @ApiParam(value = "末次盘点开始时间") + private String lastCsTimeStart ; + + @Transient + @ApiParam(value = "末次盘点结束时间") + private String lastCsTimeEnd; + public WmsLocate() { } + public WmsLocate(String locateNo,Integer destBoxQty) { this.locateNo = locateNo; this.destBoxQty = destBoxQty; From 8385038290be687efb3dc215510ecd797252738a Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 10 Dec 2019 15:47:40 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=97=A5=E5=8E=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 3fcd451..393ee0e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -10,15 +10,12 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long parent; + private Long resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date start_date; + private Date startDate; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end_date; - private String color; - private Long id; - private Long workId; - private String text; + private Date endDate; + private String cls; } From f57f1087d95ab7fd304b8453e58170071e2ff724 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 10 Dec 2019 19:09:58 +0800 Subject: [PATCH 12/15] =?UTF-8?q?task=20`1295`=20=201=09=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 30 +++++++++++----------- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 10 ++++---- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 7 ++--- .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 7 ++--- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 13 +++++----- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 12 +++++---- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 12 ++++++++- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 9 +++---- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 9 +++---- .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 3 ++- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 10 ++++---- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 5 +++- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 5 +++- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 5 +++- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 7 ++--- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 10 ++++---- .../estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 26 +++++++++++-------- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 6 ++++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 11 ++++---- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 9 +++---- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 9 +++---- .../pojo/mes/bean/MesEquTaskStandardRecord.java | 9 +++---- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 ++--- .../i3plus/pojo/mes/bean/MesPackageDetail.java | 3 ++- .../i3plus/pojo/mes/bean/MesPackageTravel.java | 3 ++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 6 ++++- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 13 +++++----- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 14 +++++----- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 8 +++++- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 10 ++++---- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 9 +++---- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 9 +++---- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 3 ++- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 6 ++++- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 5 +++- .../i3plus/pojo/mes/bean/MesWcCheckRecord.java | 5 +++- .../pojo/mes/bean/MesWorkCellMonitorLog.java | 5 +++- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 7 ++--- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 10 ++++---- 45 files changed, 210 insertions(+), 177 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 30c641c..2b6489c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,30 +23,33 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 18b83aa..209c69a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.math.BigDecimal; /** @@ -26,7 +23,10 @@ import java.math.BigDecimal; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { 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 f21218e..39d5e93 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") 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 883c12a..88c635c 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index 19bd5d9..ddcdc82 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { 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 b6833de..ff1c82d 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 111be8e..984e6d6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; 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.*; /** * @Description :产品绑定记录表 @@ -26,7 +23,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") 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 87fcaeb..6eb2592 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { @@ -128,7 +129,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("返回信息") private String resultMsg; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index c9bbc09..7a17c7d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5431d77..532ec2a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -48,6 +54,10 @@ public class MesProductData extends BaseBean { @ApiParam("产品条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 7d03fcd..20fa8b6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { 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 fd39205..c098cd9 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") 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 455c6be..f058270 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index 4a2bae6..b9d4630 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index 92c37be..e6974e9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index 46b20b1..f7cad22 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index d52c590..a5e339d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index cdbbbe4..811c01c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { 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 f6805e0..4a52798 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index 616096a..acaf12d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") 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 3758b18..3f7588b 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER") +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("客户信息") public class MesCustOrder extends BaseBean { 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 9008e5e..270686e 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.util.Date; @@ -25,30 +26,33 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD") +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("不良信息记录表") public class MesDefectRecord extends BaseBean { - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME") + @Column(name = "PART_NAME") @ApiParam("物料名称") private String partName; - @Column(name="DEFECT_CODE") + @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; - @Column(name="DEFECT_NAME") + @Column(name = "DEFECT_NAME") @ApiParam("缺陷名称") private String defectName; - @Column(name="DEFECT_LOCATION") + @Column(name = "DEFECT_LOCATION") @ApiParam("缺陷位置") private String defectLocation; @@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean { @ApiParam("面位") private String sideLocation; - @Column(name="REPAIR_STATUS") + @Column(name = "REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; - @Column(name="WORK_CENTER_CODE") + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; - @Column(name="WORK_CELL_CODE") + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; - @Column(name="MEMO") + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 d340256..d75e2d4 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD") +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("物料拆解记录表") public class MesDismantleRecord extends BaseBean { 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 8ad11ab..6b6fbc2 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK") +@Table(name = "MES_EQU_TASK", indexes = { + @Index(columnList = "TASK_NO") +}) @Api("设备作业任务") public class MesEquTask extends BaseBean { @@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean { private String pageType; @Transient - @ApiParam(value ="明细列表") + @ApiParam(value = "明细列表") private List mesEquTaskDetailList; } 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 c62fb18..8f3b70f 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -27,7 +24,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_DETAIL") +@Table(name = "MES_EQU_TASK_DETAIL", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 1ffe9c2..2ecea3c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :设备维修作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备维修作业记录") public class MesEquTaskRepairRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 41d7209..b3c3b6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :设备点检保养作业记录 @@ -26,7 +23,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_TASK_STANDARD_RECORD") +@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = { + @Index(columnList = "EQUIPMENT_CODE") +}) @Api("设备点检保养作业记录") public class MesEquTaskStandardRecord extends BaseBean { 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 93339b7..ec8810e 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Author: Wynne.Lu @@ -24,7 +21,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") public class MesPackage extends BaseBean { @Column(name = "PACKAGE_NO") 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 95483c1..20a1b79 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL") +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 76a808b..589f3f6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL") +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean { 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 0cbb477..b803060 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER") +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") public class MesPlanOrder extends BaseBean { @Column(name = "ORDER_NO") 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 f689f22..32ad09c 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 @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,7 +27,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD") +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean { @Column(name = "SERIAL_NUMBER") 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 824d9a8..66fc384 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN") +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("产品条码表") public class MesProduceSn extends BaseBean { @@ -121,7 +122,7 @@ public class MesProduceSn extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; 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 3da8adb..a29b36b 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 产品条码履历实体类 @@ -25,7 +22,12 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL") +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") @@ -120,7 +122,7 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("托盘号") private String trayNo; - @Column(name="OPERATE_TYPE") + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 3555f12..fed596c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA") +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index a315dc6..1daf186 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -26,7 +23,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA") +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean { 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 7ea3abb..d98293c 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,7 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER") +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}) @Api("生产队列主表") public class MesQueueOrder extends BaseBean { @Column(name = "ORDER_NO") 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 416ae36..c57ba78 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name = "ORDER_NO") 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 77054d4..5c3ceb5 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -25,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN") +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") public class MesRawPartSn extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index 5e3e15f..6d526a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,10 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD") +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean { 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 22086da..8138447 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -24,7 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD") +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 5aef545..9beab8f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD") +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 9f3f20a..7806868 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean { 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 a5523bd..557402d 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 @@ -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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -26,7 +23,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER") +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") public class MesWorkOrder extends BaseBean { @Column(name = "ORDER_NO") 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 f3c006d..c9d175e 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 @@ -8,10 +8,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description: @@ -25,7 +22,10 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG") +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean { @Column(name = "ORDER_NO") From 47fb0807426a702cd210a75a67be7a881c9ed173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 10 Dec 2019 20:04:54 +0800 Subject: [PATCH 13/15] =?UTF-8?q?lac=E7=BA=BF=E7=A8=8B=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=BC=98=E5=8C=96=20Session=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E5=8C=96=20lac?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0TaskCheck=20=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 3 + .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 117 ++++++++++++++++++++- .../estsh/i3plus/pojo/lac/bean/LacTaskCheck.java | 100 ++++++++++++++++++ .../lac/repository/LacTaskCheckRepository.java | 14 +++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 19 ++-- .../pojo/platform/platbean/SysLogException.java | 10 +- .../pojo/platform/platbean/SysLogOperate.java | 13 +-- .../pojo/platform/platbean/SysLogSystem.java | 13 +-- .../pojo/platform/platbean/SysLogTaskTime.java | 11 +- .../pojo/softswitch/bean/BsSuitDataDetail.java | 8 +- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 8 +- .../pojo/softswitch/bean/BsSuitRecordParam.java | 2 +- .../pojo/softswitch/bean/BsSuitRequestRecord.java | 2 +- 13 files changed, 265 insertions(+), 55 deletions(-) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java 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 ef05abd..f2ef95b 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 @@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.mongodb.core.index.IndexDirection; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.*; import java.io.Serializable; @@ -78,6 +80,7 @@ public abstract class BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) public String createUser; + @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") public String createDatetime; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index 3cb1b28..dfb4079 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -221,8 +221,9 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUMBER(1,"数字"), - STRING(2,"字符串"); + INTEGER(1,"整数"), + STRING(2,"字符串"), + FLOAT(3,"浮点"); private int value; private String description; @@ -341,4 +342,116 @@ public class LacEnumUtil { } } + /** + * 逻辑运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOGICAL_OPERATOR{ + OR(10,"或"), + AND(20,"与"); + + private int value; + private String description; + + LOGICAL_OPERATOR(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 关系运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RELATIONAL_OPERATOR{ + GT(10,">"), + LT(20,"<"), + EQ(20,"=="), + NE(20,"!="), + GE(20,">="), + LE(20,"<="); + + private int value; + private String description; + + RELATIONAL_OPERATOR(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * 任务检查类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_CHECK_TYPE{ + MASTER(10,"主"), + SLAVE(20,"从"); + + private int value; + private String description; + + TASK_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java new file mode 100644 index 0000000..5c14b36 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-09 14:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_CHECK") +@Api(value="任务检查",description = "任务检查") +public class LacTaskCheck extends BaseBean { + + @Column(name="COMMAND_STACK_TEMPLATE_ID") + @ApiParam(value ="指令集模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTemplateId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_TASK_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepTaskId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CHECK_TYPE") + @ApiParam(value ="任务检查类型") + @AnnoOutputColumn(refClass = LacEnumUtil.TASK_CHECK_TYPE.class) + private Integer taskCheckType; + + @Column(name="TASK_CHECK_GROUP") + @ApiParam(value ="任务检查组") + private String taskCheckGroup; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数id") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME_RDD") + @ApiParam(value ="任务名称") + private String paramNameRdd; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class) + private Integer paramValueType; + + @Column(name="RELATIONAL_OPERATOR") + @ApiParam(value ="关系运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.RELATIONAL_OPERATOR.class) + private Integer relationalOperator; + + @Column(name="LOGICAL_OPERATOR") + @ApiParam(value ="逻辑运算符") + @AnnoOutputColumn(refClass = LacEnumUtil.LOGICAL_OPERATOR.class) + private Integer logicalOperator; + + @Column(name="CHECK_VALUE") + @ApiParam(value ="检查值") + private String checkValue; + + @Column(name="TARGET_STEP_ID") + @ApiParam(value ="目标步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetStepId; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java new file mode 100644 index 0000000..82ab490 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskCheckRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskCheck; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-12-10 15:10 + * @Modify: + **/ +public interface LacTaskCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 8f317e9..10b2e48 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -4,17 +4,8 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; -import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; -import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; -import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; +import cn.estsh.i3plus.pojo.lac.bean.*; + import java.util.List; /** @@ -187,4 +178,10 @@ public class LacHqlPack { DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck); + DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index f277ace..e4b46a1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -9,10 +9,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -27,16 +27,12 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") - } -) +@Table(name="SYS_LOG_EXCEPTION") @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogException extends BaseBean { //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="EXC_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 5e20049..57bb047 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,16 +30,11 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE", - indexes = { - @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"), - @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE") -}) +@Table(name="SYS_LOG_OPERATE") @Api(value="操作日志表",description = "操作日志表") public class SysLogOperate extends BaseBean { - //CommonEnumUtil.SOFT_TYPE + @Indexed @Column(name="OPERATE_MODULE") @ApiParam(value ="系统模块（枚举）", example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") @@ -53,7 +48,7 @@ public class SysLogOperate extends BaseBean { return operateModuleName; } - //ImppEnumUtil.OPERATE_TYPE（枚举） + @Indexed @Column(name="OPERATE_TYPE") @ApiParam(value ="操作类型" , example = "-1") @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index f4fdc54..9db1e2f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -12,10 +12,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -30,24 +30,19 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_SYSTEM", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"), - @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID") - }) +@Table(name="SYS_LOG_SYSTEM") @Api(value="系统日志表",description = "系统日志表") public class SysLogSystem extends BaseBean { + @Indexed @Column(name="LOG_LEVEL") @ApiParam(value ="日志级别" , example ="1") - //ImppEnumUtil.LOG_LEVEL @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class,refForeignKey = "value",value = "name") private Integer logLevel; + @Indexed @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") - //CommonEnumUtil.SOFT_TYPE @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") private Integer logModuleId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index a6a8dbb..5268d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -11,9 +11,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.data.mongodb.core.index.Indexed; + import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -28,12 +29,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_TASK_TIME", - indexes = { - @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"), - @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"), - @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME") - }) +@Table(name="SYS_LOG_TASK_TIME") @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { @@ -79,6 +75,7 @@ public class SysLogTaskTime extends BaseBean { @ApiParam(value ="任务周期表达式") private String taskCycleExpsRdd; + @Indexed @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index fc7941e..23db18b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -26,10 +26,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_DATA_DETAIL",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), - @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), - @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), - @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME") + @Index(name="bs_suit_data_detail_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), + @Index(name="bs_suit_data_detail_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_data_detail_suit_case_code_idx",columnList = "SUIT_CASE_CODE_RDD"), + @Index(name="bs_suit_data_detail_create_date_time_idx",columnList = "CREATE_DATE_TIME") }) @Api(value = "适配报文详情", description = "适配报文详情") public class BsSuitDataDetail extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index bf91b56..c451f54 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -26,10 +26,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_RECORD",indexes = { - @Index(name="index_suit_case_name_rdd",columnList = "SUIT_CASE_NAME_RDD"), - @Index(name="index_suit_case_code",columnList = "SUIT_CASE_CODE"), - @Index(name="index_create_date_time",columnList = "CREATE_DATE_TIME"), - @Index(name="index_process_time",columnList = "PROCESS_TIME"), + @Index(name="bs_suit_record_suit_case_name_rdd_idx",columnList = "SUIT_CASE_NAME_RDD"), + @Index(name="bs_suit_record_suit_case_code_idx",columnList = "SUIT_CASE_CODE"), + @Index(name="bs_suit_record_create_date_time_idx",columnList = "CREATE_DATE_TIME"), + @Index(name="bs_suit_record_process_time_idx",columnList = "PROCESS_TIME"), }) @Api(value = "适配记录", description = "适配记录") public class BsSuitRecord extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index 979b61d..e85deb6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "SUIT_RECORD_PARAM",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="suit_record_param_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), }) @Api(value = "适配记录参数", description = "适配记录参数") public class BsSuitRecordParam extends BaseBean { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index b2cebdb..b699e9b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -25,7 +25,7 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_REQUEST_RECORD",indexes = { - @Index(name="index_suit_record_id",columnList = "SUIT_RECORD_ID"), + @Index(name="bs_suit_request_record_suit_record_id_idx",columnList = "SUIT_RECORD_ID"), }) @Api(value = "请求适配记录", description = "请求适配记录") public class BsSuitRequestRecord extends BaseBean { From 7bf8534c1671be864f2f777a8fdf923bac76652c Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 11 Dec 2019 09:11:57 +0800 Subject: [PATCH 14/15] =?UTF-8?q?mes=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index caa2b5d..5eb0d11 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1336,8 +1336,14 @@ public class MesEnumUtil { MES_QC_CHECK_STANDARD(250, "质量检测标准"), MES_FAULT_CAUSE(260,"设备故障原因"), MES_FAULT_METHOD(270,"设备故障处理措施"), - MES_FAULT_PHENOMENON(280,"设备故障现象"); - + MES_FAULT_PHENOMENON(280,"设备故障现象"), + MES_DEFECT(290,"缺陷"), + MES_DEFECT_CAUSE(300,"缺陷原因"), + MES_SCRAP(310,"报废原因"), + MES_REPAIR(320,"质量数据处理措施"), + MES_EQU_TASK_PLAN(330,"设备作业周期计划"), + MES_PART_OJBECT(340,"物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350,"工序工作单元"); private int value; private String description; From 2e98e17a05da5d16fbf5a94ba2f1cc1f38447990 Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 11 Dec 2019 10:10:53 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++ .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 8 +++- .../java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java | 18 +++++++ .../cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java | 27 +++-------- .../estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java | 35 +++++--------- .../estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 35 ++++++++++++++ 7 files changed, 138 insertions(+), 45 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java 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 e0c11cc..3ac9b45 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 @@ -1015,6 +1015,62 @@ public class WmsEnumUtil { } } + + /** + * 业务表：库存条码状态 + * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CARRIAGE_STATUS { + CREATE(10, "创建"), + PUBLISH(20, "发布"), + RECEIVE(30, "承运商接收"), + ARRIVE(40, "车辆到达"), + INSTALL(50, "装车完成"), + CARRIAGE_IN(60, "运输中"), + CLOSE(70, "已关单"); + + private int value; + private String description; + + CARRIAGE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 单据是否生成任务状态 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fc098a8..83788f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -179,6 +179,10 @@ public class WmsDocMovementMaster extends BaseBean { @Transient public String title; + @Column(name = "TAG") + @ApiParam(value = "标签") + private String tag; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index 9a65b4c..1d69271 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -71,7 +72,7 @@ public class WmsTmsShippingExt extends BaseBean { @Column(name="ORDER_STATUS") @ApiParam(value ="单据状态") - private String orderStatus; + private Integer orderStatus; @Column(name="CUST_NAME") @ApiParam(value ="客户名称RDD") @@ -97,4 +98,9 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam(value =" 申请部门") private String depart; + + @Transient + @ApiParam("物料编码") + private String partNo; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java new file mode 100644 index 0000000..9bb9b62 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/BaseDto.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :公共父类入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Data +public class BaseDto { + + +} + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java index 530bdee..49d975d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java @@ -8,44 +8,29 @@ import javax.persistence.Transient; import java.io.Serializable; @Data -public class WmsCarDto implements Serializable { +public class WmsCarDto extends BaseDto implements Serializable { @Column(name="CAR_NO") @ApiParam(value ="车牌号") private String carNo; - @Column(name="CAR_DESC") - @ApiParam(value ="车辆描述") - private String carDesc; - - @Column(name="MAX_CAPACITY") - @ApiParam(value ="载重量(KG)") - private String maxCapacity; @Column(name="DRIVER_NO") @ApiParam(value ="默认驾驶员") private String driverNo; - @Column(name="PHONE") - @ApiParam(value ="车主电话") - private String phone; @Column(name="VENDOR_NO") @ApiParam(value ="所属供应商") private String vendorNo; + @ApiParam("是否删除，默认否") - @Transient - @ApiParam("司机名称") - private String driverNameRdd; + protected Integer isDeleted = 2; - @Transient - @ApiParam(value = "供应商名称") - private String vendorNameRdd; + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; - @ApiParam(value = "是否删除，默认否") - private Integer isDeleted = 2; + protected String organizeCode; - @ApiParam("是否有效，默认是") - private Integer isValid = 1; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java index b4bbd06..ad84be5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java @@ -6,8 +6,15 @@ import lombok.Data; import javax.persistence.Column; import java.io.Serializable; +/** + * @Description :驾驶员入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ @Data -public class WmsTmsDriverDto implements Serializable { +public class WmsTmsDriverDto extends BaseDto implements Serializable { @Column(name="DRIVER_NO") @ApiParam(value ="驾驶员编号") @@ -17,33 +24,15 @@ public class WmsTmsDriverDto implements Serializable { @ApiParam(value ="驾驶员姓名") private String driverName; - @Column(name="SEX") - @ApiParam(value ="驾驶员性别") - private Integer sex; - - @Column(name="AGE") - @ApiParam(value ="驾驶员年龄") - private String age; - - @Column(name="ID_NO") - @ApiParam(value ="驾驶员身份证号") - private String idNo; - - @Column(name="ADRESS") - @ApiParam(value ="驾驶员籍贯") - private String adress; - - @Column(name="PHONE") - @ApiParam(value ="车牌号") - private String phone; - @Column(name="LOGIN_NO") @ApiParam(value =" 登录账号") private String loginNo; @ApiParam("是否删除，默认否") - private Integer isDeleted = 2; + protected Integer isDeleted = 2; @ApiParam("是否有效，默认是") - private Integer isValid = 1; + protected Integer isValid = 1; + + protected String organizeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java new file mode 100644 index 0000000..add6b54 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单入参") +@Data +public class WmsTmsShipDto extends BaseDto implements Serializable { + + @ApiParam("物料号") + private String partNo; + @ApiParam("运输状态") + private String carriageStatus; + @ApiParam("单据号") + private String orderNo; + + @ApiParam("是否删除，默认否") + protected Integer isDeleted = 2; + + @ApiParam("是否有效，默认是") + protected Integer isValid = 1; + + @ApiParam("工厂代码") + protected String organizeCode; +}