From bcb8dee045544a7e3495a3c264dd9821e9c9b0f5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 30 Mar 2020 10:48:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=901558=20=E7=94=9F=E4=BA=A7=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86-=E6=B3=B0=E5=9B=BD=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesContainer.java | 43 +++++++++++++++++ .../i3plus/pojo/mes/bean/MesContainerType.java | 55 ++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java new file mode 100644 index 0000000..12e6ad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -0,0 +1,43 @@ +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 : jimmy.zeng + * @CreateDate : 2020-03-27 14:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER") +@Api("MES_容器类型") +public class MesContainer extends BaseBean { + private static final long serialVersionUID = -3843389042411645111L; + + @Column(name = "CT_NO") + @ApiParam(value = "容器编号") + private String ctNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "USE_STATUS") + @ApiParam(value = "使用状态") + private String useStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java new file mode 100644 index 0000000..b317f3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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 : jimmy.zeng + * @CreateDate : 2020-03-27 14:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_TYPE") +@Api("MES_容器类型") +public class MesContainerType extends BaseBean { + + private static final long serialVersionUID = 2831600566482383573L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; +} From b12cb90c0da2c47bdd98069f5c005fd429978e73 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Mar 2020 11:12:12 +0800 Subject: [PATCH 2/5] dev-pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06660e0..c7523d4 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From f8405b87d9c3c32ac54013ee5f40e4938bd8f2eb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Apr 2020 09:29:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bug7940=E3=80=907940=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=9C=AA=E6=8C=89=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E6=8E=A8=E8=8D=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) 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 4fd1ad6..9eab3f2 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 @@ -5301,4 +5301,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(int value,String code, String description) { + this.value = value; + this.code = code; + 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; + } + } } \ No newline at end of file From 078e1a77a4732fa86e27d736bdc091f25d1ccf1f Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 13:18:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90bug=207895=20PLC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?-=E9=A1=B5=E9=9D=A2=E9=9C=80=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 1ad0189..9ea903c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable { @ApiParam("对象代码") private String objectCode; + @ApiParam("OPCUA路径") + private String opcUrl; + public MesPlcModel() { } @@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable { this.isAnalysis = isAnalysis; this.device = device; this.objectCode = objectCode; + this.opcUrl = opcUrl; } } 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 15b53e4..d217cfb 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 @@ -1079,6 +1079,9 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); + if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } From 3654d602146cec06338c0e197807f07880c50022 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 15:12:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90bug7947=E3=80=91PLC=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=B7=A5=E6=AD=A5=E8=A3=85=E9=98=9F=E5=88=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0aef82a..d1e1299 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 @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap; + private Map dataMap=new HashMap<>(); @ApiParam("流程状态集合") private List routeStatusList;