From ba940f9a39b3cffe8e6f23cb274f9c9264d910f7 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sun, 6 Sep 2020 16:57:26 +0800
Subject: [PATCH] =?UTF-8?q?BYPASS=E9=A1=B9=E6=98=A0=E5=B0=84=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesBypassMapping.java     | 44 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/model/BypassModel.java   |  8 +++-
 .../mes/repository/MesBypassMappingRepository.java | 13 +++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 18 +++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
new file mode 100644
index 0000000..3bef0b1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
@@ -0,0 +1,44 @@
+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/9/6 1:25 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BYPASS_MAPPING")
+@Api("MES_BYPASS项映射关系")
+public class MesBypassMapping extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6362769913660089402L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "BYPASS_SEQ")
+    @ApiParam("BYPASS项序号")
+    private Integer bypassSeq;
+
+    @Column(name = "CHECK_NAME")
+    @ApiParam("检测项描述")
+    private String checkName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
index 2e7cfef..935cbde 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
@@ -21,7 +21,7 @@ public class BypassModel {
     private String bypassCode;
 
     @ApiParam("检测项")
-    private String businessValue;
+    private String checkName;
 
     @ApiParam("是否确认，1=已确认，2=未确认")
     private String isVerify;
@@ -29,4 +29,10 @@ public class BypassModel {
     @ApiParam("生产数据ID")
     private Long productDataId;
 
+    @ApiParam("BYPASS项序号")
+    private Integer bypassSeq;
+
+    @ApiParam("状态")
+    private String status;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java
new file mode 100644
index 0000000..392ba42
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBypassMapping;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/9/6 1:30 下午
+ * @Modify:
+ */
+public interface MesBypassMappingRepository extends BaseRepository<MesBypassMapping, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 98004a8..7638733 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -3293,4 +3293,22 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES_BYPASS项映射关系
+     *
+     * @param bypassMapping
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getBypassMapping(MesBypassMapping bypassMapping, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(bypassMapping, organizeCode);
+        if (!StringUtils.isEmpty(bypassMapping.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(bypassMapping.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(bypassMapping.getCheckName())) {
+            DdlPreparedPack.getStringLikerPack(bypassMapping.getCheckName(), "checkName", packBean);
+        }
+        return packBean;
+    }
 }