Jenkins自动合并

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;
-    }
 }

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);
         }