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

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

@@ -2559,7 +2559,8 @@ public class MesPcnEnumUtil {
     public enum PACKAGE_OP_TYPE {
 
         PACK(10, "打包"),
-        UNPACK(20, "拆包");
+        UNPACK(20, "拆包"),
+        STOP_OVER(30, "过站");
 
         private int value;
         private String description;

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

@@ -0,0 +1,53 @@
+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;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FURNACE_LOCATION")
+@Api("MES_炉内模式位置信息")
+public class MesFurnaceLocation extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404126L;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
+    @Column(name = "MODEL_IMG_URL")
+    @ApiParam("模式图片路径")
+    private String modelImgUrl;
+
+    @Column(name = "SEQ")
+    @ApiParam("推荐顺序")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("容器编号")
+    private String ctNo;
+}

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

@@ -0,0 +1,52 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FURNACE_LOCATION_DETAIL")
+@Api("MES_炉内占位信息")
+public class MesFurnaceLocationDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818212133126L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
+}

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

@@ -153,6 +153,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("erp工作中心")
     private String erpWorkCenterCode;
 
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
+
     @Transient
     @ApiParam("目标库位代码")
     private String destLocationCode;

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

@@ -58,5 +58,19 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @ApiParam("包装编码4")
     private String packageNo4;
 
+    @Column(name = "CT_NO")
+    @ApiParam("容器编号")
+    private String ctNo;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "FN_LOCATION_NO")
+    @ApiParam("炉内位置代码")
+    private String fnLocationNo;
 }

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

@@ -0,0 +1,40 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 5:16 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_FURNACE")
+@Api("MES_物料上炉模式")
+public class MesPartFurnace extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3681747818263404111L;
+
+    @Column(name = "MODEL_NO")
+    @ApiParam("模式编号")
+    private String modelNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesFurnaceLocationDetailRepository extends BaseRepository<MesFurnaceLocationDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesFurnaceLocationRepository extends BaseRepository<MesFurnaceLocation, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesPartFurnaceRepository extends BaseRepository<MesPartFurnace, Long> {
+}

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

@@ -3628,4 +3628,12 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) {
+        DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean);
+        DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }