From ab1e524f20b2f3339f0f04e03470ec36aaa21c8c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 19 Apr 2019 13:48:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?MES=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 188 +++++++++++++++++++++ 1 file changed, 188 insertions(+) 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 1d1ebfe..65e65db 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 @@ -269,4 +269,192 @@ public class MesEnumUtil { return tmp; } } + + /** + * MesQueueOrder实体对应的status值 队列主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_STATUS{ + + NORMAL(10,"正常"), + ONLINE(20,"已上线"), + OFFLINE(30,"已下线"), + CLOSE(40,"已关闭"),; + + private int value; + private String description; + + QUEUE_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 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; + } + } + + /** + * MesQueueOrderDetail实体对应的status值 队列详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_DETAIL_STATUS{ + + NORMAL(10,"正常"), + CLOSE(20,"关闭"); + + private int value; + private String description; + + QUEUE_ORDER_DETAIL_STATUS(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; + } + } + + /** + * MesProduceSn实体对应的snStatus值 条码表条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_STATUS{ + + CREATE(10,"创建"), + PROCESS(20,"加工"), + OFFLINE(30,"上线"), + INSTOCKED(40,"入库"), + SHIPING(50,"发运"), + CLOSE(90,"关闭"),; + + private int value; + private String description; + + PRODUCE_SN_STATUS(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; + } + } + + /** + * MesProduceSn实体对应的printStatus值 条码表条码打印状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_PRINT_STATUS{ + + CREATE(10,"创建"), + ONLINE(20,"上线打印"), + OFFLINE(30,"下线打印"); + + private int value; + private String description; + + PRODUCE_SN_PRINT_STATUS(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; + } + } + + /** + * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_QC_STATUS{ + + QUALIFIED(10,"合格"), + DEFECTED(20,"不合格"), + SCRAPED(30,"报废"); + + private int value; + private String description; + + PRODUCE_SN_QC_STATUS(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; + } + } } From 71607407acba704c1835af06f1733ff2b6475881 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 19 Apr 2019 13:54:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?MES=20=E7=8F=AD=E6=AC=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/repository/MesShiftRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.java new file mode 100644 index 0000000..401874f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRepository.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.MesShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} From f7b85978ccf8332d251c68a6fb0d7bddaa314fa4 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 19 Apr 2019 13:55:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?MES=20Repository=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java new file mode 100644 index 0000000..ccb818d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -0,0 +1,46 @@ +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 : crish + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT") +@Api("班次信息") +public class MesShift extends BaseBean { + @Column(name="SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name="SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name="START_TIME") + @ApiParam("开班时间") + private String startTime; + + @Column(name="WORK_TIMES") + @ApiParam("作业时长") + private String workTimes; +} From 1e22ff7e75d49cf6088f04215e9d45df692c2b70 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 19 Apr 2019 14:46:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 375466a..5e67b40 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -46,4 +46,8 @@ public class BfIntercept extends BaseBean { @Column(name="INTERCEPT_DESCRIPTION") @ApiParam(value ="拦截器描述") private String interceptDescription; + + @Column(name="INTERCEPT_STATUS") + @ApiParam(value ="拦截器状态") + private Integer interceptStatus; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 804c605..176e57e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -179,6 +179,7 @@ public final class FormHqlPack { DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); ddlPackBean.setOrderByStr(bfIntercept.orderBy()); From 72691f50edddf21856d43ee4b92fda8f71735768 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 19 Apr 2019 14:55:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=95=A3=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E6=8E=A8=E5=85=A5?= =?UTF-8?q?=E9=98=9F=E5=88=97=E9=94=99=E8=AF=AF=EF=BC=9B=20=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 1c75712..271275b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -21,23 +21,23 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LOCATE_PART") +@Table(name = "WMS_LOCATE_PART") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="库位物料表",description = "库位物料表") -public class WmsLocatePart extends BaseBean{ +@Api(value = "库位物料表", description = "库位物料表") +public class WmsLocatePart extends BaseBean { - @Column(name="LOCATE_NO") - @ApiParam(value ="库位代码") + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") private String locateNo; - @Column(name="PART_NO") - @ApiParam(value ="物料编码") + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") private String partNo; - @Column(name="PART_NAME_RDD") - @ApiParam(value ="物料名称") + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") private String partNameRdd; @Column(name = "PULL_QTY") @@ -56,7 +56,7 @@ public class WmsLocatePart extends BaseBean{ @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; - public Double getMin() { + public Double getMin() { return this.min == null ? 0 : this.min; }