From 3425b443c88917e281cf849ca6ab6e4c913efc88 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 11 Nov 2019 21:21:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=206283?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 05fc3ed..a853af3 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 @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel workOrderButtonModel; + private MesButtonFlagModel mesButtonFlagModel; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From e2249ea8dd77aff4096aa81d192fa08c4b183273 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 Nov 2019 10:52:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1189?= =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 43 ++++++++++++++++++++++ .../pcn/repository/MesCustomerPartRepository.java | 17 +++++++++ 2 files changed, 60 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java new file mode 100644 index 0000000..bf19863 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -0,0 +1,43 @@ +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 :mes客户表 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_PART") +@Api("客户零件关系") +public class MesCustomerPart extends BaseBean { + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java new file mode 100644 index 0000000..72e72bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.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.MesCustomerPart; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesCustomerPartRepository extends BaseRepository { + +} From 9b491b742e48054ebdd2957311bb30510f5c12b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 12 Nov 2019 11:22:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 75fc5ec..e5ab358 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 @@ -638,8 +638,9 @@ public class WmsEnumUtil { KT_REWORK(380, "KT_REWORK", "KT返工"), KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), KT_SORTING(400, "KT_SORTING", "KT分选"), - VDA_STATIC_CS(400,"VDA_STATIC_CS", "静态盘点"), - VDA_CS_SEARCH(410,"VDA_CS_SEARCH", "VDA盘点查询"); + VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), + VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), + KT_DEFINITE(430,"KT_DEFINITE", "KT合格"); private int value; From 6536109b66eda4975b6fa0b0a16b0a55a9db6ba1 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 12 Nov 2019 11:33:52 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=09EU=E7=BC=96=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E3=80=90=20334-=20EU=E7=BC=96=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91=E3=80=901172EU=E7=BC=96?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86-=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=A4=8D=E7=94=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 e5ab358..648c79d 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 @@ -640,7 +640,8 @@ public class WmsEnumUtil { KT_SORTING(400, "KT_SORTING", "KT分选"), VDA_STATIC_CS(410,"VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420,"VDA_CS_SEARCH", "VDA盘点查询"), - KT_DEFINITE(430,"KT_DEFINITE", "KT合格"); + KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), + VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"); private int value; @@ -822,7 +823,8 @@ public class WmsEnumUtil { VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), - VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"); + VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), + VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"); private String value; private String description; From a294c1ccb035603db978d4479a4962dbc20e75be Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 11:52:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 119 ++++++++++++++++++++- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 6f0f112..82ff8c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -181,6 +181,10 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value = "放行说明") private String openInfo; + @Column(name = "IS_OVER_TIME") + @ApiParam(value = "是否超时") + private Integer overTimeFlag; + @Transient @ApiParam(value = "安灯状态集合") private List statusCodeList; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 7699fbe..627a36c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -12,6 +12,123 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 通知超时标识 + * 10 - 一级，20 - 二级，30 - 三级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_OVER_TIME_FLAG{ + CALL(1,"呼叫超时"), + SIGN(2,"响应超时"); + + private int value; + private String description; + + NOTICE_OVER_TIME_FLAG(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; + } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 广播内容占位符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BROADCAST_CUSTOM_CONDITION { + CALL("{A}","workCenterCode","产线"), + SIGN("{B}","workCellCode","工位"), + RESOLVE("{C}","alarmCode","安灯类型"); + + private String value; + private String code; + private String description; + + BROADCAST_CUSTOM_CONDITION(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode(){ return code; } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String desc) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String descriptionOfCode(String desc) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, desc)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + + + /** * 按灯状态 * 10-是，20-否 */ @@ -517,8 +634,6 @@ public class AndonEnumUtil { } } - - /** * 优先级别 * 10 - 一级，20 - 二级，30 - 三级 From 45d14fe3e2a3016d09150df248a8dd84e8cc6920 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 12 Nov 2019 13:07:14 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=A8=A1=E5=BC=8F=E5=8F=82=E6=95=B0=20=20682?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b7a1607..d045e4a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1969,4 +1969,38 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_PATTERN_PARAMS { + + MATCH_WORK_ORDER(10, "匹配工单"), + API_WORK_ORDER(20, "读取接口工单"), + SN_WORK_ORDER(30, "获取条码对应工单"); + + private int value; + private String description; + + PRODUCT_PATTERN_PARAMS(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 577b2c462a3d943796815bf7872f6582f3c850cc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:53:31 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=E5=BD=93=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=AE=89=E7=81=AF=E6=80=BB=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=AE=89=E7=81=AF=E8=B6=85=E6=97=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonBoardModel.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java new file mode 100644 index 0000000..58f9d5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-12-10:21 + * @Modify: + **/ +@Data +public class AndonBoardModel { + + @ApiParam("安灯类型") + private String alarmCode; + + @ApiParam("安灯类型名称") + private String alarmName; + + @ApiParam("安灯正常处理的次数") + private Integer inTime; + + @ApiParam("安灯超时次数") + private Integer overTime; + + @ApiParam("安灯总次数") + private Integer totalTime; + + public int getTotalTimeVal() { + return totalTime == null ? 0 : totalTime; + } + + public int getOverTimeVal() { + return overTime == null ? 0 : overTime; + } + + public int getInTime() { + return inTime == null ? 0 : inTime; + } + + +} From aa22d18645912581868e1b34727657604bab7e92 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 12 Nov 2019 13:55:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 58f9d5d..cee23af 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Description: + * @Description: 按照安灯类型统计分组统计当天发生的安灯总次数和安灯超时次数 model * @Reference: * @Author: Crish * @CreateDate:2019-11-12-10:21