From bcec1d7e6222e58e4edde1c438c14d9e1ce8e278 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jan 2020 13:19:17 +0800 Subject: [PATCH 1/4] JIS --- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 22 +++++++++++----------- 5 files changed, 23 insertions(+), 23 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (65%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 4b02d0a..09b331d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java similarity index 65% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java index 8c06cef..87029c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ 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.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ad8bc0b..34911dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java index 11e0ba0..59da062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository extends BaseRepository { } 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 e0d2e6e..d2241c4 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 @@ -2100,23 +2100,23 @@ public class MesHqlPack { /** * JIS发运模式 - * @param jisPattern + * @param patternJis * @param organizeCode * @return */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode); + if (!StringUtils.isEmpty(patternJis.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getTopNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + if (!StringUtils.isEmpty(patternJis.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + if (!StringUtils.isEmpty(patternJis.getPatternType())) { + DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean); } return packBean; } From fea1811191306ad73b1363a01c5f88e03661520c Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 6 Jan 2020 16:59:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7153=20JIT=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index b7f831b..a3f4547 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } - public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; this.custFlagNo = custFlagNo; 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 19d4f8c..1fe9483 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 @@ -1483,7 +1483,7 @@ public class MesHqlPack { public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); } if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); From 8584946ce5bb67150ed64ddd088f46c74cfb2a4a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 6 Jan 2020 21:51:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=20=20=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E4=B8=8B=E5=88=97=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?=E4=B8=AD=E6=96=87=20=E3=80=91bug7196?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f2ef95b..a05fe1b 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) From bf624942363519243b0a68a2aff80c1ecbbede67 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 7 Jan 2020 09:22:04 +0800 Subject: [PATCH 4/4] JIS --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 51 ++++++++++++++++++++++ .../pojo/mes/pcn/bean/MesProduceCategory.java | 38 ++++++++++++++++ .../pcn/repository/MesProdCfgDetailRepository.java | 16 +++++++ .../repository/MesProduceCategoryRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 2 + 6 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.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 0f44cb0..86a66f5 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 @@ -2620,6 +2620,7 @@ public class MesEnumUtil { PUBLIC(10, "公用"), JIT(20, "JIT生产"), WORK_ORDER(30, "工单生产"), + JIS(40, "JIS发运"), OTHER(99, "其他"); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..cbb3f3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,51 @@ +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; +import javax.persistence.Transient; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean { + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..131674e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java @@ -0,0 +1,16 @@ +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.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +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.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 34911dd..b7a7b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule;