From 935ca2f4d7b74ef4506e3cf0a15c07be62456d53 Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Mon, 2 Dec 2019 16:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 25 ----------------------
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  3 +++
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java
index 586e215..a315dc6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java
@@ -93,29 +93,4 @@ public class MesQcCheckData extends BaseBean {
     @Column(name = "CUST_CODE")
     @ApiParam("客户代码")
     private String custCode;
-
-    @Transient
-    @ApiParam("班次")
-    private String shiftCode;
-
-    @Transient
-    @ApiParam("班组")
-    private String shiftGroup;
-
-    @Transient
-    @ApiParam("班长")
-    private String squadLeader;
-
-    @Transient
-    @ApiParam("工作单元名称")
-    private String workCellName;
-
-    @Transient
-    @ApiParam("物料名称")
-    private String partNoName;
-
-    public MesQcCheckData(String createDatetime, String createUser) {
-        super.createDatetime = createDatetime;
-        super.createUser = createUser;
-    }
 }
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 ae7e52e..6810a1d 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
@@ -1999,6 +1999,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesQcCheckData.getSn())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean);
         }
+        if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) {
+            DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean);
+        }
         if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) {
             DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCenterCode(), "workCenterCode", packBean);
         }