From ac84f62e702ad42ca50476051ef781500aba4b8f Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 30 Nov 2018 13:10:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index d3cf503..2ab3567 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/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 = "组件类型") - public transient Integer amType; + @ApiParam(value = "组件类型", example = "0") + public Integer amType; } From d5bbf84965cdaf3977dcfb89995d840d669fa584 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 30 Nov 2018 14:26:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?hql=E6=97=A5=E6=9C=9F=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index a108879..fa95759 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/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 列名 From de979cfac647c640ecfe9838933ff744b81e934e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 30 Nov 2018 14:35:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 08eac72..1e02137 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/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", "禁止"); From f9537daabf5fcfa2a6aa132131c79098d17ddc58 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Fri, 30 Nov 2018 14:50:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java index 7c9fba7..5a0227b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsIbCheckPlanRepository.java +++ b/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 { - @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); } From 05d0995463c5bc4668882a932a61f520162f055a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 30 Nov 2018 14:56:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?set=E6=94=B9=E4=B8=BAList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 1c12e54..7514fc1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -36,7 +36,7 @@ public class WmsActionResponseBean { public String message; @ApiParam("列表信息") - public Set informations; + public List informations; @ApiParam("可选项") public Map options; @@ -52,7 +52,7 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, Set informations, List> details, Boolean codeStatus) { + public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; From ab9a0aae5de5f685d8ac501bea9bf51da37c4ad6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 30 Nov 2018 16:01:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a3d543b..3b43360 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1094,6 +1094,21 @@ public class WmsHqlPack { } /** + * 作业流程明细分页查询 + * @return + */ + public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){ + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); + + getStringBuilderPack(wmsActionGroupDetails, result); + + return result.toString(); + } + + /** * 作业记录参数信息 查询条件封装 * * @param wmsActionLogData