Jenkins自动合并

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShift.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.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;
+
+/**
+ * @Description : 班次表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT")
+@Api("班次信息")
+public class WmsShift extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592714L;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShiftRest.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.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;
+
+/**
+ * @Description : 班休表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-05 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_SHIFT_REST")
+@Api("班休信息")
+public class WmsShiftRest extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592715L;
+
+    @Column(name="REST_NO")
+    @ApiParam("班休代码")
+    private String restNo;
+
+    @Column(name="REST_NAME")
+    @ApiParam("班休名称")
+    private String restName;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次编码")
+    private String shiftNo;
+
+    @Column(name="START_REST_TIME")
+    @ApiParam("开始休息时间")
+    private String startRestTime;
+
+    @Column(name="END_REST_TIME")
+    @ApiParam("结束休息时间")
+    private String endRestTime;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班次信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRepository extends BaseRepository<WmsShift, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShiftRestRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShift;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :班休信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-12-05 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsShiftRestRepository extends BaseRepository<WmsShiftRest, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2519,7 +2519,7 @@ public class WmsHqlPack {
     }
 
     /**
-     * 打印机管理信息分页查询条件
+     * 工位信息分页查询条件
      *
      * @param wmsTerminal
      * @return
@@ -2534,4 +2534,39 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 班次信息分页查询条件
+     *
+     * @param wmsShift
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShift(WmsShift wmsShift) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
+
+        getStringBuilderPack(wmsShift, result);
+
+        return result;
+    }
+
+    /**
+     * 班休信息分页查询条件
+     *
+     * @param wmsShiftRest
+     * @return
+     */
+    public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result);
+
+        getStringBuilderPack(wmsShiftRest, result);
+
+        return result;
+    }
 }