From 841742e4746d04e8ebc3d6a31bd23e5295405ab6 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 17 Aug 2020 14:30:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=98=E6=A0=87=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=90=88=E5=B9=B6=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 752e8bb..691defd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -10,7 +10,8 @@ public class WmsInterfaceEnumUtil { WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"); private int value; private String name; From fe2017fbe4e458af8fb2a372456e459749bc9046 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 17 Aug 2020 15:17:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90622=2008=201.2.2.2.6=20BOM?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=99=9A=E9=98=B6=E9=9B=B6=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/util/BeanMapUtils.java | 23 ++++++++++ .../i3plus/pojo/wms/modelbean/BomItemModel.java | 53 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java index 1504765..0985f97 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BeanMapUtils.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.base.util; +import com.google.common.collect.Lists; import org.apache.commons.beanutils.BeanUtils; import org.springframework.cglib.beans.BeanGenerator; import org.springframework.cglib.beans.BeanMap; @@ -24,6 +25,7 @@ public class BeanMapUtils { return map; } + /** * 将map集合中的数据转化为指定对象的同名属性中 */ @@ -37,6 +39,7 @@ public class BeanMapUtils { /** * 键值对转换为对象 + * * @param mapList * @return */ @@ -61,4 +64,24 @@ public class BeanMapUtils { return null; } } + + /** + * 将List转换为List> + * @param objList + * @param + * @return + */ + public static List> objectsToMaps(List objList) { + List> list = Lists.newArrayList(); + if (objList != null && objList.size() > 0) { + Map map = null; + T bean = null; + for (int i = 0, size = objList.size(); i < size; i++) { + bean = objList.get(i); + map = beanToMap(bean); + list.add(map); + } + } + return list; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java new file mode 100644 index 0000000..43e1cb4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BomItemModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : Bom接口数据Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-08-17 10:03 + * @Modify: + **/ +@Data +@Api("Bom接口数据Model") +@AllArgsConstructor +@NoArgsConstructor +public class BomItemModel { + + @ApiParam("父物料号") + private String partNo; + @ApiParam("父物料描述") + private String partName; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "计量单位") + private String unit; + + @ApiParam(value = "子物料号") + private String itemPartNo; + @ApiParam(value = "子料物料描述") + private String itemPartNam; + @ApiParam(value = "子计量单位") + private String itemUnit; + @ApiParam(value = "子用量") + private Double itemQty; + + @ApiParam(value = "是否虚阶物料") + private String category; + + @ApiParam(value = "有效起始日期") + private String effStartTime; + @ApiParam(value = "有效截止日期") + private String effEndTime; + + @ApiParam(value = "工厂代码") + private String organizeCode; + + private boolean isVirtualPart = false; + +} From 562ba3e33957e8c407101e8648a66adbb4b984b5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 17 Aug 2020 17:08:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=81=AF?= =?UTF-8?q?=E5=81=9C=E6=9C=BA=E6=97=B6=E9=95=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 3 +++ 2 files changed, 7 insertions(+) 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 2c741b0..21177f7 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 @@ -286,6 +286,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="安灯类型名称") private String alarmCodeName; + @Transient + @ApiParam(value ="响应时长-分钟") + private Integer downtime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 06230c4..b1ddedc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -93,6 +93,9 @@ public class AndonMenuInterfaceModel implements Serializable { @ApiParam("当前产线的未解决故障统计") private List pendingSolveBrokenInfoList; + @ApiParam("安灯队列停机时长") + private List andonManageQueueList; + public double getExceptionTimeVal() { return exceptionTime == null ? 0 : exceptionTime; } From a7c3167eef1ff6401e6e5f9ec6eae6e0a5589148 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 17 Aug 2020 20:07:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=A8=E5=A1=91=E4=B8=8A=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 index 12e6ad0..671b482 100644 --- 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 @@ -40,4 +40,24 @@ public class MesContainer extends BaseBean { @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; + + @Column(name = "IP_ADDRESS") + @ApiParam(value = "IP") + private String ipAddress; + + @Column(name = "PORT") + @ApiParam(value = "端口") + private String port; + + @Column(name = "UNLOCK_DO") + @ApiParam(value = "接收DO") + private String unlockDo; + + @Column(name = "RED_LIGHT_DO") + @ApiParam(value = "红灯DO") + private String redLightDo; + + @Column(name = "TIME_SECOND") + @ApiParam(value = "处理时间(秒)") + private String timeSecond; }