Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPlcColorCfg.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.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;
+import java.io.Serializable;
+
+/**
+ * @Description : 系统参数配置
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-07 09:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_PLC_COLOR_CFG")
+@Api(value="PLC三色灯控制")
+public class AndonPlcColorCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3284234821448131212L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name="RED_PLC_CODE")
+    @ApiParam(value ="红灯PLC代码")
+    private String redPlcCode;
+
+    @Column(name="YELLOW_PLC_CODE")
+    @ApiParam(value ="黄灯PLC代码")
+    private String yellowPlcCode;
+
+    @Column(name="GREEN_PLC_CODE")
+    @ApiParam(value ="绿灯PLC代码")
+    private String greenPlcCode;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonPlcColorCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
+import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-05-13 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonPlcColorCfgRepository extends BaseRepository<AndonPlcColorCfg, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -1100,4 +1100,17 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
         return packBean;
     }
+
+    /**
+     * 安灯 PLC三色灯控制信息查询条件封装
+     * @param andonPlcColorCfg
+     * @return
+     */
+    public static DdlPackBean getAndonPlcColorCfg(AndonPlcColorCfg andonPlcColorCfg) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringLikerPack(andonPlcColorCfg.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(andonPlcColorCfg, result);
+        return result;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4791,6 +4791,24 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_TYPE {
+        STANDARD(10, "标准"),
+        EQU_WORKING_SIGNAL(20, "设备作业信号");
+
+        private int value;
+        private String description;
+
+        PLC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     /**
      * mes设备状态
      */
@@ -5437,6 +5455,26 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 过程检测检测检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_MONITOR_OBJECT_TYPE {
+        ORGANIZE("10"),
+        WORK_SHOP("20"),
+        WORK_CENTER("30");
+
+        private String value;
+
+        BOARD_MONITOR_OBJECT_TYPE(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    /**
      * 中航DB数据检查配置-DB复核项
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -865,7 +865,8 @@ public class WmsEnumUtil {
         OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
         OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"),
         WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
-        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库");
+        WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
+        OTHER_IN(730, "OTHER_IN", "其它入库");
 
         private int value;
         private String code;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java

@@ -0,0 +1,53 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/23 18:47
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EQU_ALARM_RECORD", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE")
+})
+@Api("设备自动报警记录表")
+public class MesEquAlarmRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1675134362612851879L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "ALARM_LEVEL")
+    @ApiParam("报警等级")
+    private Integer alarmLevel;
+
+    @Column(name = "ALARM_START_TIME")
+    @ApiParam("报警开始时间")
+    private String alarmStartTime;
+
+    @Column(name = "ALARM_STOP_TIME")
+    @ApiParam("报警开始时间")
+    private String alarmStopTime;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.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;
 
 /**
@@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable {
     @Column(name = "ROLL_SPEED")
     @ApiParam("滚动速度")
     private Integer rollSpeed;
+
+    @Transient
+    @ApiParam("跑马灯字体颜色")
+    private String fontColor;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -155,4 +155,8 @@ public class MesPart extends BaseBean implements Serializable {
     @Transient
     @ApiParam("拉动数量")
     private Double pullQty;
+
+    @Transient
+    @ApiParam("BOM用量")
+    private Double bomQty = 0d;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java

@@ -100,4 +100,8 @@ public class MesRepairRecord extends BaseBean implements Serializable {
     @Transient
     @ApiParam("缺陷集合")
     private List<MesDefect> mesDefectList;
+
+    @Transient
+    @ApiParam("质量状态")
+    private Integer qcStatus;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellStatus.java

@@ -43,5 +43,13 @@ public class MesWorkCellStatus extends BaseBean implements Serializable {
     @ApiParam("超时状态")
     private Integer timeOutStatus;
 
+    @Column(name = "DELAY_HELP_STATUS")
+    @ApiParam("延迟帮助状态")
+    private Integer delayHelpStatus;
+
+    @Column(name = "EMERGENCY_STOP_STATUS")
+    @ApiParam("紧急停止状态")
+    private Integer emergencyStopStatus;
+
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -192,6 +192,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("创建时间")
     private String packageNo;
 
+    @ApiParam("密码")
+    private String password;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java

@@ -19,6 +19,7 @@ import javax.persistence.Table;
  * @Author dragon
  * @CreateDate 2019/6/19 21:23
  * @Modify
+ * 2020-09-24 18:58 Rock.Yu 增加 Category 属性，Magna 的 BOM 是多层结构，需要靠这个字段标记是否虚阶
  */
 @Data
 @Entity
@@ -82,4 +83,11 @@ public class WmsBomTotal extends BaseBean {
     @Column(name = "SID")
     @ApiParam(value = "SID")
     private String sid;
+
+    /**
+     * SAP Category == 5 表示零件是虚阶
+     */
+    @Column(name = "CATEGORY")
+    @ApiParam(value = "是否虚阶物料")
+    private String category;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -173,4 +173,8 @@ public class WmsInterfaceDataMapper extends BaseBean {
     @ColumnDefault("10")
     @AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false)
     public Integer softDataType;
+
+    @ApiParam("接口名称")
+    @Column(name = "INTERFACE_NAME")
+    public String interfaceName;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2543,6 +2543,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result);
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result);
         DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result);
+        DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getInterfaceName(), "interfaceName", result);
 
         getStringBuilderPack(wmsInterfaceDataMapper, result);