From b20fc8e55236145a682b5a2cb2dfecd86b493b14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 0c83988..c03278f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), + JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"), JUMP_STATE(30, "跳过状态点"), ABNORMAL_DEDUCTION(40, "扣减异常"), REDO_STATION(50, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description :工位操作跳过记录表 - * @Reference : - * @Author : wangjie - * @CreateDate : 2020-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL_JUMP_RECORD") -@Api("mes工位操作跳过记录表") -public class MesWorkCellJumpRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "JUMP_TYPE") - @ApiParam("跳过类型 10=过程条码") - private Integer jumpType; - - @Column(name = "JUMP_VALUE") - @ApiParam("跳过值") - private String jumpValue; - - @Column(name = "JUMP_DESC") - @ApiParam("跳过描述") - private String jumpDesc; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -}