Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -261,7 +261,7 @@ public class CommonEnumUtil {
 //        ABERRANT(3, "异常", "异常_ABERRANT"),
 //        RESIGNATION(4, "离职", "离职_RESIGNATION"),
 //        EXPIRE(5, "服务到期", "服务到期_EXPIRE"),
-//        LOCKING(3, "fa cell-fa fa-lock", "锁定"),
+        LOCKING(3, "fa cell-fa fa-lock", "锁定"),
         ENABLE(1, "fa fa-success cell-fa fa-check", "启用"),
         DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁止");
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java

@@ -106,6 +106,32 @@ public class HqlPack {
 		}
 	}
 
+
+	/**
+	 * 封装日期
+	 * @param date 日期，需要和时间字段的值格式相同
+	 * @param startColumnName HQL里对应的开始时间字段
+	 * @param endColumnName HQL里对应的结束时间字段
+	 * @param result 封装的HQL
+	 * @param isShowTime 是否包含时分秒
+	 */
+	public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, StringBuffer result,boolean isShowTime) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		if(date != null && date.trim().length() > 0) {
+			date = getSafeParam(date);
+		}else {
+			date = sdf.format(new Date());
+		}
+		if(!isShowTime) {
+			date = date.substring(0,10);
+			result.append(" and '"+date+"' between substring(model." + startColumnName + ",1,10) and substring(model." + endColumnName + ",1,10)");
+			return;
+		}else if(date.trim().length()<=11){
+			date+= " 00:00:00";
+		}
+		result.append(" and '"+date+"' between model." + startColumnName + " and model." + endColumnName);
+	}
+
 	/**
 	 * 封装String对象成order by排序
 	 * @param columnName 列名

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

@@ -52,6 +52,6 @@ public class WmsActionStepCall extends BaseBean {
     public transient String amDesc;
 
     @Column(name="AM_TYPE")
-    @ApiParam(value = "组件类型")
+    @ApiParam(value = "组件类型", example = "0")
-    public transient Integer amType;
+    public Integer amType;
 }

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

@@ -16,7 +16,7 @@ import java.util.Date;
  **/
 public interface WmsIbCheckPlanRepository extends BaseRepository<WmsIbCheckPlan, Long> {
 
-    @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and  startDate<=:date and endDate>=:date")
+    @Query("select icp from WmsIbCheckPlan icp where icp.partNo =:partNo and  icp.startDate<=:date and icp.endDate>=:date")
     WmsIbCheckPlan findWmsIbCheckPlanByPartNoAndTime(@Param("partNo") String partNo, @Param("date") String date);
 
 }