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

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

@@ -947,12 +947,12 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM", 111020005, "物料"),
+        PART("PART_ALARM", 110060205, "物料"),
-        QUALITY("QUALITY_ALARM", 111020006, "质量"),
+        QUALITY("QUALITY_ALARM", 110060206, "质量"),
-        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
+        EQUIP("EQUMENT_ALARM", 110060207, "设备"),
-        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
+        PROCESS("ROUTING_ALARM", 110060208, "工艺"),
-        CHECK("OTHER_ALARM", 111020009, "自处理"),
+        CHECK("OTHER_ALARM", 110060209, "自处理"),
-        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
+        FIX_ERROR("FIX_ERROR", 110060210, "自动报警");
 
         private String value;
         private Integer code;

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

@@ -1367,7 +1367,11 @@ public class MesEnumUtil {
         MES_DATA_OBJECT(220, "数据对象"),
         MES_OBJECT_CFG(230, "对象结构"),
         MES_WC_CHECK(240, "开线检查"),
-        MES_QC_CHECK_STANDARD(250, "质量检测标准");
+        MES_QC_CHECK_STANDARD(250, "质量检测标准"),
+        MES_FAULT_CAUSE(260,"设备故障原因"),
+        MES_FAULT_METHOD(270,"设备故障处理措施"),
+        MES_FAULT_PHENOMENON(280,"设备故障现象");
+
 
         private int value;
         private String description;

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

@@ -645,7 +645,8 @@ public class WmsEnumUtil {
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
-        KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
 
         private int value;
         private String code;
@@ -960,6 +961,7 @@ public class WmsEnumUtil {
 
     /**
      * 业务表：库存条码状态
+     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.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;
 
 /**
  * @Description:
@@ -30,41 +31,24 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
+    @Column(name = "FILE_ID")
-    @ApiParam("图片URL")
+    @ApiParam("文件id")
-    private String pictureUrl;
+    private Long fileId;
-
-    @Column(name = "PICTURE_NAME")
-    @ApiParam("图片名称")
-    private String pictureName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
 
-    @Column(name = "FILE_TYPE_ID")
+    @Transient
-    @ApiParam("FILE_TYPE_ID")
+    @ApiParam("文件名称")
-    private String fileTypeId;
+    private String fileName;
 
-    @Column(name = "FILE_TYPE_NAME")
+    @Transient
-    @ApiParam("FILE_TYPE_NAME")
+    @ApiParam("文件URL")
-    private String fileTypeName;
+    private String fileUrl;
 
-    @Column(name = "SOP_NAME")
+    @ApiParam("图片URL")
-    @ApiParam("SOP名称")
+    private String pictureUrl;
-    private String sopName;
-
-    @Column(name = "GROUP_NAME")
-    @ApiParam("GROUP_NAME")
-    private String groupName;
-
-    @Column(name = "SYNC_TAG")
-    @ApiParam("SYNC_TAG")
-    private Integer syncTag = 0;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.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;
 
 /**
  * @Description:
@@ -30,29 +31,17 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCategoryCode;
+    private String produceCtgyCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name = "PICTURE_URL")
+    @Column(name = "FILE_ID")
-    @ApiParam("图片URL")
+    @ApiParam("文件id")
-    private String pictureUrl;
+    private Long fileId;
 
-    @Column(name = "PICTURE_NAME")
+    @Transient
-    @ApiParam("图片名称")
+    @ApiParam("文件原名称")
-    private String pictureName;
+    private String fileOriginName;
-
-    @Column(name = "FILE_SIZE")
-    @ApiParam("FILE_SIZE")
-    private String fileSize;
-
-    @Column(name = "FILE_TYPE_ID")
-    @ApiParam("FILE_TYPE_ID")
-    private String fileTypeId;
-
-    @Column(name = "FILE_TYPE_NAME")
-    @ApiParam("FILE_TYPE_NAME")
-    private String fileTypeName;
 }

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

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\12\4 16:44
+ * @Modify:
+ **/
+@Data
+public class ProduceCtgyPictureModel {
+
+    private Long id;
+    private String createUser;
+    private String createDatetime;
+    private String modifyUser;
+    private String modifyDatetime;
+    private String organizeCode;
+    private Integer isValid;
+    private Integer isDeleted;
+
+    @ApiParam("产品类型代码")
+    private String produceCtgyCode;
+
+    @ApiParam("面位")
+    private String sideLocation;
+
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @ApiParam("文件原名称")
+    private String fileOriginName;
+    @ApiParam("文件URL")
+    private String fileUrl;
+    @ApiParam("组名")
+    private String groupName;
+
+    public ProduceCtgyPictureModel() {
+    }
+
+    public ProduceCtgyPictureModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, Integer isValid, Integer isDeleted, String produceCtgyCode, String sideLocation, Long fileId, String fileOriginName, String fileUrl, String groupName) {
+        this.id = id;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.produceCtgyCode = produceCtgyCode;
+        this.sideLocation = sideLocation;
+        this.fileId = fileId;
+        this.fileOriginName = fileOriginName;
+        this.fileUrl = fileUrl;
+        this.groupName = groupName;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.*;
 import org.springframework.util.StringUtils;
 
@@ -1421,28 +1422,6 @@ public class MesHqlPack {
     }
 
     /**
-     * MES 产品类型图片查询条件封装
-     *
-     * @param mesProduceCtgyPicture
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
-        }
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getSideLocation())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getSideLocation(), "sideLocation", packBean);
-        }
-        return packBean;
-    }
-
-
-    /**
      * 设备通知对象配置 查询条件封装
      *
      * @param mesEquNotifyObjectCfg
@@ -1870,14 +1849,20 @@ public class MesHqlPack {
         if (mesProduceSn.getQcStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) {
+            DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean);
+        }
+        if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) {
+            DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean);
+//            DdlPreparedPack.timeBuilder(
+//                    mesProduceSn.getOutWorkCenterStartTime(),
+//                    mesProduceSn.getOutWorkCenterEndTime(),
+//                    "outWorkCenterTime", packBean, true);
+        }
         DdlPreparedPack.timeBuilder(
                 mesProduceSn.getCreateDateTimeStart(),
                 mesProduceSn.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesProduceSn.getOutWorkCenterStartTime(),
-                mesProduceSn.getOutWorkCenterEndTime(),
-                "outWorkCenterTime", packBean, true);
         return packBean;
     }
 

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

@@ -97,6 +97,14 @@ public class WmsBom extends BaseBean {
     @Transient
     public String routingCode;
 
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "线边库位代码")
+    private String locateNo;
+
+    @Column(name = "TERMINAL_NO")
+    @ApiParam(value = "工位代码")
+    private String terminalNo;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty.doubleValue();
     }

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

@@ -191,10 +191,22 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 
+    @Column(name = "CYCLE_RQUEST_PERIOD")
+    @ApiParam(value = "循环补货周期", example = "0")
+    private Integer cycleRquestPeriod = 0;
+
+    @Column(name = "CYCLE_RQUEST_QTY")
+    @ApiParam(value = "循环补货数量", example = "0")
+    private Double cycleRquestQty = 0d;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
 
+    public int getCycleRquestPeriod(){
+        return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue();
+    }
+
     public WmsPart() {
     }
 
@@ -210,6 +222,10 @@ public class WmsPart extends BaseBean {
         return max == null? 0:max;
     }
 
+    public Double getCycleRquestQty() {
+        return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
+    }
+
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
         this.partNo = partNo;

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.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 : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT")
+@Api("班次信息")
+public class WmsShift extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592714L;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.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 : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT_REST")
+@Api("班休信息")
+public class WmsShiftRest extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592715L;
+
+    @Column(name="REST_NO")
+    @ApiParam("班休代码")
+    private String restNo;
+
+    @Column(name="REST_NAME")
+    @ApiParam("班休名称")
+    private String restName;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="START_REST_TIME")
+    @ApiParam("开始休息时间")
+    private String startRestTime;
+
+    @Column(name="END_REST_TIME")
+    @ApiParam("结束休息时间")
+    private String endRestTime;
+}

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.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 javax.persistence.UniqueConstraint;
+
+/**
+ * @Description : 工位表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-12-03 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_TERMINAL")
+@Api("工位信息")
+public class WmsTerminal extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592713L;
+    @Column(name="TERMINAL_NO")
+    @ApiParam("工位代码")
+    private String terminalNo;
+
+    @Column(name="TERMINAL_NAME")
+    @ApiParam("工位名称")
+    private String terminalName;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班次信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班休信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTerminalRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :工位信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsTerminalRepository extends BaseRepository<WmsTerminal, Long> {
+}

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

@@ -2517,4 +2517,56 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 工位信息分页查询条件
+     *
+     * @param wmsTerminal
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTerminal(WmsTerminal wmsTerminal) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTerminal.getTerminalNo(), "terminalNo", result);
+
+        getStringBuilderPack(wmsTerminal, result);
+
+        return result;
+    }
+
+    /**
+     * 班次信息分页查询条件
+     *
+     * @param wmsShift
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
+
+        getStringBuilderPack(wmsShift, result);
+
+        return result;
+    }
+
+    /**
+     * 班休信息分页查询条件
+     *
+     * @param wmsShiftRest
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result);
+
+        getStringBuilderPack(wmsShiftRest, result);
+
+        return result;
+    }
 }