Merge branch 'dev' into test

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

@@ -0,0 +1,76 @@
+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;
+
+/**
+ * @Description :安灯广播
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_BRODCAST")
+@Api("安灯广播")
+public class AndonBroadCast extends BaseBean {
+    @Column(name="DEVICE_NUM")
+    @ApiParam("广播设备编号")
+    private String targetIds;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="DEVICE_DEC")
+    @ApiParam("广播设备名称")
+    private String deviceDec;
+
+    @Column(name="DEVICE_IP")
+    @ApiParam("广播设备ip")
+    private String deviceIp;
+
+    @Column(name="PLAY_INTERVAL")
+    @ApiParam("播放间隔")
+    private Integer playInterval = 0;
+
+    @Column(name="PLAY_PRIORITY")
+    @ApiParam("播放优先级")
+    private Integer playPriority = 500;
+
+    @Column(name="VOLUME")
+    @ApiParam("播放音量")
+    private Integer volume;
+
+    @Column(name="TTS_NAME")
+    @ApiParam("广播语音引擎")
+    private String voiceEngine;
+
+    @Column(name="TEXT_ENCODE")
+    @ApiParam("广播内容编码格式")
+    private String textEncode = "UTF-8";
+
+    @Column(name="PLAY_SPEED")
+    @ApiParam("播放语速")
+    private Integer playSpeed = 0;
+
+    @Column(name="PLAY_TIME")
+    @ApiParam("播放循环次数")
+    private Integer playTime = 1;
+
+
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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 javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :广播配置
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="ANDON_BRODCAST_CFG")
+@Api("生产区域")
+public class AndonBroadCastCfg extends BaseBean {
+    @Column(name="ALARM_CODE")
+    @ApiParam("安灯类型代码")
+    private String alarmCode;
+
+    @Column(name="DEVICE_NUM")
+    @ApiParam("广播设备编号")
+    private String targetIds;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯广播配置持久层
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface IAndonBroadCastCfgRepository extends BaseRepository<AndonBroadCastCfg, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯广播持久层
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface IAndonBroadCastRepository extends BaseRepository<AndonBroadCast, Long> {
+}

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

@@ -80,6 +80,36 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
         return packBean;
     }
+
+    /**
+     * 广播条件查询
+     * @param andonBroadCast
+     * @return
+     */
+    public static DdlPackBean getAndonBroadCast(AndonBroadCast andonBroadCast) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean);
+        DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean);
+        return packBean;
+    }
+
+    /**
+     * 广播配置条件查询
+     * @param andonBroadCastCfg
+     * @return
+     */
+    public static DdlPackBean getAndonBroadCastCfg(AndonBroadCastCfg andonBroadCastCfg) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean);
+        DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean);
+        return packBean;
+    }
     /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
 
 

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

@@ -1255,4 +1255,41 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PCN_SN_TYPE {
+
+        NORMAL(10, "不过期"),
+        FIRST_INSPECTION(20, "一分钟");
+
+        private int value;
+        private String description;
+
+        PCN_SN_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;
+        }
+    }
+
+
 }

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

@@ -600,7 +600,8 @@ public class WmsEnumUtil {
         QC(220, "QC", "QC"),
         AMPR(230, "AMPR", "AMPR"),
         FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
-        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
+        VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库");
 
 
         private int value;

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

@@ -75,11 +75,14 @@ public class MesEquipment extends BaseBean {
     @ApiParam("启用日期")
     private String enableDate;
 
-
     @Column(name="CONNECT_TYPE")
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Transient
     @ApiParam(value ="名称")
     private String name;

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

@@ -0,0 +1,45 @@
+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.Table;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/10 8:37 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FI_CFG")
+@Api("首检件配置")
+public class MesFiCfg extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+}

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

@@ -63,6 +63,10 @@ public class MesPcn extends BaseBean {
     @ApiParam("连接时间")
     private String connectTime;
 
+    @Column(name = "CODE_SPECIFIC")
+    @ApiParam("PCN特殊字段")
+    private String codeSpecific;
+
     public int getConnectCountVal() {
         return this.connectCount == null ? 0 : this.connectCount;
     }

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

@@ -109,6 +109,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常 20=首检件")
+    private String snType;
+
+    @Column(name = "TRAY")
+    @ApiParam("托盘号")
+    private String tray;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -137,6 +137,18 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private Long fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private Long fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private Long fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")

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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_ACTION")
-@Api("系统业务动作")
+@Api("mes系统业务动作")
 public class MesAction extends BaseBean {
     @Column(name="ACTION_CODE")
     @ApiParam("动作代码")

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

@@ -79,6 +79,10 @@ public class MesEquipment extends BaseBean {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Transient
     @ApiParam(value ="名称")
     private String name;

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

@@ -0,0 +1,45 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/10 8:37 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FI_CFG")
+@Api("首检件配置")
+public class MesFiCfg extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+}

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

@@ -63,6 +63,10 @@ public class MesPcn extends BaseBean {
     @ApiParam("连接时间")
     private String connectTime;
 
+    @Column(name = "CODE_SPECIFIC")
+    @ApiParam("PCN特殊字段")
+    private String codeSpecific;
+
     public int getConnectCountVal() {
         return this.connectCount == null ? 0 : this.connectCount;
     }

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

@@ -109,6 +109,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
+
+    @Column(name = "TRAY")
+    @ApiParam("托盘号")
+    private String tray;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -137,6 +137,18 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private String fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private String fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -34,6 +34,37 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam(value ="设备&工位")
     private String equipmentNameAndworkCellName;
 
+    @ApiParam("设备类型")
+    private Integer equipmentType;
+
+    @ApiParam(value ="设备类别")
+    private String equipmentCategory;
+
+    @ApiParam(value ="备注")
+    private String memo;
+
+    @ApiParam(value ="设备型号")
+    private String equipmentModel;
+
+    @ApiParam(value ="设备规格")
+    private String equipmentSpec;
+
+    @ApiParam("制造商")
+    private String equipmentMaker;
+
+    @ApiParam("出厂日期")
+    private String releaseDate;
+
+    @ApiParam("接收日期")
+    private String receiveDate;
+
+    @ApiParam("启用日期")
+    private String enableDate;
+
+    @ApiParam("连接类型")
+    private Integer connectType;
+
+
     public MesEquipmentModel() {
 
     }
@@ -60,4 +91,24 @@ public class MesEquipmentModel implements Serializable {
         this.workCellCode = workCellCode;
 
     }
+
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) {
+        this.id = id;
+        this.equipmentCode = equipmentCode;
+        this.equipmentName = equipmentName;
+        this.status = status;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.areaCode = areaCode;
+        this.equipmentType = equipmentType;
+        this.equipmentCategory = equipmentCategory;
+        this.memo = memo;
+        this.equipmentModel = equipmentModel;
+        this.equipmentSpec = equipmentSpec;
+        this.equipmentMaker = equipmentMaker;
+        this.releaseDate = releaseDate;
+        this.receiveDate = receiveDate;
+        this.enableDate = enableDate;
+        this.connectType = connectType;
+    }
 }