From 41aff3b56072181ea4729ed595069e6729dd2ce9 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 19 Aug 2019 11:53:34 +0800 Subject: [PATCH 1/7] `` --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java | 8 ++++++++ .../estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 128e256..58bb4ae 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -31,6 +31,14 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源名称") private String dataSourceName; + @Column(name = "DATA_SOURCE_CODE") + @ApiParam(value = "数据源编码",access = "作为关系引用，在数据切换的时候会找不到ID 数据变了引用还在") + private String dataSourceCode; + + @Column(name = "DATA_BASE_NAME") + @ApiParam(value = "数据库名称") + private String dataBaseName; + @Column(name = "DATA_SOURCE_TYPE_ID") @ApiParam(value = "数据源类型id") private int dataSourceTypeId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java index e4e9d3c..75ed494 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java @@ -35,9 +35,9 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）") private int dataSourceModeId; - @Column(name = "DATA_SOURCE_ID") - @ApiParam(value = "数据源id") - private long dataSourceId; + @Column(name = "DATA_SOURCE_CODE") + @ApiParam(value = "数据源编码") + private String dataSourceCode; @Column(name = "DATA_SOURCE_NAME_RDD") @ApiParam(value = "数据源名称") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java index 576c4f1..26aa382 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java @@ -33,7 +33,7 @@ public class BsSuitType extends BaseBean { @Column(name = "SUIT_CASE_NUM") @ApiParam(value = "适配器数量") - private int suitCaseNum; + private int suitCaseNum = 0; } From 94924cb26464a6498d7bcd137c1024a58c5cc4a2 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 19 Aug 2019 13:10:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?POJO=20=20=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 4 ++++ pom.xml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 642c9a6..39a7704 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,6 +42,10 @@ i3plus.pojo i3plus-pojo-form + + i3plus.pojo + i3plus-pojo-softswitch + diff --git a/pom.xml b/pom.xml index 9e20085..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-softswitch + ${project.version} + + com.fasterxml.jackson.core From 205878943899c13fcb3ecb31e1e853a6c5023252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 19 Aug 2019 16:23:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 30eeaec..e3099d6 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 @@ -2051,6 +2051,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"item"}, result); + getStringBuilderPack(wmsCSRange, result); return result; From e9c596adce8bb8aef5e536e084334852547d6b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 19 Aug 2019 17:32:42 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=9B=98=E7=82=B9hql=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e3099d6..c9fc769 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 @@ -2051,7 +2051,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"item"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"item"}, result); getStringBuilderPack(wmsCSRange, result); From 6c37a60ff4c3525e0d79a93033ccaafdd456a4bf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 19 Aug 2019 17:40:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?MES-PCN=E8=8E=B7=E5=8F=96=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 47 +++++++++++++++++++ .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 54 ++++++++++++++++++++++ .../MesLabelTemplateParamRepository.java | 17 +++++++ .../pcn/repository/MesLabelTemplateRepository.java | 17 +++++++ 4 files changed, 135 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java new file mode 100644 index 0000000..901111a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -0,0 +1,47 @@ +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.*; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="Mes_LABEL_TEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class MesLabelTemplate extends BaseBean { + + private static final long serialVersionUID = 5371856566557305323L; + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Lob + @Column(name="TEMPLATE_CONTENT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..bb87217 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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.*; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="Mes_LABEL_TEMPLATE_PARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean { + + private static final long serialVersionUID = 6476163540527157643L; + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_PARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..6236031 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..8b71fac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesLabelTemplateRepository extends BaseRepository { +} From ef1450e9122c02c3b9b48a457aeb0eefdd6d2e33 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 20 Aug 2019 09:27:59 +0800 Subject: [PATCH 6/7] Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java | 24 +++++++++++ .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 ++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 39 +++++++++++++---- .../pojo/mes/model/FastDfsDownloadModel.java | 31 ++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 49 ++++++++++++---------- 6 files changed, 179 insertions(+), 31 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java 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 493b4b1..15a7e6d 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 @@ -752,6 +752,42 @@ public class MesEnumUtil { } /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + + FASTDFS_SAVE_PATH(10, "savePath"); + + + private int value; + private String description; + + CONFIG_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; + } + } + + /** * 事件类型枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 index baed2c2..69cf64b 100644 --- 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 @@ -62,4 +62,28 @@ public class MesESOP extends BaseBean { @Column(name="SOP_URL") @ApiParam("SOP_URL") private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + + @Column(name="SYNC_TAG") + @ApiParam("SYNC_TAG") + private Integer syncTag=0; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..418ab92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} 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 index 1dbdf9f..e93d75b 100644 --- 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 @@ -23,27 +23,27 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_ESOP") +@Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesESOP extends BaseBean { - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; - @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="ROUTE_CODE") + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; - @Column(name="PROCESS_CODE") + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; @@ -55,11 +55,32 @@ public class MesESOP extends BaseBean { @ApiParam("工步序号") private Integer stepSeq; - @Column(name="SOP_NAME") + @Column(name = "SOP_NAME") @ApiParam("SOP名称") private String sopName; - @Column(name="SOP_URL") + @Column(name = "SOP_URL") @ApiParam("SOP_URL") - private String sopUrl; + private String sopUrl; + + @Column(name="GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name="FILE_ORIGIN_NAME") + @ApiParam("FILE_ORIGIN_NAME") + private String fileOriginName; + + @Column(name="FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name="FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name="FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..bef0a34 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index eb0f365..02349f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -49,6 +49,7 @@ public class MesHqlPack { } return packBean; } + /** * 生产计划查询条件封装 * @@ -376,15 +377,16 @@ public class MesHqlPack { /******************created by wynne*************/ /** * MES 报废信息查询 + * * @param mesScrap * @return */ public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); } - if (StringUtils.isNotEmpty(mesScrap.getScrapName())){ + if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); } if (mesScrap.getIsValid() != null) { @@ -395,15 +397,16 @@ public class MesHqlPack { /** * MES PCN系统配置信息条件查询 + * * @param mesConfig * @return */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); } - if (StringUtils.isNotEmpty(mesConfig.getCfgName())){ + if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); } if (mesConfig.getIsValid() != null) { @@ -414,18 +417,19 @@ public class MesHqlPack { /** * MES 维修信息条件查询 + * * @param mesRepair * @return */ public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); } - if (StringUtils.isNotEmpty(mesRepair.getRepairName())){ + if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } - if (mesRepair.getRepairType() != null){ + if (mesRepair.getRepairType() != null) { DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); } if (mesRepair.getIsValid() != null) { @@ -474,26 +478,27 @@ public class MesHqlPack { return packBean; } - public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesEventByEventCode(String eventCode,String org){ - DdlPackBean packBean=getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean); - DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean); + + public static DdlPackBean getMesEventByEventCode(String eventCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } - public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){ - DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode); - DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean); + + public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); + DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } - /** * 动作分页获取封装 * @@ -511,9 +516,8 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); } - if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) { - DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean); - } + DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); + return packBean; } @@ -548,6 +552,7 @@ public class MesHqlPack { } return packBean; } + /** * 事件动作分页获取封装 * From 61ce4d1b3fdb03a2a0d7dd44a424131bd6de9aba Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 20 Aug 2019 10:02:20 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ed3f142..71ba453 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="BAS_VENDOR") -@Api("供应商") +@Api("供应商信息") public class BasVendor extends BaseBean{ private static final long serialVersionUID = 9214639813072592779L;