Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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;

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<AndonBoardModel> pendingSolveBrokenInfoList;
 
+    @ApiParam("安灯队列停机时长")
+    private List<AndonManageQueue> andonManageQueueList;
+
     public double getExceptionTimeVal() {
         return exceptionTime == null ? 0 : exceptionTime;
     }

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<obj>转换为List<Map<String,Object>>
+     * @param objList
+     * @param <T>
+     * @return
+     */
+    public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
+        List<Map<String, Object>> list = Lists.newArrayList();
+        if (objList != null && objList.size() > 0) {
+            Map<String, Object> 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;
+    }
 }

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;
 }

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;

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;
+
+}