From 4150543cb4fd2aaca188377e8e1f75538c22dfe7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 27 May 2020 21:45:08 +0800 Subject: [PATCH 1/3] Effort Task #1940 Cost:16h Left:8h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 43 +++++++++++++++++++--- .../i3plus/pojo/mes/bean/IfQueueShipping.java | 18 ++++++++- .../pojo/mes/bean/MesQueueShippingDetail.java | 8 ++++ .../cn/estsh/i3plus/pojo/mes/model/ButtonBean.java | 8 ++++ .../pojo/mes/model/SpQueueShippingModel.java | 34 +++++++++++++++++ .../pojo/platform/platbean/SysLogSystem.java | 9 +++++ 6 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java 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 724dd11..abe784e 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 @@ -1812,8 +1812,8 @@ public class MesPcnEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70,"返修插单"), - EMERGENCY_ORDER(80,"紧急插单"); + REPAIR(70, "返修插单"), + EMERGENCY_ORDER(80, "紧急插单"); private int value; private String description; @@ -2354,16 +2354,14 @@ public class MesPcnEnumUtil { } } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCE_SN_STATUS { - CREATE(10, "创建"), PROCESS(20, "加工"), OFFLINE(30, "下线"), PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), - SHIPING(50, "发运"), + SHIPPING(50, "发运"), CLOSE(90, "关闭"); private int value; @@ -3313,6 +3311,41 @@ public class MesPcnEnumUtil { } } + /** + * 散件IT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SP_SHIPPING_STATUS { + CREATE(10, "创建"), + SHIPPED(20, "已发运"); + + private int value; + private String description; + + SP_SHIPPING_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; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_EVENT { TRIGGER(10, "trigger", "触发"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index b340d1a..a4ba000 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -27,7 +27,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "if_queue_shipping") +@Table(name = "IF_QUEUE_SHIPPING") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { private static final long serialVersionUID = -3385698810529084423L; @@ -105,4 +105,20 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("接口代码") private String ifCode; + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "ITEM_QTY") + @ApiParam("原材料物料用量") + private Double itemQty; + + @Column(name = "ITEM_UNIT") + @ApiParam("原材料物料用量") + private String itemUnit; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index c212bb9..ab58514 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -70,4 +70,12 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @Column(name = "qty") @ApiParam("数量") private Double qty; + + @Column(name = "SEQ") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "PRODUCE_COLOR") + @ApiParam("产品颜色") + private Double produceColor; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java index 47a4f4f..44ba836 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java @@ -1,12 +1,20 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class ButtonBean implements Serializable { + private static final long serialVersionUID = -4012120630477190414L; + @ApiParam(value = "按钮代码") private String buttonCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java new file mode 100644 index 0000000..82c0ac6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/5/26 18:59 + * @desc + */ +@Data +@Api("散件队列发运model") +public class SpQueueShippingModel { + + @ApiParam("队列编号") + private String jitNo; + + @ApiParam("vin") + private String vin; + + @ApiParam("车号") + private String carNo; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("产品颜色") + private Double produceColor; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 70a71b2..2c6c575 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -53,6 +53,15 @@ public class SysLogSystem extends BaseBean { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } + @Indexed + @Column(name="LOG_MODULE_ID") + @ApiParam(value ="系统模块（枚举）", example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") + private Integer logModuleId; + public String getLogModuleId() { + return logModuleId == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(logModuleId); + } + @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; From b0b276ba6649ac5500f49357e2c541627465ebd5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 May 2020 15:17:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1938]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonAlarmType.java | 21 +++++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonMessageRecord.java | 10 ++++++---- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 12 ++++++++++++ .../andon/bean/AndonRouteStatusErrorRecord.java | 14 ++++++++++---- .../andon/model/AndonActionModuleGroupModel.java | 2 +- .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 1 - 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 76d4137..83b067d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable { @ApiParam("安灯类型名称") private String alarmName; + @Column(name = "CODE") + @ApiParam("菜单编号") + private String code; + + @Column(name = "COLOR") + @ApiParam("BI颜色") + private String color; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Transient + @ApiParam("安灯类型代码") + private String value; + + @Transient + @ApiParam("安灯类型名称") + private String description; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java index 59d4a55..e34f15d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java @@ -10,10 +10,7 @@ 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable { @Column(name = "MEMO") @ApiParam(value = "备注") private String memo; + + @Lob + @Column(name = "MESSAGE") + @ApiParam(value = "广播内容") + private String message; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index 1724576..8367100 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -96,4 +96,16 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("触发类型默认不需要外部触发") private boolean checkTriggerTypeFalg = false; + @Transient + @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent") + private String nextTriggerEvent; + + @Transient + @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent") + private boolean execNextModuleFlag = true; + + @Transient + @ApiParam("默认异常未处理") + private boolean doErrorFlag = false; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index b6cbca9..fcbecc0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -9,10 +9,7 @@ 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -64,4 +61,13 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "安灯来源类型") private String sourceType; + @Column(name = "CACHE_FLAG") + @ApiParam(value = "缓存标识") + private Integer cacheFlag; + + @Lob + @Column(name = "CONTENT") + @ApiParam(value = "内容") + private String content; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java index 18c8643..a616354 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonActionModuleGroupModel.java @@ -31,6 +31,6 @@ public class AndonActionModuleGroupModel implements Serializable { @ApiParam("流程组件参数集合") private List routeModuleParamList; - @ApiParam("区域流程组件参数集合") + @ApiParam("安灯流程组件参数集合") private List alarmRouteModuleParamList; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 109a2cc..85f3f30 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -42,7 +42,4 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("触发事件") private String triggerEvent; - @ApiModelProperty("下个触发事件，一个组件集执行完毕后这个值赋给triggerEvent") - private String nextTriggerEvent; - } 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 313523c..bddd84b 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 @@ -1175,7 +1175,6 @@ public class AndonEnumUtil { } } - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 * From c2a5a17379080cca7b9d5fceacc73dd06e98d9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 28 May 2020 15:17:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E6=AD=A5=E5=BC=B9=E6=A1=86=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 +++++++++++++++++++++- .../i3plus/pojo/mes/model/StationRequestBean.java | 3 ++ 2 files changed, 40 insertions(+), 1 deletion(-) 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 204d4ce..bbfc0e5 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 @@ -2552,7 +2552,8 @@ public class MesPcnEnumUtil { BUTTON("button", "按钮"), TABLES("tables", "多个表格"), CUSTOM("custom", "定制页面"), - FORM("form", "文本按钮"); + FORM("form", "文本按钮"), + SPEC_TEXT("spec_text", "工步弹框文本"); private String value; private String description; @@ -3790,4 +3791,39 @@ public class MesPcnEnumUtil { } } + /** + * 界面类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WINDOW_TYPE { + BUTTON_CFG(10, "按钮组件"), + BOARD_BASE_WINDOW(20, "看板基础页面"), + STEP_WINDOW(30, "工步界面"); + + private int value; + private String description; + + WINDOW_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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 78826ad..b7260b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -132,6 +132,9 @@ public class StationRequestBean implements Serializable { @ApiParam("客户工厂代码") private String customerFactoryCode; + @ApiParam("工步弹框参数") + private String stepDialogParam; + @Override public String toString() { return "StationRequestBean{" +