From 5f13bf7f1db7e49f6be95170055f23d8b146b872 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 19 Apr 2019 11:12:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?= =?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/mes/bean/MesPlanOrder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e02cf88..b017d0b 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 @@ -31,9 +31,9 @@ public class MesPlanOrder extends BaseBean { @ApiParam("生产计划单号") private String orderNo; - @Column(name="ORDER_TYPE") + @Column(name="PO_TYPE") @ApiParam("计划类型") - private Integer orderType; + private Integer planType; @Column(name="PROD_CFG_CODE") @ApiParam("产品配置代码") @@ -96,6 +96,6 @@ public class MesPlanOrder extends BaseBean { } public int getOrderTypeVal() { - return this.orderType == null ? 0 : this.orderType; + return this.planType == null ? 0 : this.planType; } } From 6916ae20de8c4c26789be75e50b996cda44ab02c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 19 Apr 2019 11:16:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=9E=E4=BD=93=E5=92=8CRepository?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesCustProdLine.java | 38 ++++++++++++++++++++++ .../mes/repository/MesCustProdLineRepository.java | 16 +++++++++ 2 files changed, 54 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java new file mode 100644 index 0000000..bd3711b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -0,0 +1,38 @@ +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; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUST_PROD_LINE") +@Api("客户产线代码") +public class MesCustProdLine extends BaseBean { + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="CUST_PROD_LINE_NAME") + @ApiParam("客户产线名称") + private String custProdLineName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java new file mode 100644 index 0000000..b8c4290 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustProdLineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustProdLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-11:15 + * @Modify: + **/ +@Repository +public interface MesCustProdLineRepository extends BaseRepository { +} From e20d212991668d895ddbfaaf54c6377957eb1a33 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 19 Apr 2019 11:28:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?IS=5FGENERAL=5FTASK=E5=8A=A0=E4=B8=8ACode+D?= =?UTF-8?q?ATA=5FSTATUSCode=E5=80=BC=E6=94=B9=E4=B8=BATRUE=E5=92=8CFALSE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) 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 ac084cf..6a618b3 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 @@ -694,13 +694,15 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_GENERAL_TASK { - CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成"); + CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成"); private int value; + private String code; private String description; - IS_GENERAL_TASK(int value, String description) { + IS_GENERAL_TASK(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -712,6 +714,10 @@ public class WmsEnumUtil { return description; } + public String getCode() { + return code; + } + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -721,6 +727,16 @@ public class WmsEnumUtil { } 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; + } } @@ -1760,8 +1776,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { - YES(1, "是", "fa fa-success cell-fa fa-check"), - NO(2, "否", "fa fa-disabled cell-fa fa-times-circle"); + YES(1, "TRUE", "fa fa-success cell-fa fa-check"), + NO(2, "FALSE", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String description;